diff --git a/.github/workflows/actions/runCPPTests/runAllTests/action.yml b/.github/workflows/actions/runCPPTests/runAllTests/action.yml index a52adbd355..bdb434c220 100644 --- a/.github/workflows/actions/runCPPTests/runAllTests/action.yml +++ b/.github/workflows/actions/runCPPTests/runAllTests/action.yml @@ -47,6 +47,13 @@ runs: testCommand: ${{ inputs.builddir }}/tests/Tests_run --gtest_output=json:${{ inputs.reportdir }}core_gtest_results.json testLogFile: ${{ inputs.reportdir }}core_gtest_test_log.txt testName: Core + - name: C++ Material tests + id: material + uses: ./.github/workflows/actions/runCPPTests/runSingleTest + with: + testCommand: ${{ inputs.builddir }}/tests/Material_tests_run --gtest_output=json:${{ inputs.reportdir }}material_gtest_results.json + testLogFile: ${{ inputs.reportdir }}material_gtest_test_log.txt + testName: Material - name: C++ Mesh tests id: mesh uses: ./.github/workflows/actions/runCPPTests/runSingleTest diff --git a/CMakeLists.txt b/CMakeLists.txt index d1536fbc72..6e25357391 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ CheckInterModuleDependencies() FreeCADLibpackChecks() SetupDoxygen() SetupLibFmt() +SetupYamlCpp() if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) SetupPython() SetupPCL() diff --git a/cMake/FreeCAD_Helpers/SetupLibYaml.cmake b/cMake/FreeCAD_Helpers/SetupLibYaml.cmake new file mode 100644 index 0000000000..dcbc6439c7 --- /dev/null +++ b/cMake/FreeCAD_Helpers/SetupLibYaml.cmake @@ -0,0 +1,4 @@ +macro(SetupYamlCpp) + # -------------------------------- YamlCpp -------------------------------- + find_package(yaml-cpp REQUIRED) +endmacro(SetupYamlCpp) diff --git a/conda/environment.devenv.yml b/conda/environment.devenv.yml index 7503eaba84..15be36cc8b 100644 --- a/conda/environment.devenv.yml +++ b/conda/environment.devenv.yml @@ -81,6 +81,7 @@ dependencies: - pivy - pkg-config - ply +- pre-commit - pybind11 - pyside2 - python @@ -93,6 +94,7 @@ dependencies: - swig - vtk - xerces-c +- yaml-cpp - zlib - pip: - ptvsd diff --git a/package/fedora/freecad.spec b/package/fedora/freecad.spec index e999244685..3fe8f638b2 100644 --- a/package/fedora/freecad.spec +++ b/package/fedora/freecad.spec @@ -7,7 +7,7 @@ # Maintainers: keep this list of plugins up to date # List plugins in %%{_libdir}/%{name}/lib, less '.so' and 'Gui.so', here -%global plugins Fem FreeCAD PathApp Import Inspection Mesh MeshPart Part Points ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Path PathGui Spreadsheet SpreadsheetGui area DraftUtils DraftUtils libDriver libDriverDAT libDriverSTL libDriverUNV libE57Format libMEFISTO2 libSMDS libSMESH libSMESHDS libStdMeshers Measure TechDraw TechDrawGui libarea-native Surface SurfaceGui AssemblyGui flatmesh QtUnitGui PathSimulator +%global plugins Fem FreeCAD PathApp Import Inspection Mesh MeshPart Part Points ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Path PathGui Spreadsheet SpreadsheetGui area DraftUtils DraftUtils libDriver libDriverDAT libDriverSTL libDriverUNV libE57Format libMEFISTO2 libSMDS libSMESH libSMESHDS libStdMeshers Measure TechDraw TechDrawGui libarea-native Surface SurfaceGui AssemblyGui flatmesh QtUnitGui PathSimulator MatGui Material # Some configuration options for other environments @@ -105,6 +105,7 @@ BuildRequires: libkdtree++-devel BuildRequires: pcl-devel BuildRequires: python3 BuildRequires: libglvnd-devel +BuildRequires: yaml-cpp-devel #BuildRequires: zlib-devel # For appdata diff --git a/src/App/Document.cpp b/src/App/Document.cpp index c4e56c7702..894ddf508e 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -1895,7 +1895,7 @@ bool Document::saveToFile(const char* filename) const signalStartSave(*this, filename); auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document"); - int compression = hGrp->GetInt("CompressionLevel",3); + int compression = hGrp->GetInt("CompressionLevel",7); compression = Base::clamp(compression, Z_NO_COMPRESSION, Z_BEST_COMPRESSION); bool policy = App::GetApplication().GetParameterGroupByPath diff --git a/src/App/Resources/translations/App.ts b/src/App/Resources/translations/App.ts index 93a6119206..aee76ef27b 100644 --- a/src/App/Resources/translations/App.ts +++ b/src/App/Resources/translations/App.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed diff --git a/src/App/Resources/translations/App_be.ts b/src/App/Resources/translations/App_be.ts index bffae072f7..1089c4bdea 100644 --- a/src/App/Resources/translations/App_be.ts +++ b/src/App/Resources/translations/App_be.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed Без назвы diff --git a/src/App/Resources/translations/App_ca.ts b/src/App/Resources/translations/App_ca.ts index dc728d32c1..b8a7ff25e8 100644 --- a/src/App/Resources/translations/App_ca.ts +++ b/src/App/Resources/translations/App_ca.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed Sense nom diff --git a/src/App/Resources/translations/App_cs.ts b/src/App/Resources/translations/App_cs.ts index 136bc0951b..15c13efb3c 100644 --- a/src/App/Resources/translations/App_cs.ts +++ b/src/App/Resources/translations/App_cs.ts @@ -14,7 +14,7 @@ které odkazují na stejný konfigurovatelný objekt QObject - + Unnamed Nepojmenovaný diff --git a/src/App/Resources/translations/App_de.ts b/src/App/Resources/translations/App_de.ts index 7c5ddbf848..3dcb0767da 100644 --- a/src/App/Resources/translations/App_de.ts +++ b/src/App/Resources/translations/App_de.ts @@ -14,7 +14,7 @@ angewendet werden soll, die das gleiche konfigurierbare Objekt referenzieren QObject - + Unnamed Unbenannt diff --git a/src/App/Resources/translations/App_el.ts b/src/App/Resources/translations/App_el.ts index 78af105861..891f2d9c0b 100644 --- a/src/App/Resources/translations/App_el.ts +++ b/src/App/Resources/translations/App_el.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Ανώνυμο diff --git a/src/App/Resources/translations/App_es-AR.ts b/src/App/Resources/translations/App_es-AR.ts index ab386bb7b9..541fb63420 100644 --- a/src/App/Resources/translations/App_es-AR.ts +++ b/src/App/Resources/translations/App_es-AR.ts @@ -14,7 +14,7 @@ que hacen referencia al mismo objeto configurable QObject - + Unnamed Sin nombre diff --git a/src/App/Resources/translations/App_es-ES.ts b/src/App/Resources/translations/App_es-ES.ts index 2098ba67ea..da98123e02 100644 --- a/src/App/Resources/translations/App_es-ES.ts +++ b/src/App/Resources/translations/App_es-ES.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed Sin nombre diff --git a/src/App/Resources/translations/App_eu.ts b/src/App/Resources/translations/App_eu.ts index 3f86c70049..3d13d6d5bf 100644 --- a/src/App/Resources/translations/App_eu.ts +++ b/src/App/Resources/translations/App_eu.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed Izenik gabea diff --git a/src/App/Resources/translations/App_fi.ts b/src/App/Resources/translations/App_fi.ts index 94109202ca..8f4687e6ba 100644 --- a/src/App/Resources/translations/App_fi.ts +++ b/src/App/Resources/translations/App_fi.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Nimetön diff --git a/src/App/Resources/translations/App_fr.ts b/src/App/Resources/translations/App_fr.ts index 4ceec806f1..ae5606c70e 100644 --- a/src/App/Resources/translations/App_fr.ts +++ b/src/App/Resources/translations/App_fr.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed Sans nom diff --git a/src/App/Resources/translations/App_gl.ts b/src/App/Resources/translations/App_gl.ts index 5068467a40..b12a18a265 100644 --- a/src/App/Resources/translations/App_gl.ts +++ b/src/App/Resources/translations/App_gl.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Sen nome diff --git a/src/App/Resources/translations/App_hr.ts b/src/App/Resources/translations/App_hr.ts index 8dad689717..354ab54444 100644 --- a/src/App/Resources/translations/App_hr.ts +++ b/src/App/Resources/translations/App_hr.ts @@ -14,7 +14,7 @@ na sve veze koje referenciraju isti konfigurabilni objekt QObject - + Unnamed Neimenovano diff --git a/src/App/Resources/translations/App_hu.ts b/src/App/Resources/translations/App_hu.ts index 718225501e..60c91c03fe 100644 --- a/src/App/Resources/translations/App_hu.ts +++ b/src/App/Resources/translations/App_hu.ts @@ -14,7 +14,7 @@ amelyek ugyanarra a konfigurálható tárgyra hivatkoznak QObject - + Unnamed Névtelen diff --git a/src/App/Resources/translations/App_id.ts b/src/App/Resources/translations/App_id.ts index 5830a1190a..ee89287369 100644 --- a/src/App/Resources/translations/App_id.ts +++ b/src/App/Resources/translations/App_id.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed Tanpa nama diff --git a/src/App/Resources/translations/App_it.ts b/src/App/Resources/translations/App_it.ts index 701b9c7f40..8e943f5530 100644 --- a/src/App/Resources/translations/App_it.ts +++ b/src/App/Resources/translations/App_it.ts @@ -14,7 +14,7 @@ che fanno riferimento allo stesso oggetto configurabile QObject - + Unnamed Senza nome diff --git a/src/App/Resources/translations/App_ja.ts b/src/App/Resources/translations/App_ja.ts index d0b69b43f1..4d49116a66 100644 --- a/src/App/Resources/translations/App_ja.ts +++ b/src/App/Resources/translations/App_ja.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed 名称未設定 diff --git a/src/App/Resources/translations/App_ka.ts b/src/App/Resources/translations/App_ka.ts index 411551c733..df598196a4 100644 --- a/src/App/Resources/translations/App_ka.ts +++ b/src/App/Resources/translations/App_ka.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed უსახელო diff --git a/src/App/Resources/translations/App_ko.ts b/src/App/Resources/translations/App_ko.ts index dc13a11b18..f6894ff336 100644 --- a/src/App/Resources/translations/App_ko.ts +++ b/src/App/Resources/translations/App_ko.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed 이름없음 diff --git a/src/App/Resources/translations/App_nl.ts b/src/App/Resources/translations/App_nl.ts index a77b6f7150..7f97931a07 100644 --- a/src/App/Resources/translations/App_nl.ts +++ b/src/App/Resources/translations/App_nl.ts @@ -14,7 +14,7 @@ die verwijzen naar hetzelfde configureerbare object QObject - + Unnamed Naamloos diff --git a/src/App/Resources/translations/App_pl.ts b/src/App/Resources/translations/App_pl.ts index 9639106cdd..a74ab8c321 100644 --- a/src/App/Resources/translations/App_pl.ts +++ b/src/App/Resources/translations/App_pl.ts @@ -14,7 +14,7 @@ które odnoszą się do tego samego obiektu konfigurowalnego QObject - + Unnamed Nienazwany diff --git a/src/App/Resources/translations/App_pt-BR.ts b/src/App/Resources/translations/App_pt-BR.ts index bb362e69ac..76fb364a26 100644 --- a/src/App/Resources/translations/App_pt-BR.ts +++ b/src/App/Resources/translations/App_pt-BR.ts @@ -14,7 +14,7 @@ que referenciam o mesmo objeto configurável QObject - + Unnamed Sem nome diff --git a/src/App/Resources/translations/App_pt-PT.ts b/src/App/Resources/translations/App_pt-PT.ts index 36441cd37b..b81a5bb300 100644 --- a/src/App/Resources/translations/App_pt-PT.ts +++ b/src/App/Resources/translations/App_pt-PT.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Sem nome diff --git a/src/App/Resources/translations/App_ro.ts b/src/App/Resources/translations/App_ro.ts index 0a9da8cb99..b3d537e316 100644 --- a/src/App/Resources/translations/App_ro.ts +++ b/src/App/Resources/translations/App_ro.ts @@ -14,7 +14,7 @@ care fac referire la același obiect configurabil QObject - + Unnamed Nedenumit diff --git a/src/App/Resources/translations/App_ru.ts b/src/App/Resources/translations/App_ru.ts index 2ed4bbb580..947319f0fa 100644 --- a/src/App/Resources/translations/App_ru.ts +++ b/src/App/Resources/translations/App_ru.ts @@ -13,7 +13,7 @@ that reference the same configurable object QObject - + Unnamed Безымянный diff --git a/src/App/Resources/translations/App_sl.ts b/src/App/Resources/translations/App_sl.ts index eae5ca0653..2c696febba 100644 --- a/src/App/Resources/translations/App_sl.ts +++ b/src/App/Resources/translations/App_sl.ts @@ -14,7 +14,7 @@ za vse povezave, ki se sklicujejo na isti nastavljivi predmet QObject - + Unnamed Neimenovan diff --git a/src/App/Resources/translations/App_sr-CS.ts b/src/App/Resources/translations/App_sr-CS.ts index 8485e35dba..420a870424 100644 --- a/src/App/Resources/translations/App_sr-CS.ts +++ b/src/App/Resources/translations/App_sr-CS.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Bez imena diff --git a/src/App/Resources/translations/App_sr.ts b/src/App/Resources/translations/App_sr.ts index 7f7ce8f0fd..bb121f6be9 100644 --- a/src/App/Resources/translations/App_sr.ts +++ b/src/App/Resources/translations/App_sr.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Без имена diff --git a/src/App/Resources/translations/App_sv-SE.ts b/src/App/Resources/translations/App_sv-SE.ts index 499ff25cfd..4ecd57fb02 100644 --- a/src/App/Resources/translations/App_sv-SE.ts +++ b/src/App/Resources/translations/App_sv-SE.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Namnlös diff --git a/src/App/Resources/translations/App_tr.ts b/src/App/Resources/translations/App_tr.ts index b51ac83cb7..38a85f3182 100644 --- a/src/App/Resources/translations/App_tr.ts +++ b/src/App/Resources/translations/App_tr.ts @@ -14,7 +14,7 @@ uygulanmayacağına ilişkin son kullanıcı seçimini saklar QObject - + Unnamed Adsız diff --git a/src/App/Resources/translations/App_uk.ts b/src/App/Resources/translations/App_uk.ts index 234b7f25fb..06df94b116 100644 --- a/src/App/Resources/translations/App_uk.ts +++ b/src/App/Resources/translations/App_uk.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Без назви diff --git a/src/App/Resources/translations/App_val-ES.ts b/src/App/Resources/translations/App_val-ES.ts index c8f3b6f656..6eceaf1eb7 100644 --- a/src/App/Resources/translations/App_val-ES.ts +++ b/src/App/Resources/translations/App_val-ES.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed Sense nom diff --git a/src/App/Resources/translations/App_zh-CN.ts b/src/App/Resources/translations/App_zh-CN.ts index 190acc6e74..c80a2fde00 100644 --- a/src/App/Resources/translations/App_zh-CN.ts +++ b/src/App/Resources/translations/App_zh-CN.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed 未命名 diff --git a/src/App/Resources/translations/App_zh-TW.ts b/src/App/Resources/translations/App_zh-TW.ts index 347435827a..d3f03d427a 100644 --- a/src/App/Resources/translations/App_zh-TW.ts +++ b/src/App/Resources/translations/App_zh-TW.ts @@ -14,7 +14,7 @@ that reference the same configurable object QObject - + Unnamed 未命名 diff --git a/src/Base/Matrix.cpp b/src/Base/Matrix.cpp index 040ff8dc6a..7f0ac424fe 100644 --- a/src/Base/Matrix.cpp +++ b/src/Base/Matrix.cpp @@ -26,6 +26,7 @@ # include # include #endif +# include #include "Matrix.h" #include "Converter.h" @@ -897,3 +898,94 @@ ScaleType Matrix4D::hasScale(double tol) const return ScaleType::NoScaling; } + +std::array Matrix4D::decompose() const { + // decompose the matrix to shear, scale, rotation and move + // so that matrix = move * rotation * scale * shear + // return an array of matrices + Matrix4D moveMatrix; + Matrix4D rotationMatrix; + Matrix4D scaleMatrix; + Matrix4D residualMatrix(*this); + // extract transform + moveMatrix.move(residualMatrix.getCol(3)); + residualMatrix.setCol(3, Vector3d()); + // find and extract rotation + int prim_dir = -1; + std::array dirs = { + Vector3d(1., 0., 0.),Vector3d(0., 1., 0.),Vector3d(0., 0., 1.) + }; + int i; + for (i = 0; i < 3; i++) { + if (residualMatrix.getCol(i).IsNull()) { + continue; + } + if (prim_dir < 0) { + dirs[i] = residualMatrix.getCol(i); + dirs[i].Normalize(); + prim_dir = i; + continue; + } else { + Vector3d cross = dirs[prim_dir].Cross(residualMatrix.getCol(i)); + if (cross.IsNull()) { + continue; + } + cross.Normalize(); + int last_dir = 3-i-prim_dir; + if (i - prim_dir == 1) { + dirs[last_dir] = cross; + dirs[i] = cross.Cross(dirs[prim_dir]); + } else { + dirs[last_dir] = -cross; + dirs[i] = dirs[prim_dir].Cross(-cross); + } + prim_dir = -2; // done + break; + } + } + if (prim_dir >= 0) { + // handle case with only one valid direction + Vector3d cross = dirs[prim_dir].Cross(Vector3d(0., 0., 1.)); + if (cross.IsNull()) { + cross = dirs[prim_dir].Cross(Vector3d(0., 1., 0.)); + } + dirs[(prim_dir+1)%3] = cross; + dirs[(prim_dir+2)%3] = dirs[prim_dir].Cross(cross); + } + rotationMatrix.setCol(0, dirs[0]); + rotationMatrix.setCol(1, dirs[1]); + rotationMatrix.setCol(2, dirs[2]); + rotationMatrix.inverseGauss(); + residualMatrix = rotationMatrix * residualMatrix; + // To keep signs of the scale factors equal + if (residualMatrix.determinant() < 0) { + rotationMatrix.rotZ(D_PI); + residualMatrix.rotZ(D_PI); + } + rotationMatrix.inverseGauss(); + // extract scale + double xScale = residualMatrix.dMtrx4D[0][0]; + double yScale = residualMatrix.dMtrx4D[1][1]; + double zScale = residualMatrix.dMtrx4D[2][2]; + scaleMatrix.dMtrx4D[0][0] = xScale; + scaleMatrix.dMtrx4D[1][1] = yScale; + scaleMatrix.dMtrx4D[2][2] = zScale; + // The remaining shear + residualMatrix.scale(xScale ? 1.0 / xScale : 1.0, yScale ? 1.0 / yScale : 1.0, zScale ? 1.0 / zScale : 1.0); + // Restore trace in shear matrix + residualMatrix.setDiagonal(Vector3d(1.0, 1.0, 1.0)); + // Remove values close to zero + for (i = 0; i < 3; i++) { + if (std::abs(scaleMatrix.dMtrx4D[i][i]) < 1e-15) + scaleMatrix.dMtrx4D[i][i] = 0.0; + for (int j = 0; j < 3; j++) { + if (std::abs(residualMatrix.dMtrx4D[i][j]) < 1e-15) + residualMatrix.dMtrx4D[i][j] = 0.0; + if (std::abs(rotationMatrix.dMtrx4D[i][j]) < 1e-15) + rotationMatrix.dMtrx4D[i][j] = 0.0; + } + } + return std::array{ + residualMatrix, scaleMatrix, rotationMatrix, moveMatrix + }; +} diff --git a/src/Base/Matrix.h b/src/Base/Matrix.h index 5569dea636..163dee1a19 100644 --- a/src/Base/Matrix.h +++ b/src/Base/Matrix.h @@ -25,6 +25,7 @@ #define BASE_MATRIX_H #include +#include #include "Vector3D.h" #ifndef FC_GLOBAL_H @@ -175,6 +176,8 @@ public: { scale(Vector3d(scalexyz, scalexyz, scalexyz)); } /// Check for scaling factor ScaleType hasScale(double tol=0.0) const; + /// Decompose matrix into pure shear, scale, rotation and move + std::array decompose() const; /// Rotate around the X axis (in transformed space) for the given value in radians void rotX (double fAngle); /// Rotate around the Y axis (in transformed space) for the given value in radians diff --git a/src/Base/MatrixPy.xml b/src/Base/MatrixPy.xml index f59db854ae..c2dca83498 100644 --- a/src/Base/MatrixPy.xml +++ b/src/Base/MatrixPy.xml @@ -97,28 +97,35 @@ if it's not a scale matrix. tol : float - + + + decompose() -> Base.Matrix, Base.Matrix, Base.Matrix, Base.Matrix\n +Return a tuple of matrices representing shear, scale, rotation and move. +So that matrix = move * rotation * scale * shear. + + + nullify() -> None Make this the null matrix. - + isNull() -> bool Check if this is the null matrix. - + unity() -> None Make this matrix to unity (4D identity matrix). - + isUnity() -> bool @@ -185,7 +192,7 @@ index : int vector : Base.Vector - + diagonal() -> Base.Vector @@ -252,34 +259,34 @@ Compute the transformed vector using the matrix. vector : Base.Vector - + invert() -> None Compute the inverse matrix in-place, if possible. - + inverse() -> Base.Matrix Compute the inverse matrix, if possible. - + transpose() -> None Transpose the matrix in-place. - + transposed() -> Base.Matrix Returns a transposed copy of this matrix. - + determinant() -> float @@ -309,7 +316,7 @@ dim : int Dimension parameter must be in the range [1,4]. - + analyze() -> str diff --git a/src/Base/MatrixPyImp.cpp b/src/Base/MatrixPyImp.cpp index 9cf794d37a..8bacece2a8 100644 --- a/src/Base/MatrixPyImp.cpp +++ b/src/Base/MatrixPyImp.cpp @@ -22,6 +22,7 @@ #include "PreCompiled.h" +//#include // inclusion of the generated files (generated out of MatrixPy.xml) #include "RotationPy.h" @@ -351,12 +352,21 @@ PyObject* MatrixPy::hasScale(PyObject * args) Py::Module mod("FreeCAD"); return Py::new_reference_to(mod.callMemberFunction("ScaleType", Py::TupleN(Py::Int(static_cast(type))))); } - -PyObject* MatrixPy::nullify(PyObject * args) +PyObject* MatrixPy::decompose(PyObject * args) { if (!PyArg_ParseTuple(args, "")) return nullptr; + auto ms = getMatrixPtr()->decompose(); + Py::Tuple tuple(4); + for (int i=0; i<4; i++) { + tuple.setItem(i, Py::Matrix(ms[i])); + } + return Py::new_reference_to(tuple); +} + +PyObject* MatrixPy::nullify() +{ PY_TRY { getMatrixPtr()->nullify(); Py_Return; @@ -364,11 +374,8 @@ PyObject* MatrixPy::nullify(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::isNull(PyObject * args) +PyObject* MatrixPy::isNull() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { bool ok = getMatrixPtr()->isNull(); return Py::new_reference_to(Py::Boolean(ok)); @@ -376,11 +383,8 @@ PyObject* MatrixPy::isNull(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::unity(PyObject * args) +PyObject* MatrixPy::unity() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { getMatrixPtr()->setToUnity(); Py_Return; @@ -388,11 +392,8 @@ PyObject* MatrixPy::unity(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::isUnity(PyObject * args) +PyObject* MatrixPy::isUnity() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { bool ok = getMatrixPtr()->isUnity(); return Py::new_reference_to(Py::Boolean(ok)); @@ -487,11 +488,8 @@ PyObject* MatrixPy::setRow(PyObject * args) Py_Return; } -PyObject* MatrixPy::diagonal(PyObject * args) +PyObject* MatrixPy::diagonal() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - Matrix4D* mat = getMatrixPtr(); Base::Vector3d v = mat->diagonal(); return Py::new_reference_to(Py::Vector(v)); @@ -628,11 +626,8 @@ PyObject* MatrixPy::multVec(PyObject * args) return new VectorPy(new Vector3d(vec)); } -PyObject* MatrixPy::invert(PyObject * args) +PyObject* MatrixPy::invert() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { if (fabs(getMatrixPtr()->determinant()) > DBL_EPSILON) { getMatrixPtr()->inverseGauss(); @@ -646,11 +641,8 @@ PyObject* MatrixPy::invert(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::inverse(PyObject * args) +PyObject* MatrixPy::inverse() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { if (fabs(getMatrixPtr()->determinant()) > DBL_EPSILON) { Base::Matrix4D m = *getMatrixPtr(); @@ -665,11 +657,8 @@ PyObject* MatrixPy::inverse(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::determinant(PyObject * args) +PyObject* MatrixPy::determinant() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - return PyFloat_FromDouble(getMatrixPtr()->determinant()); } @@ -741,11 +730,8 @@ PyObject* MatrixPy::isOrthogonal(PyObject * args) return Py::new_reference_to(Py::Float(ok ? mult : 0.0)); } -PyObject* MatrixPy::transposed(PyObject * args) +PyObject* MatrixPy::transposed() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { Base::Matrix4D m = *getMatrixPtr(); m.transpose(); @@ -754,11 +740,8 @@ PyObject* MatrixPy::transposed(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::transpose(PyObject * args) +PyObject* MatrixPy::transpose() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { getMatrixPtr()->transpose(); Py_Return; @@ -766,11 +749,8 @@ PyObject* MatrixPy::transpose(PyObject * args) PY_CATCH; } -PyObject* MatrixPy::analyze(PyObject * args) +PyObject* MatrixPy::analyze() { - if (!PyArg_ParseTuple(args, "")) - return nullptr; - PY_TRY { std::string type = getMatrixPtr()->analyse(); return PyUnicode_FromString(type.c_str()); diff --git a/src/Base/Rotation.cpp b/src/Base/Rotation.cpp index 204885147d..e7a6d40890 100644 --- a/src/Base/Rotation.cpp +++ b/src/Base/Rotation.cpp @@ -22,6 +22,7 @@ #include "PreCompiled.h" +#include #include #include "Base/Exception.h" @@ -220,28 +221,8 @@ void Rotation::setValue(const double q[4]) void Rotation::setValue(const Matrix4D & m) { - - auto type = m.hasScale(); - if (type == Base::ScaleType::Other) { - THROWM(Base::ValueError, "setValue(matrix): Could not determine the rotation."); - } - Matrix4D mc(m); - if (type != Base::ScaleType::NoScaling) { - mc.setCol(3, Vector3d(0.0, 0.0, 0.0)); - if (type == Base::ScaleType::NonUniformRight) { - mc.transpose(); - } - double sx = 1.0 / mc.getRow(0).Length(); - double sy = 1.0 / mc.getRow(1).Length(); - double sz = 1.0 / mc.getRow(2).Length(); - mc.scale(sx, sy, sz); - if (type == Base::ScaleType::NonUniformRight) { - mc.transpose(); - } - if (mc.determinant3() < 0.0) { - mc.scale(-1.0, -1.0, -1.0); - } - } + // Get the rotation part matrix + Matrix4D mc = m.decompose()[2]; // Extract quaternion double trace = (mc[0][0] + mc[1][1] + mc[2][2]); if (trace > 0.0) { diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 97d6d96e4e..f58c18072e 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -1724,7 +1724,7 @@ void Application::setupContextMenu(const char* recipient, MenuItem* items) const } } } - actWb->setupContextMenu(recipient, items); + actWb->createContextMenu(recipient, items); } } diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 16169537f8..811bb10ab9 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -833,8 +833,6 @@ SET(View3D_CPP_SRCS View3DPy.cpp View3DViewerPy.cpp NaviCube.cpp - NavigationAnimator.cpp - NavigationAnimation.cpp ) SET(View3D_SRCS ${View3D_CPP_SRCS} @@ -857,8 +855,6 @@ SET(View3D_SRCS CoinRiftWidget.h View3DViewerPy.h NaviCube.h - NavigationAnimator.h - NavigationAnimation.h ) SOURCE_GROUP("View3D" FILES ${View3D_SRCS}) @@ -1114,6 +1110,7 @@ SET(Workbench_CPP_SRCS Workbench.cpp WorkbenchFactory.cpp WorkbenchManager.cpp + WorkbenchManipulator.cpp WorkbenchPyImp.cpp ) SET(Workbench_SRCS @@ -1125,6 +1122,7 @@ SET(Workbench_SRCS Workbench.h WorkbenchFactory.h WorkbenchManager.h + WorkbenchManipulator.h ) SOURCE_GROUP("Workbench" FILES ${Workbench_SRCS}) diff --git a/src/Gui/CommandMacro.cpp b/src/Gui/CommandMacro.cpp index 5d5da00aed..c0cbf7c0ec 100644 --- a/src/Gui/CommandMacro.cpp +++ b/src/Gui/CommandMacro.cpp @@ -21,9 +21,14 @@ ***************************************************************************/ #include "PreCompiled.h" +#ifndef _PreComp_ +# include +#endif #include "Command.h" +#include "Action.h" #include "Application.h" +#include "BitmapFactory.h" #include "DlgMacroExecuteImp.h" #include "DlgMacroRecordImp.h" #include "Macro.h" @@ -54,41 +59,27 @@ StdCmdDlgMacroRecord::StdCmdDlgMacroRecord() void StdCmdDlgMacroRecord::activated(int iMsg) { Q_UNUSED(iMsg); - Gui::Dialog::DlgMacroRecordImp cDlg(getMainWindow()); - cDlg.exec(); + if (!getGuiApplication()->macroManager()->isOpen()){ + Gui::Dialog::DlgMacroRecordImp cDlg(getMainWindow()); + if (cDlg.exec() && getAction()) { + getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("media-playback-stop")); + getAction()->setText(QCoreApplication::translate("StdCmdDlgMacroRecord", "S&top macro recording")); + getAction()->setToolTip(QCoreApplication::translate("StdCmdDlgMacroRecord", "Stop the macro recording session")); + } + } + else { + getGuiApplication()->macroManager()->commit(); + if (getAction()) { + getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("media-record")); + getAction()->setText(QString::fromLatin1(sMenuText)); + getAction()->setToolTip(QString::fromLatin1(sToolTipText)); + } + } } bool StdCmdDlgMacroRecord::isActive() { - return ! (getGuiApplication()->macroManager()->isOpen()); -} - -//=========================================================================== -// Std_MacroStopRecord -//=========================================================================== -DEF_STD_CMD_A(StdCmdMacroStopRecord) - -StdCmdMacroStopRecord::StdCmdMacroStopRecord() - : Command("Std_MacroStopRecord") -{ - sGroup = "Macro"; - sMenuText = QT_TR_NOOP("S&top macro recording"); - sToolTipText = QT_TR_NOOP("Stop the macro recording session"); - sWhatsThis = "Std_MacroStopRecord"; - sStatusTip = QT_TR_NOOP("Stop the macro recording session"); - sPixmap = "media-playback-stop"; - eType = 0; -} - -void StdCmdMacroStopRecord::activated(int iMsg) -{ - Q_UNUSED(iMsg); - getGuiApplication()->macroManager()->commit(); -} - -bool StdCmdMacroStopRecord::isActive() -{ - return getGuiApplication()->macroManager()->isOpen(); + return true; } //=========================================================================== @@ -317,7 +308,6 @@ void CreateMacroCommands() { CommandManager &rcCmdMgr = Application::Instance->commandManager(); rcCmdMgr.addCommand(new StdCmdDlgMacroRecord()); - rcCmdMgr.addCommand(new StdCmdMacroStopRecord()); rcCmdMgr.addCommand(new StdCmdDlgMacroExecute()); rcCmdMgr.addCommand(new StdCmdDlgMacroExecuteDirect()); rcCmdMgr.addCommand(new StdCmdMacroAttachDebugger()); diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 49c9fe0301..bf648a4ce8 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -1353,229 +1353,6 @@ void StdCmdViewTop::activated(int iMsg) } -//=============================================================================== -// StdCmdSelectFilter (dropdown toolbar button for Vertex, Edge & Face Selection) -//=============================================================================== - -DEF_STD_CMD_ACL(StdCmdSelectFilter) - -StdCmdSelectFilter::StdCmdSelectFilter() - : Command("Std_SelectFilter") -{ - sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Selection filter"); - sToolTipText = QT_TR_NOOP("Change the Selection filter"); - sStatusTip = QT_TR_NOOP("Change the Selection filter"); - sWhatsThis = "Std_SelectFilter"; - sPixmap = "selection-filter"; - eType = Alter3DView; -} - -void StdCmdSelectFilter::activated(int iMsg) -{ - Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); - if (iMsg==0) - rcCmdMgr.runCommandByName("Std_VertexSelection"); - else if (iMsg==1) - rcCmdMgr.runCommandByName("Std_EdgeSelection"); - else if (iMsg==2) - rcCmdMgr.runCommandByName("Std_FaceSelection"); - else if (iMsg==3) - rcCmdMgr.runCommandByName("Std_RemoveSelectionGate"); - else - return; - - // Since the default icon is reset when enabling/disabling the command we have - // to explicitly set the icon of the used command. - Gui::ActionGroup* pcAction = qobject_cast(_pcAction); - QList a = pcAction->actions(); - - assert(iMsg < a.size()); - pcAction->setIcon(a[iMsg]->icon()); -} - -Gui::Action * StdCmdSelectFilter::createAction() -{ - Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); - pcAction->setDropDownMenu(true); - applyCommandData(this->className(), pcAction); - - QAction* cmd0 = pcAction->addAction(QString()); - cmd0->setIcon(Gui::BitmapFactory().iconFromTheme("vertex-selection")); - cmd0->setShortcut(QKeySequence(QString::fromUtf8("X,S"))); - QAction* cmd1 = pcAction->addAction(QString()); - cmd1->setIcon(Gui::BitmapFactory().iconFromTheme("edge-selection")); - cmd1->setShortcut(QKeySequence(QString::fromUtf8("E,S"))); - QAction* cmd2 = pcAction->addAction(QString()); - cmd2->setIcon(Gui::BitmapFactory().iconFromTheme("face-selection")); - cmd2->setShortcut(QKeySequence(QString::fromUtf8("F,S"))); - QAction* cmd3 = pcAction->addAction(QString()); - cmd3->setIcon(Gui::BitmapFactory().iconFromTheme("clear-selection")); - cmd3->setShortcut(QKeySequence(QString::fromUtf8("C,S"))); - - _pcAction = pcAction; - languageChange(); - - pcAction->setIcon(Gui::BitmapFactory().iconFromTheme("selection-filter")); - int defaultId = 3; - pcAction->setProperty("defaultAction", QVariant(defaultId)); - - return pcAction; -} - -void StdCmdSelectFilter::languageChange() -{ - Command::languageChange(); - - if (!_pcAction) - return; - - Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); - - Gui::ActionGroup* pcAction = qobject_cast(_pcAction); - QList a = pcAction->actions(); - - Gui::Command* vertexSelection = rcCmdMgr.getCommandByName("Std_VertexSelection"); - if (vertexSelection) { - QAction* cmd0 = a[0]; - cmd0->setText(QApplication::translate("View_SelectionFilter", vertexSelection->getMenuText())); - cmd0->setToolTip(QApplication::translate("View_SelectionFilter", vertexSelection->getToolTipText())); - cmd0->setStatusTip(QApplication::translate("View_SelectionFilter", vertexSelection->getStatusTip())); - } - - Gui::Command* edgeSelection = rcCmdMgr.getCommandByName("Std_EdgeSelection"); - if (edgeSelection) { - QAction* cmd1 = a[1]; - cmd1->setText(QApplication::translate("View_SelectionFilter", edgeSelection->getMenuText())); - cmd1->setToolTip(QApplication::translate("View_SelectionFilter", edgeSelection->getToolTipText())); - cmd1->setStatusTip(QApplication::translate("View_SelectionFilter", edgeSelection->getStatusTip())); - } - - Gui::Command* faceSelection = rcCmdMgr.getCommandByName("Std_FaceSelection"); - if (faceSelection) { - QAction* cmd1 = a[2]; - cmd1->setText(QApplication::translate("View_SelectionFilter", faceSelection->getMenuText())); - cmd1->setToolTip(QApplication::translate("View_SelectionFilter", faceSelection->getToolTipText())); - cmd1->setStatusTip(QApplication::translate("View_SelectionFilter", faceSelection->getStatusTip())); - } - - Gui::Command* removeSelection = rcCmdMgr.getCommandByName("Std_RemoveSelectionGate"); - if (removeSelection) { - QAction* cmd2 = a[3]; - cmd2->setText(QApplication::translate("View_SelectionFilter", removeSelection->getMenuText())); - cmd2->setToolTip(QApplication::translate("View_SelectionFilter", removeSelection->getToolTipText())); - cmd2->setStatusTip(QApplication::translate("View_SelectionFilter", removeSelection->getStatusTip())); - } -} - -bool StdCmdSelectFilter::isActive() -{ - Gui::MDIView* view = Gui::getMainWindow()->activeWindow(); - return view && view->isDerivedFrom(Gui::View3DInventor::getClassTypeId()); -} - - -//=========================================================================== -// Std_VertexSelection -//=========================================================================== -DEF_3DV_CMD(StdCmdVertexSelection) - -StdCmdVertexSelection::StdCmdVertexSelection() - : Command("Std_VertexSelection") -{ - sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Vertex Selection"); - sToolTipText = QT_TR_NOOP("Select a Vertex/Vertices"); - sWhatsThis = "Std_VertexSelection"; - sStatusTip = QT_TR_NOOP("Select a Vertex/Vertices"); - sPixmap = "vertex-selection"; - sAccel = "X, S"; - eType = Alter3DView; -} - -void StdCmdVertexSelection::activated(int iMsg) -{ - Q_UNUSED(iMsg); - doCommand(Command::Gui,"Gui.Selection.addSelectionGate('SELECT Part::Feature SUBELEMENT Vertex')"); -} - - -//=========================================================================== -// Std_EdgeSelection -//=========================================================================== -DEF_3DV_CMD(StdCmdEdgeSelection) - -StdCmdEdgeSelection::StdCmdEdgeSelection() - : Command("Std_EdgeSelection") -{ - sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Edge Selection"); - sToolTipText = QT_TR_NOOP("Select Edge(s)"); - sWhatsThis = "Std_EdgeSelection"; - sStatusTip = QT_TR_NOOP("Select Edge(s)"); - sPixmap = "edge-selection"; - sAccel = "E, S"; - eType = Alter3DView; -} - -void StdCmdEdgeSelection::activated(int iMsg) -{ - Q_UNUSED(iMsg); - doCommand(Command::Gui,"Gui.Selection.addSelectionGate('SELECT Part::Feature SUBELEMENT Edge')"); -} - - -//=========================================================================== -// Std_FaceSelection -//=========================================================================== -DEF_3DV_CMD(StdCmdFaceSelection) - -StdCmdFaceSelection::StdCmdFaceSelection() - : Command("Std_FaceSelection") -{ - sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("Face Selection"); - sToolTipText = QT_TR_NOOP("Select Face(s)"); - sWhatsThis = "Std_FaceSelection"; - sStatusTip = QT_TR_NOOP("Select Face(s)"); - sPixmap = "face-selection"; - sAccel = "F, S"; - eType = Alter3DView; -} - -void StdCmdFaceSelection::activated(int iMsg) -{ - Q_UNUSED(iMsg); - doCommand(Command::Gui,"Gui.Selection.addSelectionGate('SELECT Part::Feature SUBELEMENT Face')"); -} - - - -//=========================================================================== -// Std_RemoveSelectionGate -//=========================================================================== -DEF_3DV_CMD(StdCmdRemoveSelectionGate) - -StdCmdRemoveSelectionGate::StdCmdRemoveSelectionGate() - : Command("Std_RemoveSelectionGate") -{ - sGroup = "Standard-View"; - sMenuText = QT_TR_NOOP("All selection filters cleared"); - sToolTipText = QT_TR_NOOP("All selection filters cleared"); - sWhatsThis = "Std_RemoveSelectionGate"; - sStatusTip = QT_TR_NOOP("All selection filters cleared"); - sPixmap = "clear-selection"; - sAccel = "C, S"; - eType = Alter3DView; -} - -void StdCmdRemoveSelectionGate::activated(int iMsg) -{ - Q_UNUSED(iMsg); - doCommand(Command::Gui,"Gui.Selection.removeSelectionGate()"); -} - - //=========================================================================== // Std_ViewIsometric //=========================================================================== @@ -4009,6 +3786,7 @@ namespace Gui { void CreateViewStdCommands() { + // NOLINTBEGIN CommandManager &rcCmdMgr = Application::Instance->commandManager(); // views @@ -4019,11 +3797,6 @@ void CreateViewStdCommands() rcCmdMgr.addCommand(new StdCmdViewRear()); rcCmdMgr.addCommand(new StdCmdViewRight()); rcCmdMgr.addCommand(new StdCmdViewTop()); - rcCmdMgr.addCommand(new StdCmdSelectFilter()); - rcCmdMgr.addCommand(new StdCmdVertexSelection()); - rcCmdMgr.addCommand(new StdCmdEdgeSelection()); - rcCmdMgr.addCommand(new StdCmdFaceSelection()); - rcCmdMgr.addCommand(new StdCmdRemoveSelectionGate()); rcCmdMgr.addCommand(new StdCmdViewIsometric()); rcCmdMgr.addCommand(new StdCmdViewDimetric()); rcCmdMgr.addCommand(new StdCmdViewTrimetric()); @@ -4085,8 +3858,6 @@ void CreateViewStdCommands() rcCmdMgr.addCommand(new CmdViewMeasureClearAll()); rcCmdMgr.addCommand(new CmdViewMeasureToggleAll()); rcCmdMgr.addCommand(new StdCmdSelBoundingBox()); - rcCmdMgr.addCommand(new StdCmdSelBack()); - rcCmdMgr.addCommand(new StdCmdSelForward()); rcCmdMgr.addCommand(new StdCmdTreeViewActions()); auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); @@ -4094,6 +3865,7 @@ void CreateViewStdCommands() hGrp->SetASCII("GestureRollFwdCommand","Std_SelForward"); if(hGrp->GetASCII("GestureRollBackCommand").empty()) hGrp->SetASCII("GestureRollBackCommand","Std_SelBack"); + // NOLINTEND } } // namespace Gui diff --git a/src/Gui/DemoMode.cpp b/src/Gui/DemoMode.cpp index e3c67c141c..5dadc25a0c 100644 --- a/src/Gui/DemoMode.cpp +++ b/src/Gui/DemoMode.cpp @@ -91,7 +91,7 @@ void DemoMode::reset() view->getViewer()->stopAnimating(); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath ("User parameter:BaseApp/Preferences/View"); - hGrp->Notify("UseNavigationAnimations"); + hGrp->Notify("UseAutoRotation"); } void DemoMode::accept() @@ -265,6 +265,7 @@ void DemoMode::onAutoPlay() Gui::View3DInventor* view = activeView(); if (view && !view->getViewer()->isAnimating()) { ui->playButton->setChecked(true); + startAnimation(view); } } @@ -272,9 +273,8 @@ void DemoMode::startAnimation(Gui::View3DInventor* view) { if (!view->getViewer()->isAnimationEnabled()) view->getViewer()->setAnimationEnabled(true); - - view->getViewer()->startSpinningAnimation(getDirection(view), - getSpeed(ui->speedSlider->value())); + view->getViewer()->startAnimating(getDirection(view), + getSpeed(ui->speedSlider->value())); } void DemoMode::onTimerCheckToggled(bool on) diff --git a/src/Gui/DlgPreferences.ui b/src/Gui/DlgPreferences.ui index aa54ee4c1f..35557edc1d 100644 --- a/src/Gui/DlgPreferences.ui +++ b/src/Gui/DlgPreferences.ui @@ -6,95 +6,163 @@ 0 0 - 570 - 454 + 800 + 600 Preferences + + + true true - - - 9 - - - 6 - - + + + + + + 0 + 0 + + + + + 120 + 0 + + + + + 128 + 16777215 + + + + Reset All + + + + + + + QDialogButtonBox::Help + + + + + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + Reset Tab + + + + 6 - + + 0 + + + 0 + + + 0 + + 0 - - - - 0 - 0 - - - - - 120 - 0 - - - - - 128 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - Qt::ScrollBarAlwaysOff - - - - 96 - 96 - - - - 12 - - - QListView::IconMode - - + + + + + + 0 + 0 + + + + + 120 + 0 + + + + + 128 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + Qt::ScrollBarAlwaysOff + + + + 96 + 96 + + + + 12 + + + QListView::IconMode + + + Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 120 + 40 + + + + + + + + - - - - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset - - - - - listBox - diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp index bd5eca34b9..f212ed93cf 100644 --- a/src/Gui/DlgPreferencesImp.cpp +++ b/src/Gui/DlgPreferencesImp.cpp @@ -29,6 +29,7 @@ # include # include # include +# include # include # include # include @@ -73,16 +74,29 @@ DlgPreferencesImp::DlgPreferencesImp(QWidget* parent, Qt::WindowFlags fl) invalidParameter(false), canEmbedScrollArea(true), restartRequired(false) { ui->setupUi(this); + setupConnections(); + QFontMetrics fm(font()); int length = QtTools::horizontalAdvance(fm, longestGroupName()); ui->listBox->setFixedWidth(Base::clamp(length + 20, 108, 120)); - ui->listBox->setGridSize(QSize(108, 75)); + ui->listBox->setGridSize(QSize(Base::clamp(length + 20, 108, 120), 75)); + + ui->buttonResetGroup->setFixedWidth(Base::clamp(length + 20, 108, 120)); + ui->buttonResetGroup->setLayout(new QVBoxLayout(ui->buttonResetGroup)); + auto ResetGroup = new QLabel(ui->buttonResetGroup); + ResetGroup->setAlignment(Qt::AlignCenter); + ResetGroup->setWordWrap(true); + ui->buttonResetGroup->layout()->setMargin(0); + ui->buttonResetGroup->layout()->addWidget(ResetGroup); + + ui->buttonResetAll->setFixedWidth(Base::clamp(length + 20, 108, 120)); + // remove unused help button setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); connect(ui->buttonBox, &QDialogButtonBox::clicked, this, &DlgPreferencesImp::onButtonBoxClicked); - connect(ui->buttonBox, &QDialogButtonBox::helpRequested, + connect(ui->buttonBox_2, &QDialogButtonBox::helpRequested, getMainWindow(), &MainWindow::whatsThis); connect(ui->listBox, &QListWidget::currentItemChanged, this, &DlgPreferencesImp::changeGroup); @@ -105,6 +119,17 @@ DlgPreferencesImp::~DlgPreferencesImp() } } +void DlgPreferencesImp::setupConnections() +{ + connect(ui->buttonResetTab, &QToolButton::clicked, + this, &DlgPreferencesImp::onButtonResetTabClicked); + connect(ui->buttonResetGroup, &QToolButton::clicked, + this, &DlgPreferencesImp::onButtonResetGroupClicked); + connect(ui->buttonResetAll, &QToolButton::clicked, + this, &DlgPreferencesImp::restoreDefaults); +} + + void DlgPreferencesImp::setupPages() { // make sure that pages are ready to create @@ -204,11 +229,37 @@ void DlgPreferencesImp::createPageInGroup(QTabWidget *tabWidget, const std::stri } } +void DlgPreferencesImp::relabelResetButtons() +{ + int groupIndex = ui->listBox->currentRow(); + QFontMetrics fm(font()); + QString group = fm.elidedText(ui->listBox->item(groupIndex)->text(), Qt::ElideRight, ui->buttonResetGroup->width()-4); + + QTabWidget* tabWidget = static_cast(ui->tabWidgetStack->currentWidget()); + int tabIndex = tabWidget->currentIndex(); + + static_cast(ui->buttonResetGroup->layout()->itemAt(0)->widget())->setText(tr("Reset Group %1").arg(group)); + ui->buttonResetTab->setText(tr("Reset Tab %1").arg(tabWidget->tabText(tabIndex))); +} + +void DlgPreferencesImp::changeTab(int current) +{ + Q_UNUSED(current); + + relabelResetButtons(); +} + void DlgPreferencesImp::changeGroup(QListWidgetItem *current, QListWidgetItem *previous) { if (!current) current = previous; ui->tabWidgetStack->setCurrentIndex(ui->listBox->row(current)); + + auto tabWidget = static_cast(ui->tabWidgetStack->currentWidget()); + connect(tabWidget, &QTabWidget::currentChanged, + this, &DlgPreferencesImp::changeTab); + + relabelResetButtons(); } /** @@ -352,8 +403,6 @@ void DlgPreferencesImp::onButtonBoxClicked(QAbstractButton* btn) { if (ui->buttonBox->standardButton(btn) == QDialogButtonBox::Apply) applyChanges(); - else if (ui->buttonBox->standardButton(btn) == QDialogButtonBox::Reset) - restoreDefaults(); } void DlgPreferencesImp::restoreDefaults() @@ -578,6 +627,14 @@ void DlgPreferencesImp::changeEvent(QEvent *e) QByteArray group = item->data(GroupNameRole).toByteArray(); item->setText(QObject::tr(group.constData())); } + + //resizes items list and buttons + QFontMetrics fm(font()); + int length = QtTools::horizontalAdvance(fm, longestGroupName()); + ui->listBox->setFixedWidth(Base::clamp(length + 20, 108, 120)); + ui->listBox->setGridSize(QSize(Base::clamp(length + 20, 108, 120), 75)); + ui->buttonResetGroup->setFixedWidth(Base::clamp(length + 20, 108, 120)); + ui->buttonResetAll->setFixedWidth(Base::clamp(length + 20, 108, 120)); } else { QWidget::changeEvent(e); } @@ -596,4 +653,86 @@ void DlgPreferencesImp::reload() applyChanges(); } +void DlgPreferencesImp::restorePageDefaults(PreferencePage** page) +{ + QList prefs = (*page)->findChildren(); + + for (const auto & pref : prefs) { + if (!pref->property("prefPath").isNull() && !pref->property("prefEntry").isNull()) { + std::string path = pref->property("prefPath").toString().toStdString(); + std::string entry = pref->property("prefEntry").toString().toStdString(); + + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(std::string("User parameter:BaseApp/Preferences/" + path).c_str()); + + for (const auto & pn : hGrp->GetParameterNames(entry.c_str())){ + hGrp->RemoveAttribute(pn.first, pn.second.c_str()); + } + } + } + + std::string pageName = (*page)->property("PageName").toString().toStdString(); + (*page) = WidgetFactory().createPreferencePage(pageName.c_str()); + (*page)->loadSettings(); + (*page)->setProperty("PageName", QVariant(QString::fromStdString(pageName))); +} + +void DlgPreferencesImp::onButtonResetTabClicked() +{ + auto tabWidget = static_cast(ui->tabWidgetStack->widget(ui->listBox->currentRow())); + + QMessageBox box(this); + box.setIcon(QMessageBox::Question); + box.setWindowTitle(tr("Reset Tab Parameters")); + box.setText(tr("All the parameters for the Tab %1 will be deleted.").arg(tabWidget->tabText(tabWidget->currentIndex()))); + box.setInformativeText(tr("Do you want to continue?")); + box.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + box.setDefaultButton(QMessageBox::No); + + if (box.exec() == QMessageBox::Yes) { + int pageIndex = tabWidget->currentIndex(); + QString pageText = tabWidget->tabText(pageIndex); + PreferencePage* page = qobject_cast(tabWidget->widget(pageIndex)); + + restorePageDefaults(&page); + page->setProperty("GroupName", tabWidget->property("GroupName")); + + tabWidget->removeTab(pageIndex); + tabWidget->insertTab(pageIndex, page, pageText); + tabWidget->setCurrentIndex(pageIndex); + + applyChanges(); + } +} + +void DlgPreferencesImp::onButtonResetGroupClicked() +{ + QMessageBox box(this); + box.setIcon(QMessageBox::Question); + box.setWindowTitle(tr("Reset Group Parameters")); + box.setText(tr("All the parameters for the Group %1 will be deleted.").arg(ui->listBox->currentItem()->text())); + box.setInformativeText(tr("Do you want to continue?")); + box.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + box.setDefaultButton(QMessageBox::No); + + if (box.exec() == QMessageBox::Yes) { + auto tabWidget = static_cast(ui->tabWidgetStack->widget(ui->listBox->currentRow())); + int pageIndex = tabWidget->currentIndex(); + + for (int i = 0; i < tabWidget->count(); i++) { + QString pageText = tabWidget->tabText(i); + PreferencePage* page = qobject_cast(tabWidget->widget(i)); + + restorePageDefaults(&page); + page->setProperty("GroupName", tabWidget->property("GroupName")); + + tabWidget->removeTab(i); + tabWidget->insertTab(i, page, pageText); + } + + tabWidget->setCurrentIndex(pageIndex); + + applyChanges(); + } +} + #include "moc_DlgPreferencesImp.cpp" diff --git a/src/Gui/DlgPreferencesImp.h b/src/Gui/DlgPreferencesImp.h index f734128d50..dd7486a2a2 100644 --- a/src/Gui/DlgPreferencesImp.h +++ b/src/Gui/DlgPreferencesImp.h @@ -130,12 +130,17 @@ public: void activeGroupPage(QString& group, int& index) const; protected: + void setupConnections(); void changeEvent(QEvent *e) override; void showEvent(QShowEvent*) override; void resizeEvent(QResizeEvent*) override; + void onButtonResetTabClicked(); + void onButtonResetGroupClicked(); + void relabelResetButtons(); protected Q_SLOTS: + void changeTab(int current); void changeGroup(QListWidgetItem *current, QListWidgetItem *previous); void onButtonBoxClicked(QAbstractButton*); void resizeWindow(int w, int h); @@ -149,6 +154,7 @@ private: void createPageInGroup(QTabWidget* tabWidget, const std::string& pageName); void applyChanges(); void restoreDefaults(); + void restorePageDefaults(PreferencePage**); QString longestGroupName() const; void restartIfRequired(); //@} diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp index 9a9f2292d6..cf1b6a1f5c 100644 --- a/src/Gui/DockWindowManager.cpp +++ b/src/Gui/DockWindowManager.cpp @@ -23,6 +23,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include # include # include # include @@ -337,18 +338,17 @@ void DockWindowManager::setup(DockWindowItems* items) ->GetGroup("MainWindow")->GetGroup("DockWindows"); QList docked = d->_dockedWindows; const QList& dws = items->dockWidgets(); - QList areas[4]; - for (QList::ConstIterator it = dws.begin(); it != dws.end(); ++it) { - QDockWidget* dw = findDockWidget(docked, it->name); - QByteArray dockName = it->name.toLatin1(); - bool visible = hPref->GetBool(dockName.constData(), it->visibility); + for (const auto& it : dws) { + QDockWidget* dw = findDockWidget(docked, it.name); + QByteArray dockName = it.name.toLatin1(); + bool visible = hPref->GetBool(dockName.constData(), it.visibility); if (!dw) { - QMap >::Iterator jt = d->_dockWindows.find(it->name); + QMap >::Iterator jt = d->_dockWindows.find(it.name); if (jt != d->_dockWindows.end()) { - dw = addDockWindow(jt.value()->objectName().toUtf8(), jt.value(), it->pos); + dw = addDockWindow(jt.value()->objectName().toUtf8(), jt.value(), it.pos); jt.value()->show(); - dw->toggleViewAction()->setData(it->name); + dw->toggleViewAction()->setData(it.name); dw->setVisible(visible); } } @@ -358,8 +358,27 @@ void DockWindowManager::setup(DockWindowItems* items) int index = docked.indexOf(dw); docked.removeAt(index); } + } - if (it->tabbed && dw) { + tabifyDockWidgets(items); +} + +void DockWindowManager::tabifyDockWidgets(DockWindowItems* items) +{ + // Tabify dock widgets only once to avoid to override the current layout + // in case it was modified by the user. The user shouldn't be forced to + // restore a possibly changed layout after switching to another workbench. + static bool tabify = false; + if (tabify) { + return; + } + + std::array, 4> areas; + const QList& dws = items->dockWidgets(); + QList docked = d->_dockedWindows; + for (const auto& it : dws) { + QDockWidget* dw = findDockWidget(docked, it.name); + if (it.tabbed && dw) { Qt::DockWidgetArea pos = getMainWindow()->dockWidgetArea(dw); switch (pos) { case Qt::LeftDockWidgetArea: @@ -380,6 +399,20 @@ void DockWindowManager::setup(DockWindowItems* items) } } + // tabify dock widgets for which "tabbed" is true and which have the same position + for (auto& area : areas) { + for (auto it : area) { + if (it != area.front()) { + getMainWindow()->tabifyDockWidget(area.front(), it); + tabify = true; + } + } + + // activate the first of the tabbed dock widgets + if (area.size() > 1) { + area.front()->raise(); + } + } } void DockWindowManager::saveState() diff --git a/src/Gui/DockWindowManager.h b/src/Gui/DockWindowManager.h index 366cd96738..76cc3c2c22 100644 --- a/src/Gui/DockWindowManager.h +++ b/src/Gui/DockWindowManager.h @@ -109,6 +109,7 @@ private Q_SLOTS: private: QDockWidget* findDockWidget(const QList&, const QString&) const; + void tabifyDockWidgets(DockWindowItems*); DockWindowManager(); ~DockWindowManager() override; diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 6d499d35d1..584c2d8a32 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -1380,7 +1380,7 @@ void Document::Save (Base::Writer &writer) const ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document"); if (hGrp->GetBool("SaveThumbnail", true)) { - int size = hGrp->GetInt("ThumbnailSize", 128); + int size = hGrp->GetInt("ThumbnailSize", 256); size = Base::clamp(size, 64, 512); std::list mdi = getMDIViews(); for (const auto & it : mdi) { diff --git a/src/Gui/Language/FreeCAD.ts b/src/Gui/Language/FreeCAD.ts index 671b2fa1a0..34a85276f7 100644 --- a/src/Gui/Language/FreeCAD.ts +++ b/src/Gui/Language/FreeCAD.ts @@ -137,22 +137,22 @@ - + Make link - + Make sub-link - + Import links - + Import all links @@ -167,12 +167,12 @@ - + Add a part - + Add a group @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings - + Orientation - + Q0 - + Q1 - + Q2 - + Q3 - + Current view @@ -3913,7 +3913,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation @@ -4007,34 +4007,59 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements + + + Rotation center indicator + + + Sphere size + + + + + Color and transparency + + + + + The size of the rotation center indicator + + + + + The color of the rotation center indicator + + + + 3D Navigation - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. - + Mouse... - + Navigation settings set - + Orbit style - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4042,181 +4067,171 @@ Free Turntable: the part will be rotated around the z-axis. - + Turntable - + Trackball - + Free Turntable - + Rotation mode - + Rotations in 3D will use current cursor position as center for rotation - + Window center - + Drag at cursor - + Object center - + Default camera orientation - + Default camera orientation when creating a new document or selecting the home view - + Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. - + mm - + Enable animated rotations - + Enable animation - + Zoom operations will be performed at position of mouse pointer - + Zoom at cursor - + Zoom step - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. - + Direction of zoom operations will be inverted - + Invert zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - + Disable touchscreen tilt gesture - - Show the rotation center when dragging. - - - - - Enable rotation center indication - - - - + Isometric - + Dimetric - + Trimetric - + Top - + Front - + Left - + Right - + Rear - + Bottom - + Custom @@ -5768,13 +5783,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file - + Select a directory @@ -5782,13 +5797,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as - - + + Open @@ -5796,12 +5811,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended - + All files (*.*) @@ -6745,20 +6760,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module - + Open %1 as - - - Select - - Gui::StdCmdDescription @@ -8156,51 +8166,51 @@ Do you want to continue? - + Identical physical path detected. It may cause unwanted overwrite of existing document! - + Are you sure you want to continue? - + Please check report view for more... - + Physical path: - - + + Document: - - + + Path: - + Identical physical path - + Could not save document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8209,102 +8219,102 @@ Would you like to save the file with a different name? - - - + + + Saving aborted - + Save dependent files - + The file contains external dependencies. Do you want to save the dependent files, too? - - + + Saving document failed - + Save document under new filename... - - + + Save %1 Document - + Document - - + + Failed to save document - + Documents contains cyclic dependencies. Do you still want to save them? - + Save a copy of the document under new filename... - + %1 document (*.FCStd) - + Document not closable - + The document is not closable for the moment. - + Document not saved - + The document%1 could not be saved. Do you want to cancel closing it? - + Undo - + Redo - + There are grouped transactions in the following documents with other preceding transactions - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8383,12 +8393,12 @@ Please open a browser window and type in: http://localhost:%1. - + Out of memory - + Not enough memory available to display the data. @@ -8414,7 +8424,7 @@ Please open a browser window and type in: http://localhost:%1. - + Transform @@ -8480,7 +8490,7 @@ Please open a browser window and type in: http://localhost:%1. - + Translation: @@ -8528,32 +8538,32 @@ Please open a browser window and type in: http://localhost:%1. - + Create link failed - + Failed to create relative link - + Unlink failed - + Replace link failed - + Failed to import links - + Failed to import all links @@ -9258,13 +9268,13 @@ the current copy will be lost. StdCmdGroup - + Create group - - Create a new group for ordering objects + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9323,13 +9333,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions - - + + Actions that apply to link objects @@ -9337,12 +9347,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links - + Import selected external link(s) @@ -9350,12 +9360,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links - + Import all links of the active document @@ -9368,8 +9378,8 @@ the current copy will be lost. - - Create a link to the selected object(s) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9389,12 +9399,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link - + Create a sub-object or sub-element link @@ -9402,12 +9412,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link - + Replace the selected object(s) with link @@ -9415,13 +9425,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation - - + + Link navigation actions @@ -9429,12 +9439,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links - + Select all links to the current selected object @@ -9442,12 +9452,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object - + Select the linked object and switch to its owner document @@ -9455,12 +9465,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object - + Select the deepest linked object and switch to its owner document @@ -9468,12 +9478,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink - + Strip on level of link @@ -9706,8 +9716,9 @@ the current copy will be lost. - - Create a new part and make it active + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10009,48 +10020,20 @@ the current copy will be lost. - - StdCmdSelBack - - - &Back - - - - - - Go back to previous selection - - - StdCmdSelBoundingBox - + &Bounding box - - + + Show selection bounding box - - StdCmdSelForward - - - &Forward - - - - - - Repeat the backed selection - - - StdCmdSelectAll @@ -10362,13 +10345,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions - - + + TreeView behavior options and actions @@ -10908,13 +10891,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view - - + + Recall previously stored temporary working view @@ -10922,13 +10905,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view - - + + Store a document-specific temporary working view @@ -10936,13 +10919,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand - - + + Expand active document and collapse all others @@ -10950,12 +10933,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging - + Initiate dragging of current selected tree items @@ -10963,13 +10946,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document - - + + Display all documents in the tree view @@ -10977,12 +10960,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection - + Preselect the object in 3D view when mouse over the tree item @@ -10990,12 +10973,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection - + Record selection in tree view in order to go back/forward using navigation button @@ -11017,13 +11000,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document - - + + Only display the active document in the tree view @@ -11031,12 +11014,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement - + Auto adjust placement on drag and drop objects across coordinate systems @@ -11044,12 +11027,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection - + Auto expand tree item when the corresponding object is selected in 3D view @@ -11057,12 +11040,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view - + Auto switch to the 3D view containing the selected item @@ -11293,7 +11276,7 @@ Do you want to save the document now? Std_Group - + Group @@ -11982,12 +11965,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube - + Drag and place NaviCube @@ -12831,4 +12814,30 @@ You can now use Theme to get a full customization of the interface. + + StdCmdSelBack + + + Selection Back + + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + + StdCmdSelForward + + + Selection Forward + + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + diff --git a/src/Gui/Language/FreeCAD_be.ts b/src/Gui/Language/FreeCAD_be.ts index a77696af2d..45ef388cf5 100644 --- a/src/Gui/Language/FreeCAD_be.ts +++ b/src/Gui/Language/FreeCAD_be.ts @@ -137,22 +137,22 @@ Стварыць суполку сувязей - + Make link Стварыць сувязь - + Make sub-link Стварыць дадатковую сувязь - + Import links Імпартаваць сувязь - + Import all links Імпартаваць усе сувязі @@ -167,12 +167,12 @@ Уставіць тэкставы дакумент - + Add a part Дадаць дэталь - + Add a group Дадаць суполку @@ -778,37 +778,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Налады камеры - + Orientation Арыентацыя - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Бягучы выгляд @@ -1818,22 +1818,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Знайсці файл: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Пошук імёнаў файлаў без уліку рэгістра, падтрымліваюцца рэгулярныя выразы Find in files: - Find in files: + Знайсці ў файлах: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Фільтраванне па зместу файла без уліку рэгістра, падтрымліваюцца рэгулярныя выразы @@ -3951,7 +3951,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Навігацыя @@ -4045,35 +4045,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Асноўны колер для ўсіх элементаў + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Трохмерная навігацыя - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Спіс налад кнопак мышы для кожнай абранай налады навігацыі. Абярыце набор, потым націсніце кнопку, каб паглядзець названыя наладкі. - + Mouse... Дэталі стылю навігацыі... - + Navigation settings set Набор налад навігацыі - + Orbit style Стыль арбіты - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4084,116 +4109,116 @@ Free Turntable: the part will be rotated around the z-axis. Свабодны паваротны круг: дэталь будзе круціцца вакол восі z. - + Turntable Паваротны круг - + Trackball Трэкбол - + Free Turntable Свабодны паваротны круг - + Rotation mode Рэжым вярчэння - + Rotations in 3D will use current cursor position as center for rotation Вярчэнне ў трохмерным прадстаўленні будзе ўжываць бягучае становішча курсора ў якасці цэнтру для вярчэння - + Window center Цэнтр акна - + Drag at cursor Перанесці да паказальніка - + Object center Цэнтр аб'екту - + Default camera orientation Першапачатковая арыентацыя камеры - + Default camera orientation when creating a new document or selecting the home view Першапачатковая арыентацыя камеры пры стварэнні новага дакументу ці выбару пачатковага выгляду - + Camera zoom Маштаб камеры - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Задаць маштаб камеры для новых дакументаў. Значэнне - дыяметр сферы, які павінен змясціцца на экране. - + mm мм - + Enable animated rotations Уключыць анімаванае вярчэнне - + Enable animation Уключыць анімацыю - + Zoom operations will be performed at position of mouse pointer Аперацыі маштабавання будуць выконвацца ў становішчы паказальніка мышы - + Zoom at cursor Маштаб на паказальніку - + Zoom step Крок маштабавання - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Наколькі будзе маштабавана. Крок маштабавання '1' азначае каэфіцыент 7.5 для кожнага кроку маштабавання. - + Direction of zoom operations will be inverted Напрамак аперацый маштабавання будзе інвертаваны - + Invert zoom Інвертаваць маштаб - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4202,67 +4227,57 @@ Mouse tilting is not disabled by this setting. Нахіл мышы гэтай наладай не адключаны. - + Disable touchscreen tilt gesture Адключыць жэст нахілу для сэнсарнага экрану - - Show the rotation center when dragging. - Паказваць цэнтр вярчэння пры перацягванні. - - - - Enable rotation center indication - Уключыць адлюстраванне цэнтра вярчэння - - - + Isometric Ізаметрычны - + Dimetric Дыметрычны - + Trimetric Трыметрычны - + Top Зверху - + Front Спераду - + Left Злева - + Right Справа - + Rear Ззаду - + Bottom Знізу - + Custom Карыстальніцкі @@ -4314,12 +4329,13 @@ horizontal space in Python console Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Інтэрвал прафіліроўшчыка Python (мілісекунды): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + Інтэрвал, з якім выконваецца прафіліроўшчык пры выкананні кода на Python (каб графічны інтэрфейс працягваў адказваць). +Задаць 0, каб адключыць. @@ -4448,27 +4464,27 @@ Larger value eases to pick things, but can make small features impossible to sel Color Bar - Color Bar + Панэль колера Label text color - Label text color + Колер тэксту меткі Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Колер тэксту меткі на панэлі колеру (ужываецца ў варштатах Паліганальная сеткі і МКЭ) Label text size - Label text size + Памер шрыфту меткі Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Памер тэксту меткі на панэлі колеру (ужываецца ў варштатах Паліганальная сеткі і МКЭ) @@ -5829,13 +5845,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Абраць файл - + Select a directory Абраць каталог @@ -5843,13 +5859,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Захаваць як - - + + Open Адчыніць @@ -5857,12 +5873,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Пашыраны - + All files (*.*) Усе файлы (*.*) @@ -5990,7 +6006,7 @@ Do you want to save your changes? Graphviz format - Graphviz format + Фармат Graphviz @@ -6811,20 +6827,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Абраць модуль - + Open %1 as Адчыніць %1 як - - - Select - Абраць - Gui::StdCmdDescription @@ -6914,7 +6925,7 @@ Do you want to specify another directory? Position - Становішча + Position @@ -8233,7 +8244,7 @@ Do you want to continue? Зашмат адчыненых ненадакучлівых апавяшчэнняў. Апавяшчэнні прапускаюцца! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8242,44 +8253,44 @@ Do you want to continue? - + Are you sure you want to continue? Ці ўпэўненыя вы, што жадаеце працягнуць? - + Please check report view for more... Калі ласка, праверце прагляд справаздачы, каб атрымаць дадатковую інфармацыю... - + Physical path: Фізічны шлях: - - + + Document: Дакумент: - - + + Path: Шлях: - + Identical physical path Ідэнтычны фізічны шлях - + Could not save document Не атрымалася захаваць дакумент - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8292,102 +8303,102 @@ Would you like to save the file with a different name? Ці жадаеце вы захаваць файл з іншым іменем? - - - + + + Saving aborted Захаванне перапынена - + Save dependent files Захаваць залежныя файлы - + The file contains external dependencies. Do you want to save the dependent files, too? Файл утрымлівае знешнія залежнасці. Ці жадаеце вы таксама захаваць залежныя файлы? - - + + Saving document failed Не атрымалася захаваць дакумент - + Save document under new filename... Захаваць дакумент з новым іменем файла... - - + + Save %1 Document Захаваць дакумент %1 - + Document Дакумент - - + + Failed to save document Не атрымалася захаваць дакумент - + Documents contains cyclic dependencies. Do you still want to save them? Дакументы ўтрымлівае цыклічныя залежнасці. Ці жадаеце вы яшчэ іх захаваць? - + Save a copy of the document under new filename... Захаваць копію дакумента з новым іменем файла... - + %1 document (*.FCStd) Дакумент %1 (*.FCStd) - + Document not closable Дакумент не можа быць зачынены - + The document is not closable for the moment. На дадзены момант дакумент нельга зачыніць. - + Document not saved Дакумент не захаваны - + The document%1 could not be saved. Do you want to cancel closing it? Дакумент %1 не атрымалася захаваць. Ці жадаеце вы скасаваць яго закрыццё? - + Undo Адкаціць - + Redo Зрабіць нанова - + There are grouped transactions in the following documents with other preceding transactions У наступных дакументах згрупаваныя аперацыі з іншымі папярэднімі аперацыямі - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8470,12 +8481,12 @@ Please open a browser window and type in: http://localhost:%1. Налады... - + Out of memory Не хапае памяці - + Not enough memory available to display the data. Недастаткова памяці для адлюстравання дадзеных. @@ -8501,7 +8512,7 @@ Please open a browser window and type in: http://localhost:%1. Рухаць заметку - + Transform Пераўтварыць @@ -8567,14 +8578,14 @@ Please open a browser window and type in: http://localhost:%1. %1 не пусты, ці выдаліць таксама і яго змест? - + Translation: Перанос: Translation XY: - Translation XY: + Перанос XY: @@ -8615,32 +8626,32 @@ Please open a browser window and type in: http://localhost:%1. Не атрымалася стварыць суполку сувязяў - + Create link failed Не атрымалася стварыць сувязь - + Failed to create relative link Не атрымалася стварыць адносную сувязь - + Unlink failed Не атрымалася разарваць сувязь - + Replace link failed Не атрымалася замяніць сувязь - + Failed to import links Не атрымалася імпартаваць сувязі - + Failed to import all links Не атрымалася імпартаваць усе сувязі @@ -9349,14 +9360,14 @@ the current copy will be lost. StdCmdGroup - + Create group Стварыць суполку - - Create a new group for ordering objects - Стварыць новую суполка для ўпарадкаваных аб'ектаў + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9414,13 +9425,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Дзеянні з сувязямі - - + + Actions that apply to link objects Дзеянні, якія прымяняюцца да аб'ектаў сувязяў @@ -9428,12 +9439,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Імпартаваць сувязь - + Import selected external link(s) Імпартуе абраныя вонкавыя сувязі @@ -9441,12 +9452,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Імпартаваць усе сувязі - + Import all links of the active document Імпартуе ўсе сувязі бягучага дакумента @@ -9459,9 +9470,9 @@ the current copy will be lost. Стварыць сувязь - - Create a link to the selected object(s) - Стварае сувязі на абраныя аб'екты + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9480,12 +9491,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Стварыць дадатковую сувязь - + Create a sub-object or sub-element link Стварае сувязь на ўкладзены аб'ект ці ўкладзены элемент @@ -9493,12 +9504,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Замяніць на сувязь - + Replace the selected object(s) with link Замяняе абраныя аб'екты на сувязі @@ -9506,13 +9517,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Навігацыя па сувязях - - + + Link navigation actions Дзеянні пры навігацыі па сувязях @@ -9520,12 +9531,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Абраць усе сувязі - + Select all links to the current selected object Абірае ўсе сувязі на бягучы абраны аб'ект @@ -9533,12 +9544,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Перайсці да звязанага аб'екту - + Select the linked object and switch to its owner document Абірае звязаны аб'ект і пераключаецца на дакумент яго ўладальніка @@ -9546,12 +9557,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Перайсці да самага глыбокага звязанага аб'екту - + Select the deepest linked object and switch to its owner document Абірае самы глыбокі звязаны аб'ект і пераключаецца на дакумент яго ўладальніка @@ -9559,12 +9570,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Выдаліць сувязь - + Strip on level of link Адвязаць узровень сувязі @@ -9797,9 +9808,11 @@ the current copy will be lost. Стварыць дэталь - - Create a new part and make it active - Стварыць новую дэталь і зрабіць яе бягучай + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10100,48 +10113,20 @@ the current copy will be lost. Інспектар сцэны - - StdCmdSelBack - - - &Back - &Назад - - - - - Go back to previous selection - Вярнуцца да папярэдняга абранага - - StdCmdSelBoundingBox - + &Bounding box &Габарыты - - + + Show selection bounding box Паказаць габарыты абранага - - StdCmdSelForward - - - &Forward - &Наперад - - - - - Repeat the backed selection - Паўтарыць захаваны выбар - - StdCmdSelectAll @@ -10453,13 +10438,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Дзеянні з дрэвам - - + + TreeView behavior options and actions Налады і дзеянні паводзін дрэва @@ -10999,13 +10984,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Выклікаць працоўны выгляд - - + + Recall previously stored temporary working view Выклікае раней захаваны часовы працоўны выгляд @@ -11013,13 +10998,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Запомніць працоўны выгляд - - + + Store a document-specific temporary working view Запамінае часовы працоўны выгляд для дакумента @@ -11027,13 +11012,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Згарнуць/Разгарнуць - - + + Expand active document and collapse all others Разгортвае бягучы дакумент і згортвае ўсе астатнія @@ -11041,12 +11026,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Распачаць перацягванне - + Initiate dragging of current selected tree items Распачынае перацягвання бягучых абраных элементаў дрэва @@ -11054,13 +11039,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Шматкампанентны дакумент - - + + Display all documents in the tree view Адлюстраваць усе дакументы ў праглядзе дрэва @@ -11068,12 +11053,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Папярэдні выбар - + Preselect the object in 3D view when mouse over the tree item Папярэдне абраць аб'ект у трохмерным прадстаўленні, калі паказальнік мышы наведзены на элемент дрэва @@ -11081,12 +11066,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Запісаць абранае - + Record selection in tree view in order to go back/forward using navigation button Выбар запісу ў праглядзе дрэва, для пераходу назад/уперад з дапамогай кнопкі навігацыі @@ -11108,13 +11093,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Адзінкавы дакумент - - + + Only display the active document in the tree view Адлюстраваць толькі бягучы дакумент у праглядзе дрэва @@ -11122,12 +11107,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Сінхранізаваць размяшчэнне - + Auto adjust placement on drag and drop objects across coordinate systems Аўтаматычная налада размяшчэння пры перацягванні аб'ектаў у розных сістэмах каардынатаў @@ -11135,12 +11120,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Сінхранізаваць абранае - + Auto expand tree item when the corresponding object is selected in 3D view Аўтаматычнае разгортванне элемента дрэва, калі абраны адпаведны аб'ект у трохмерным прадстаўленні @@ -11148,12 +11133,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Сінхранізаваць выгляд - + Auto switch to the 3D view containing the selected item Аўтаматычнае пераключэнне на трохмернае прадстаўленне, якое змяшчае абраны элемент @@ -11388,7 +11373,7 @@ Do you want to save the document now? Std_Group - + Group Суполка @@ -12085,12 +12070,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Рухомы куб навігацыі - + Drag and place NaviCube Перацягнуць у Куб навігацыі @@ -12941,13 +12926,39 @@ You can now use Theme to get a full customization of the interface. Export dependency graph... - Export dependency graph... + Экспартаваць графік залежнасці... Export the dependency graph to a file - Export the dependency graph to a file + Экспартаваць графік залежнасці ў файл + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_ca.ts b/src/Gui/Language/FreeCAD_ca.ts index c065bacdd6..b94f29be6e 100644 --- a/src/Gui/Language/FreeCAD_ca.ts +++ b/src/Gui/Language/FreeCAD_ca.ts @@ -137,22 +137,22 @@ Crea un grup d'enllaç - + Make link Crea un enllaç - + Make sub-link Crea un subenllaç - + Import links Importa enllaços - + Import all links Importa tots els enllaços @@ -167,12 +167,12 @@ Afegeix document de text - + Add a part Afegeix una peça - + Add a group Afegeix un grup @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Paràmetres de la càmera - + Orientation Orientació - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vista actual @@ -3959,7 +3959,7 @@ També podeu utilitzar la forma: Joan Peris <joan@peris.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navegació @@ -4053,35 +4053,60 @@ També podeu utilitzar la forma: Joan Peris <joan@peris.com> Base color for all elements Color base per tots els elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navegació 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Mostra les configuracions del botó del ratolí per a cada paràmetre de navegació escollit. Seleccioneu un paràmetre i, a continuació, premeu el botó per a veure aquestes configuracions. - + Mouse... Ratolí... - + Navigation settings set Conjunt de configuracions de navegació - + Orbit style Estil d'òrbita - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4092,183 +4117,173 @@ Plataforma giratòria (Turntable): La peça girarà sobre l'eix z (amb eixos res Plataforma giratòria lliure: la peça girarà sobre l'eix z. - + Turntable Torn - + Trackball Ratolí de bola - + Free Turntable Plataforma giratòria lliure - + Rotation mode Mode de rotació - + Rotations in 3D will use current cursor position as center for rotation Les rotacions en 3D utilitzaran la posició actual del cursor com a centre de rotació - + Window center Centre de la finestra - + Drag at cursor Arrossega al cursor - + Object center Centre de l'objecte - + Default camera orientation Orientació de la càmera per defecte - + Default camera orientation when creating a new document or selecting the home view Orientació de la càmera per defecte en crear un nou document o en seleccionar la vista inicial - + Camera zoom Zoom de Càmera - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Configura el zoom de la càmera per als nous documents. El valor és el diàmetre de l’esfera per a ajustar-se a la pantalla. - + mm mm - + Enable animated rotations Habilita les rotacions animades - + Enable animation Habilita l'animació - + Zoom operations will be performed at position of mouse pointer Les operacions del zoom es realitzaran en la posició del punter del ratolí - + Zoom at cursor Zoom al cursor - + Zoom step Pas de zoom - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. En quant serà ampliat. Un valor de '1' implica un factor de 7,5 per cada grau d'ampliació. - + Direction of zoom operations will be inverted La direcció de les operacions de zoom s’invertirà - + Invert zoom Invertix el zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. Evita la inclinació de la vista quan s'està fent zoom amb els dits. Sols afecta l'estil de Navegació amb gestos. Aquesta opció no desactiva la inclinació del ratolí. - + Disable touchscreen tilt gesture Desactiva el gest d'inclinació de la pantalla tàctil - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Isomètrica - + Dimetric Dimètric - + Trimetric Trimètric - + Top Planta - + Front Alçat - + Left Esquerra - + Right Dreta - + Rear Posterior - + Bottom Inferior - + Custom Personalitzat @@ -5828,13 +5843,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Seleccioneu un fitxer - + Select a directory Seleccioneu un directori @@ -5842,13 +5857,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Anomena i desa - - + + Open Obre @@ -5856,12 +5871,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Expandit - + All files (*.*) Tots els fitxers (*.*) @@ -6807,20 +6822,15 @@ Esteu segur que voleu sortir sense desar les dades? Gui::SelectModule - + Select module Seleccioneu el mòdul - + Open %1 as Obri %1 com a - - - Select - Selecciona - Gui::StdCmdDescription @@ -8219,7 +8229,7 @@ Do you want to continue? Massa notificacions no intrusives obertes. S'ometran les notificacions! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8228,44 +8238,44 @@ Do you want to continue? - + Are you sure you want to continue? Segur que voleu continuar? - + Please check report view for more... Si us plau, comproveu la vista d'informe per obtenir més informació... - + Physical path: Ruta física: - - + + Document: Document: - - + + Path: Camí: - + Identical physical path Ruta física idèntica - + Could not save document No s'ha pogut desar el document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8278,102 +8288,102 @@ Would you like to save the file with a different name? Voleu desar-lo amb un nom diferent? - - - + + + Saving aborted S'ha interromput el desament - + Save dependent files Desa els fitxers dependents - + The file contains external dependencies. Do you want to save the dependent files, too? El fitxer conté dependències externes. Voleu desar també els fitxers dependents? - - + + Saving document failed No s'ha pogut desar el document - + Save document under new filename... Guarda el document amb un altre nom... - - + + Save %1 Document Guarda el document %1 - + Document Document - - + + Failed to save document No s'ha pogut desar el document - + Documents contains cyclic dependencies. Do you still want to save them? Els documents contenen dependències cícliques. Encara voleu desar-los? - + Save a copy of the document under new filename... Guarda una còpia del document amb un altre nom... - + %1 document (*.FCStd) Document %1 (*.FCStd) - + Document not closable No es pot tancar el document. - + The document is not closable for the moment. De moment el document no es pot tancar. - + Document not saved Document no desat - + The document%1 could not be saved. Do you want to cancel closing it? No s'ha pogut desar el document %1. Vol cancel·lar el tancament? - + Undo Desfés - + Redo Refés - + There are grouped transactions in the following documents with other preceding transactions Hi ha transaccions agrupades en els documents següents amb altres transaccions anteriors - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8454,12 +8464,12 @@ Please open a browser window and type in: http://localhost:%1. Opcions... - + Out of memory No hi ha prou memòria. - + Not enough memory available to display the data. No hi ha prou memòria disponible per a mostrar les dades. @@ -8485,7 +8495,7 @@ Please open a browser window and type in: http://localhost:%1. Mou l'anotació - + Transform Transformar @@ -8551,7 +8561,7 @@ Please open a browser window and type in: http://localhost:%1. L'%1 no és buit, voleu esborrar-ne le contingut? - + Translation: Translació: @@ -8599,32 +8609,32 @@ Please open a browser window and type in: http://localhost:%1. No s'ha pogut crear el grup d'enllaç - + Create link failed No s'ha pogut crear l'enllaç - + Failed to create relative link No s'ha pogut crear l'enllaç relatiu - + Unlink failed No s'ha pogut desenllaçar - + Replace link failed No s'ha pogut reemplaçar l'enllaç - + Failed to import links No s'han pogut importar els enllaços - + Failed to import all links No s'han pogut importar tots els enllaços @@ -9334,14 +9344,14 @@ la còpia actual es perdrà. StdCmdGroup - + Create group Crea un grup - - Create a new group for ordering objects - Crea un grup nou per ordenar els objectes + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9399,13 +9409,13 @@ la còpia actual es perdrà. StdCmdLinkActions - + Link actions Enllaça accions - - + + Actions that apply to link objects Accions que s'apliquen a objectes enllaçats @@ -9413,12 +9423,12 @@ la còpia actual es perdrà. StdCmdLinkImport - + Import links Importa enllaços - + Import selected external link(s) Importa els enllaços externs seleccionats @@ -9426,12 +9436,12 @@ la còpia actual es perdrà. StdCmdLinkImportAll - + Import all links Importa tots els enllaços - + Import all links of the active document Importa tots els enllaços del document actiu @@ -9444,9 +9454,9 @@ la còpia actual es perdrà. Crea un enllaç - - Create a link to the selected object(s) - Crea un enllaç a l'objectes o objectes seleccionats + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9465,12 +9475,12 @@ la còpia actual es perdrà. StdCmdLinkMakeRelative - + Make sub-link Crea un subenllaç - + Create a sub-object or sub-element link Crea un enllaç d'un subobjecte o subelement @@ -9478,12 +9488,12 @@ la còpia actual es perdrà. StdCmdLinkReplace - + Replace with link Substitueix per un enllaç - + Replace the selected object(s) with link Substitueix els objectes seleccionats per un enllaç @@ -9491,13 +9501,13 @@ la còpia actual es perdrà. StdCmdLinkSelectActions - + Link navigation Navegació a través d'enllaços - - + + Link navigation actions Accions de navegació a través d'enllaços @@ -9505,12 +9515,12 @@ la còpia actual es perdrà. StdCmdLinkSelectAllLinks - + Select all links Selecciona tots els enllaços - + Select all links to the current selected object Selecciona tots els enllaços a l'objecte seleccionat actualment @@ -9518,12 +9528,12 @@ la còpia actual es perdrà. StdCmdLinkSelectLinked - + Go to linked object Ves a l'objecte enllaçat - + Select the linked object and switch to its owner document Seleccioneu objecte enllaçat i canvieu al document de propietari @@ -9531,12 +9541,12 @@ la còpia actual es perdrà. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Ves a l’objecte enllaçat més profund - + Select the deepest linked object and switch to its owner document Seleccioneu l'objecte enllaçat més profund i canvieu al document de propietari @@ -9544,12 +9554,12 @@ la còpia actual es perdrà. StdCmdLinkUnlink - + Unlink Desenllaça - + Strip on level of link Elimina en el nivell d'enllaç @@ -9782,9 +9792,11 @@ la còpia actual es perdrà. Crear part - - Create a new part and make it active - Crea una part nova i la fa activa + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10085,48 +10097,20 @@ la còpia actual es perdrà. Inspector d'escena - - StdCmdSelBack - - - &Back - &Ves arrere - - - - - Go back to previous selection - Torna a la selecció anterior - - StdCmdSelBoundingBox - + &Bounding box &Caixa contenidora - - + + Show selection bounding box Mostra la caixa contenidora de la selecció - - StdCmdSelForward - - - &Forward - &Ves avant - - - - - Repeat the backed selection - Repeteix la selecció emmagatzemada - - StdCmdSelectAll @@ -10438,13 +10422,13 @@ la còpia actual es perdrà. StdCmdTreeViewActions - + TreeView actions Accions de la vista d'arbre - - + + TreeView behavior options and actions Opcions i accions del comportament de la vista d'arbre @@ -10984,13 +10968,13 @@ la còpia actual es perdrà. StdRecallWorkingView - + Recall working view Torna a la vista de treball - - + + Recall previously stored temporary working view Torna a la vista de treball temporalment desada @@ -10998,13 +10982,13 @@ la còpia actual es perdrà. StdStoreWorkingView - + Store working view Desa la vista de treball - - + + Store a document-specific temporary working view Desa una vista d'un document específic temporal de treball @@ -11012,13 +10996,13 @@ la còpia actual es perdrà. StdTreeCollapseDocument - + Collapse/Expand Contreu/Expandeix - - + + Expand active document and collapse all others Expandeix el document actiu i contreu tots els altres @@ -11026,12 +11010,12 @@ la còpia actual es perdrà. StdTreeDrag - + Initiate dragging Inicia l'arrossegament - + Initiate dragging of current selected tree items Inicia l'arrossegament dels elements d'arbre seleccionats actualment @@ -11039,13 +11023,13 @@ la còpia actual es perdrà. StdTreeMultiDocument - + Multi document Document múltiple - - + + Display all documents in the tree view Mostra tots els documents en la vista d'arbre @@ -11053,12 +11037,12 @@ la còpia actual es perdrà. StdTreePreSelection - + Pre-selection Preselecció - + Preselect the object in 3D view when mouse over the tree item Selecciona l'objecte en vista 3D en fer clic amb el ratolí sobre l'element de l'arbre @@ -11066,12 +11050,12 @@ la còpia actual es perdrà. StdTreeRecordSelection - + Record selection Grava la selecció - + Record selection in tree view in order to go back/forward using navigation button Grava la selecció en la vista de l'arbre per a anar enrere/endavant mitjançant el botó de navegació @@ -11093,13 +11077,13 @@ la còpia actual es perdrà. StdTreeSingleDocument - + Single document Document únic - - + + Only display the active document in the tree view Mostrar només el document actiu a la vista d'arbre @@ -11107,12 +11091,12 @@ la còpia actual es perdrà. StdTreeSyncPlacement - + Sync placement Sincronitza el posicionament - + Auto adjust placement on drag and drop objects across coordinate systems Ajusta automàticament el posicionament en arrossegar i deixar anar objectes en els sistemes de coordenades @@ -11120,12 +11104,12 @@ la còpia actual es perdrà. StdTreeSyncSelection - + Sync selection Sincronitza la selecció - + Auto expand tree item when the corresponding object is selected in 3D view Expandeix automàticament l’element de l'arbre quan l’objecte corresponent està seleccionat en la vista 3D @@ -11133,12 +11117,12 @@ la còpia actual es perdrà. StdTreeSyncView - + Sync view Sincronitza la vista - + Auto switch to the 3D view containing the selected item Canvia automàticament a la vista 3D que conté l’element seleccionat @@ -11373,7 +11357,7 @@ Voleu desar el document ara? Std_Group - + Group Grup @@ -12071,12 +12055,12 @@ en iniciar FreeCAD NaviCubeDraggableCmd - + Movable navigation cube Cub de navegació movible - + Drag and place NaviCube Arrossega i posiciona el NaviCube @@ -12932,4 +12916,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_cs.ts b/src/Gui/Language/FreeCAD_cs.ts index ee87496ebe..621632d96f 100644 --- a/src/Gui/Language/FreeCAD_cs.ts +++ b/src/Gui/Language/FreeCAD_cs.ts @@ -137,22 +137,22 @@ Vytvořit skupinu odkazů - + Make link Vytvořit odkaz - + Make sub-link Vytvořit pododkaz - + Import links Importovat odkazy - + Import all links Importovat všechny odkazy @@ -167,12 +167,12 @@ Vložit textový dokument - + Add a part Přidat část - + Add a group Přidat skupinu @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Nastavení kamery - + Orientation Orientace - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Aktuální pohled @@ -3961,7 +3961,7 @@ Můžete také použít tuto formu: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navigace @@ -4055,35 +4055,60 @@ Můžete také použít tuto formu: John Doe <john@doe.com> Base color for all elements Základní barva pro všechny prvky + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D navigace - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Seznam nastavení tlačítek myši pro každé zvolené nastavení navigace. Vyberte sadu a poté stiskněte tlačítko pro zobrazení uvedených konfigurací. - + Mouse... Myš... - + Navigation settings set Nastavení navigace - + Orbit style Styl orbitu - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4094,116 +4119,116 @@ Otočný stůl: díl se bude otáčet kolem osy z (s omezením os). Volný otočný stůl: díl se bude otáčet kolem osy z. - + Turntable Otočný stůl - + Trackball Trackball - + Free Turntable Volný otočný stůl - + Rotation mode Režim rotace - + Rotations in 3D will use current cursor position as center for rotation 3D Rotace bude používat aktuální polohu kurzoru jako střed rotace - + Window center Střed okna - + Drag at cursor Přetáhněte kurzorem - + Object center Střed objektu - + Default camera orientation Výchozí orientace kamery - + Default camera orientation when creating a new document or selecting the home view Výchozí orientace kamery při vytváření nového dokumentu nebo výběru domácího zobrazení - + Camera zoom Zoom kamery - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Nastaví přiblížení kamery pro nové dokumenty. Hodnota je průměr koule tak, aby se vešla na obrazovku. - + mm mm - + Enable animated rotations Povolit animované otáčení - + Enable animation Zapnout animaci - + Zoom operations will be performed at position of mouse pointer Přiblížení bude provedeno na poloze kurzoru myši - + Zoom at cursor Přibližovat nad kurzorem - + Zoom step Krok přiblížení - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Jak moc bude příblížen. Krok přiblížení "1" znamená faktor 7,5 pro každý krok přiblížení. - + Direction of zoom operations will be inverted Směr operace přiblížení bude obrácen - + Invert zoom Invertovat přiblížení - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4212,67 +4237,57 @@ Ovlivňuje pouze navigační styl gesta. Naklánění myší není v tomto nastavení zakázáno. - + Disable touchscreen tilt gesture Zakázat dotykové gesto naklánění - - Show the rotation center when dragging. - Zobrazit střed rotace při přetažení. - - - - Enable rotation center indication - Povolit indikaci středu rotace - - - + Isometric Izometrie - + Dimetric Dimetrie - + Trimetric Trimetrie - + Top Horní - + Front Přední - + Left Vlevo - + Right Vpravo - + Rear Zadní - + Bottom Dole - + Custom Vlastní @@ -5832,13 +5847,13 @@ Chcete uložit provedené změny? Gui::FileChooser - - + + Select a file Vyberte soubor - + Select a directory Vyberte adresář @@ -5846,13 +5861,13 @@ Chcete uložit provedené změny? Gui::FileDialog - + Save as Uložit jako - - + + Open Otevřít @@ -5860,12 +5875,12 @@ Chcete uložit provedené změny? Gui::FileOptionsDialog - + Extended Rozšířené - + All files (*.*) Všechny soubory (*.*) @@ -6816,20 +6831,15 @@ Chcete průvodce ukončit bez uložení dat? Gui::SelectModule - + Select module Vybrat modul - + Open %1 as Otevřené %1 jako - - - Select - Vybrat - Gui::StdCmdDescription @@ -6915,7 +6925,7 @@ Do you want to specify another directory? Position - Poloha + Position @@ -8230,7 +8240,7 @@ Do you want to continue? Příliš mnoho otevřených nerušivých oznámení. Oznámení jsou vynechána! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8239,44 +8249,44 @@ Do you want to continue? - + Are you sure you want to continue? Opravdu si přejete pokračovat? - + Please check report view for more... Další informace najdete v zobrazení reportu... - + Physical path: Fyzická cesta: - - + + Document: Dokument: - - + + Path: Cesta: - + Identical physical path Identická fyzická cesta - + Could not save document Dokument nelze uložit - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8289,102 +8299,102 @@ Would you like to save the file with a different name? Chcete uložit soubor s jiným názvem? - - - + + + Saving aborted Ukládání bylo přerušeno - + Save dependent files Uložit závislé soubory - + The file contains external dependencies. Do you want to save the dependent files, too? Soubor obsahuje externí závislosti. Chcete také uložit závislé soubory? - - + + Saving document failed Uložení dokumentu se nezdařilo - + Save document under new filename... Uložte dokument pod novým názvem... - - + + Save %1 Document Uložit dokument %1 - + Document Dokument - - + + Failed to save document Dokumentu se nezdařilo uložit - + Documents contains cyclic dependencies. Do you still want to save them? Dokumenty obsahují cyklické závislosti. Chcete je přesto uložit? - + Save a copy of the document under new filename... Ulož kopii dokumentu pod novým názvem... - + %1 document (*.FCStd) dokument %1 (*.FCStd) - + Document not closable Dokument nelze uzavřít - + The document is not closable for the moment. V tuto chvili nelze dokument uzavřít. - + Document not saved Dokument nebyl uložen - + The document%1 could not be saved. Do you want to cancel closing it? Dokument%1 nelze uložit. Chcete zrušit jeho zavírání? - + Undo Zpět - + Redo Znovu - + There are grouped transactions in the following documents with other preceding transactions V následujících dokumentech jsou seskupeny transakce s jinými předcházejícími transakcemi - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8467,12 +8477,12 @@ Prosím, otevřete okno prohlížeče a zadejte: http://localhost:%1.Možnosti... - + Out of memory Nedostatek paměti - + Not enough memory available to display the data. Není dostatek paměti pro zobrazení dat. @@ -8498,7 +8508,7 @@ Prosím, otevřete okno prohlížeče a zadejte: http://localhost:%1.Přesunout poznámku - + Transform Transformace @@ -8564,7 +8574,7 @@ Prosím, otevřete okno prohlížeče a zadejte: http://localhost:%1.%1 není prázdný, odstranit jeho obsah také? - + Translation: Překlad: @@ -8612,32 +8622,32 @@ Prosím, otevřete okno prohlížeče a zadejte: http://localhost:%1.Vytvoření skupiny odkazů selhalo - + Create link failed Selhalo vytvoření odkazu - + Failed to create relative link Selhalo vytvoření relativního odkazu - + Unlink failed Selhalo odpojení - + Replace link failed Selhalo nahrazení odkazu - + Failed to import links Selhal import odkazů - + Failed to import all links Selhal import všech odkazů @@ -9349,14 +9359,14 @@ na aktuální kopii budou ztraceny. StdCmdGroup - + Create group Vytvořit skupinu - - Create a new group for ordering objects - Vytvořit novou skupinu pro řazení objektů + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9414,13 +9424,13 @@ na aktuální kopii budou ztraceny. StdCmdLinkActions - + Link actions Akce odkazů - - + + Actions that apply to link objects Akce, které se použijí pro propojení objektů @@ -9428,12 +9438,12 @@ na aktuální kopii budou ztraceny. StdCmdLinkImport - + Import links Importovat odkazy - + Import selected external link(s) Importovat vybrané externí odkaz(y) @@ -9441,12 +9451,12 @@ na aktuální kopii budou ztraceny. StdCmdLinkImportAll - + Import all links Importovat všechny odkazy - + Import all links of the active document Importovat všechny odkazy aktivního dokumentu @@ -9459,9 +9469,9 @@ na aktuální kopii budou ztraceny. Vytvořit odkaz - - Create a link to the selected object(s) - Vytvořit odkaz na vybraný(é) objekt(y) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9480,12 +9490,12 @@ na aktuální kopii budou ztraceny. StdCmdLinkMakeRelative - + Make sub-link Vytvořit pododkaz - + Create a sub-object or sub-element link Vytvořit odkaz na dílčí objekt nebo dílčí prvek @@ -9493,12 +9503,12 @@ na aktuální kopii budou ztraceny. StdCmdLinkReplace - + Replace with link Nahradit za odkaz - + Replace the selected object(s) with link Nahradit vybraný(é) objekt(y) odkazem @@ -9506,13 +9516,13 @@ na aktuální kopii budou ztraceny. StdCmdLinkSelectActions - + Link navigation Odkazová navigace - - + + Link navigation actions Akce odkazové navigace @@ -9520,12 +9530,12 @@ na aktuální kopii budou ztraceny. StdCmdLinkSelectAllLinks - + Select all links Vybrat všechny odkazy - + Select all links to the current selected object Vybrat všechny odkazy na aktuálně vybraný objekt @@ -9533,12 +9543,12 @@ na aktuální kopii budou ztraceny. StdCmdLinkSelectLinked - + Go to linked object Přejít na propojený objekt - + Select the linked object and switch to its owner document Vyberte propojený objekt a přepněte na vlastnický dokument @@ -9546,12 +9556,12 @@ na aktuální kopii budou ztraceny. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Přejít na nejhlubší propojený objekt - + Select the deepest linked object and switch to its owner document Vyberte nejhlubší propojený objekt a přepněte na jeho vlastnický dokument @@ -9559,12 +9569,12 @@ na aktuální kopii budou ztraceny. StdCmdLinkUnlink - + Unlink Zrušit propojení - + Strip on level of link Pásek na úrovni odkazu @@ -9797,9 +9807,11 @@ na aktuální kopii budou ztraceny. Vytvoř díl - - Create a new part and make it active - Vytvoř nový díl a aktivuj ho + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10100,48 +10112,20 @@ na aktuální kopii budou ztraceny. Prohlížeč scén - - StdCmdSelBack - - - &Back - &Zpět - - - - - Go back to previous selection - Vrátit se na předchozí výběr - - StdCmdSelBoundingBox - + &Bounding box &Ohraničující kvádr - - + + Show selection bounding box Zobrazit výběrový ohraničující kvádr - - StdCmdSelForward - - - &Forward - &Vpřed - - - - - Repeat the backed selection - Opakovat podporovaný výběr - - StdCmdSelectAll @@ -10453,13 +10437,13 @@ na aktuální kopii budou ztraceny. StdCmdTreeViewActions - + TreeView actions Akce zobrazení stromu - - + + TreeView behavior options and actions Možnosti a akce chování stromu @@ -10999,13 +10983,13 @@ na aktuální kopii budou ztraceny. StdRecallWorkingView - + Recall working view Vyvolat pracovní pohled - - + + Recall previously stored temporary working view Vyvolání dříve uloženého dočasného pracovního pohledu @@ -11013,13 +10997,13 @@ na aktuální kopii budou ztraceny. StdStoreWorkingView - + Store working view Uložit pracovní pohled - - + + Store a document-specific temporary working view Uložení dočasného pracovního pohledu pro daný dokument @@ -11027,13 +11011,13 @@ na aktuální kopii budou ztraceny. StdTreeCollapseDocument - + Collapse/Expand Sbalit/Rozbalit - - + + Expand active document and collapse all others Rozbalit aktivní dokument a zbalit všechny ostatní @@ -11041,12 +11025,12 @@ na aktuální kopii budou ztraceny. StdTreeDrag - + Initiate dragging Zahájit přetažení - + Initiate dragging of current selected tree items Zahájit přetažení aktuálně vybraných položek stromu @@ -11054,13 +11038,13 @@ na aktuální kopii budou ztraceny. StdTreeMultiDocument - + Multi document Vícenásobný dokument - - + + Display all documents in the tree view Zobrazit všechny dokumenty ve stromovém zobrazení @@ -11068,12 +11052,12 @@ na aktuální kopii budou ztraceny. StdTreePreSelection - + Pre-selection Předvýběr - + Preselect the object in 3D view when mouse over the tree item Předvybrat objekt v 3D zobrazení, když se myš nachází nad položkou stromu @@ -11081,12 +11065,12 @@ na aktuální kopii budou ztraceny. StdTreeRecordSelection - + Record selection Výběr záznamu - + Record selection in tree view in order to go back/forward using navigation button Nahrát výběr ve stromovém zobrazení pro návrat zpět/vpřed pomocí navigačního tlačítka @@ -11108,13 +11092,13 @@ na aktuální kopii budou ztraceny. StdTreeSingleDocument - + Single document Jediný dokument - - + + Only display the active document in the tree view Ve stromovém zobrazení zobrazit pouze aktivní dokument @@ -11122,12 +11106,12 @@ na aktuální kopii budou ztraceny. StdTreeSyncPlacement - + Sync placement Synchronizovat umístění - + Auto adjust placement on drag and drop objects across coordinate systems Automatická úprava polohy přetažených objektů napříč souřadnými systémy @@ -11135,12 +11119,12 @@ na aktuální kopii budou ztraceny. StdTreeSyncSelection - + Sync selection Synchronizovat výběr - + Auto expand tree item when the corresponding object is selected in 3D view Automaticky rozbalit položku stromu, když je vybrán odpovídající objekt ve 3D zobrazení @@ -11148,12 +11132,12 @@ na aktuální kopii budou ztraceny. StdTreeSyncView - + Sync view Synchronizovat zobrazení - + Auto switch to the 3D view containing the selected item Automaticky přepnout na 3D zobrazení obsahující vybranou položku @@ -11388,7 +11372,7 @@ Chcete dokument nyní uložit? Std_Group - + Group Skupina @@ -12086,12 +12070,12 @@ po spuštění FreeCADu NaviCubeDraggableCmd - + Movable navigation cube Pohyblivá navigační krychle - + Drag and place NaviCube Přetáhnout a umístit NaviCube @@ -12953,4 +12937,30 @@ Nyní můžete použít Motiv k úplnému přizpůsobení rozhraní.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_de.ts b/src/Gui/Language/FreeCAD_de.ts index eccd6b1c0c..4f3d51adce 100644 --- a/src/Gui/Language/FreeCAD_de.ts +++ b/src/Gui/Language/FreeCAD_de.ts @@ -137,22 +137,22 @@ Verknüpfungsgruppe erstellen - + Make link Verknüpfung erstellen - + Make sub-link Unterverknüpfung erstellen - + Import links Verknüpfungen importieren - + Import all links Alle Verknüpfungen importieren @@ -167,12 +167,12 @@ Textdokument einfügen - + Add a part Ein Teil hinzufügen - + Add a group Gruppe hinzufügen @@ -778,37 +778,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Kameraeinstellungen - + Orientation Ausrichtung - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Aktuelle Ansicht @@ -1818,22 +1818,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Datei suchen: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Suche nach Dateinamen unter Berücksichtigung der Groß- und Kleinschreibung und mit Unterstützung regulärer Ausdrücke Find in files: - Find in files: + In Dateien suchen: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Filtern nach Datei-Inhalten ohne Berücksichtigung der Groß- und Kleinschreibung aber mit Unterstützung regulärer Ausdrücke @@ -2336,7 +2336,7 @@ Wählen Sie bitte ein anderes Verzeichnis aus. Type - Art + Typ @@ -2357,7 +2357,7 @@ Wählen Sie bitte ein anderes Verzeichnis aus. Search Group - Gruppe suchen + Nach Gruppen suchen @@ -2682,7 +2682,7 @@ Wählen Sie bitte ein anderes Verzeichnis aus. Clear - Leeren + Löschen @@ -3957,7 +3957,7 @@ Sie können auch das Formular verwenden: John Doe <john@doe.com>Gui::Dialog::DlgSettingsNavigation - + Navigation Navigation @@ -4051,35 +4051,60 @@ Sie können auch das Formular verwenden: John Doe <john@doe.com>Base color for all elements Grundfarbe für alle Elemente + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D-Navigation - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Listet die Konfiguration der Maustaste für jede ausgewählte Navigationseinstellung auf. Wählen Sie eine Einstellung aus und drücken Sie dann die Schaltfläche, um die Einstellungen anzuzeigen. - + Mouse... Maus... - + Navigation settings set Die Einstellungen der Navigationsleiste wurden gespeichert - + Orbit style Orbit Stil - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4090,116 +4115,116 @@ Drehtisch: das Teil wird um die z-Achse gedreht (mit eingeschränkten Achsen). freier Drehtisch: Das Teil wird um die z-Achse gedreht. - + Turntable Drehscheibe - + Trackball Trackball - + Free Turntable Freie Drehscheibe - + Rotation mode Art der Drehung - + Rotations in 3D will use current cursor position as center for rotation Drehen in 3D wird die aktuelle Cursorposition als Drehmittelpunkt verwenden - + Window center Um die Fenstermitte - + Drag at cursor Um den Mauszeiger - + Object center Um das Objektzentrum - + Default camera orientation Standard-Kameraausrichtung - + Default camera orientation when creating a new document or selecting the home view Standard-Kameraorientierung für neue Dokumente oder bei Auswahl der Home-Ansicht - + Camera zoom Kamera-Zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Legt den Kamera-Zoom für neue Dokumente fest. Der Wert ist der Durchmesser der Kugel, der auf den Bildschirm passt. - + mm mm - + Enable animated rotations Animierte Drehungen aktivieren - + Enable animation Animation zulassen - + Zoom operations will be performed at position of mouse pointer Zoom-Operationen werden an der Position des Mauszeigers ausgeführt - + Zoom at cursor Zoom an Cursorposition - + Zoom step Zoom-Stufe - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Wie stark vergrößert werden soll. Zoom-Schritt von '1' bedeutet für jeden Zoom-Schritt einen Faktor von 7,5. - + Direction of zoom operations will be inverted Richtung der Zoom-Operationen wird umgekehrt - + Invert zoom Zoom umkehren - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4208,67 +4233,57 @@ Betrifft nur den Gestennavigationsstil. Das Neigen der Maus wird durch diese Einstellung nicht deaktiviert. - + Disable touchscreen tilt gesture Deaktiviere die Touchscreen Neige-Geste - - Show the rotation center when dragging. - Drehzentrum beim Ziehen anzeigen. - - - - Enable rotation center indication - Anzeige des Drehzentrums aktivieren - - - + Isometric Isometrisch - + Dimetric Dimetrisch - + Trimetric Trimetrisch - + Top Draufsicht - + Front Vorderansicht - + Left Seitenansicht von links - + Right Seitenansicht von rechts - + Rear Rückansicht - + Bottom Untersicht - + Custom Benutzerdefiniert @@ -4320,12 +4335,12 @@ wenn sie die verfügbare Zeilenlänge überschreiten Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Python-Profiler-Intervall (Millisekunden): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + Das Intervall, in dem der Profiler ausgeführt wird, wenn Python-Code läuft (um die GUI antworten zu lassen). Zum Deaktivieren auf 0 setzen. @@ -5423,7 +5438,7 @@ The 'Status' column shows whether the document could be recovered. Transform - Transformieren + Bewegen @@ -5829,13 +5844,13 @@ Sollen die Änderungen gespeichert werden? Gui::FileChooser - - + + Select a file Wählen Sie eine Datei aus - + Select a directory Wählen Sie ein Verzeichnis aus @@ -5843,13 +5858,13 @@ Sollen die Änderungen gespeichert werden? Gui::FileDialog - + Save as Speichern unter - - + + Open Öffnen @@ -5857,12 +5872,12 @@ Sollen die Änderungen gespeichert werden? Gui::FileOptionsDialog - + Extended Erweitert - + All files (*.*) Alle Dateien (*.*) @@ -5990,7 +6005,7 @@ Sollen die Änderungen gespeichert werden? Graphviz format - Graphviz format + Graphviz-Format @@ -6811,20 +6826,15 @@ Wollen Sie sie beenden, ohne Ihre Daten zu speichern? Gui::SelectModule - + Select module Modul auswählen - + Open %1 as Öffne %1 als - - - Select - Wähle - Gui::StdCmdDescription @@ -7873,7 +7883,7 @@ Möchten Sie ein anderes Verzeichnis angeben? Invalid OpenGL Version - Invalid OpenGL Version + Ungültige OpenGL-Version @@ -8230,7 +8240,7 @@ Wollen Sie fortfahren? Zu viele offene, unaufdringliche Benachrichtigungen. Benachrichtigungen werden ausgelassen! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8239,44 +8249,44 @@ Wollen Sie fortfahren? - + Are you sure you want to continue? Sind Sie sicher, dass Sie fortfahren möchten? - + Please check report view for more... Bitte das Ausgabefenster prüfen für weitere... - + Physical path: Physischer Pfad: - - + + Document: Dokument: - - + + Path: Pfad: - + Identical physical path Identischer physischer Pfad - + Could not save document Dokument konnte nicht gespeichert werden - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8289,102 +8299,102 @@ Would you like to save the file with a different name? Möchten Sie die Datei mit einem anderen Namen speichern? - - - + + + Saving aborted Speichern abgebrochen - + Save dependent files Abhängige Dateien speichern - + The file contains external dependencies. Do you want to save the dependent files, too? Die Datei enthält externe Abhängigkeiten. Möchten Sie auch die abhängigen Dateien speichern? - - + + Saving document failed Fehler beim Speichern des Dokuments - + Save document under new filename... Dokument unter neuem Dateinamen speichern... - - + + Save %1 Document Dokument %1 speichern - + Document Dokument - - + + Failed to save document Fehler beim Speichern des Dokuments - + Documents contains cyclic dependencies. Do you still want to save them? Dokumente enthalten zyklische Abhängigkeiten. Möchten Sie sie trotzdem speichern? - + Save a copy of the document under new filename... Speichern Sie eine Kopie des Dokuments unter einem neuen Dateinamen... - + %1 document (*.FCStd) %1-Dokument (*.FCStd) - + Document not closable Dokument kann nicht geschlossen werden - + The document is not closable for the moment. Das Dokument kann im Moment nicht geschlossen werden. - + Document not saved Dokument nicht gespeichert - + The document%1 could not be saved. Do you want to cancel closing it? Das Dokument%1 konnte nicht gespeichert werden. Möchtest du das Schließen abbrechen? - + Undo Rückgängig - + Redo Wiederholen - + There are grouped transactions in the following documents with other preceding transactions Es gibt gruppierte Transaktionen in den folgenden Dokumenten mit anderen vorhergehenden Transaktionen - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8407,7 +8417,7 @@ Wählen Sie 'Abbrechen' um abzubrechen Clear - Löschen + Leeren @@ -8467,12 +8477,12 @@ Bitte starten Sie einen Browser und geben darin ein: http://localhost:%1.Einstellungen... - + Out of memory Nicht genügend Speicher - + Not enough memory available to display the data. Nicht genügend Speicher verfügbar, um die Daten darstellen zu können. @@ -8498,7 +8508,7 @@ Bitte starten Sie einen Browser und geben darin ein: http://localhost:%1.Beschriftung verschieben - + Transform Transformierung @@ -8564,7 +8574,7 @@ Bitte starten Sie einen Browser und geben darin ein: http://localhost:%1.Der %1 ist nicht leer, auch seinen Inhalt löschen? - + Translation: Verschiebung: @@ -8612,32 +8622,32 @@ Bitte starten Sie einen Browser und geben darin ein: http://localhost:%1.Verknüpfungsgruppe erstellen ist fehlgeschlagen - + Create link failed Verknüpfung erstellen ist fehlgeschlagen - + Failed to create relative link Das Erstellen des relativen Links ist fehlgeschlagen - + Unlink failed Verknüpfung aufheben fehlgeschlagen - + Replace link failed Verknüpfung ersetzen ist fehlgeschlagen - + Failed to import links Fehler beim Importieren der Verknüpfungen - + Failed to import all links Fehler beim Importieren aller Verknüpfungen @@ -9346,14 +9356,14 @@ the current copy will be lost. StdCmdGroup - + Create group Gruppe erstellen - - Create a new group for ordering objects - Eine neue Gruppe zum Ordnen von Objekten erstellen + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9411,13 +9421,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Verknüpfungen... - - + + Actions that apply to link objects Aktionen, die auf Link-Objekte angewendet werden @@ -9425,12 +9435,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Verknüpfungen importieren - + Import selected external link(s) Ausgewählte(n) externe(n) Verknüpfung(en) importieren @@ -9438,12 +9448,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Alle Verknüpfungen importieren - + Import all links of the active document Alle Verknüpfungen des aktiven Dokuments importieren @@ -9456,9 +9466,9 @@ the current copy will be lost. Verknüpfung erstellen - - Create a link to the selected object(s) - Eine Verknüpfung zu dem/den ausgewählten Objekt(en) erstellen + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9477,12 +9487,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Unterverknüpfung erstellen - + Create a sub-object or sub-element link Eine Unterobjekt- oder Unterelement-Verknüpfung erstellen @@ -9490,12 +9500,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Durch Verknüpfung ersetzen - + Replace the selected object(s) with link Das/die ausgewählte(n) Objekt(e) durch eine Verknüpfung ersetzen @@ -9503,13 +9513,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Verknüpfungsnavigation - - + + Link navigation actions Verknüpfungsnavigations-Aktionen @@ -9517,12 +9527,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Alle Verknüpfungen auswählen - + Select all links to the current selected object Alle Verknüpfungen zum aktuell ausgewählten Objekt auswählen @@ -9530,12 +9540,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Zum verknüpften Objekt gehen - + Select the linked object and switch to its owner document Das verknüpfte Objekt auswählen und zu seinem Eigentümerdokument wechseln @@ -9543,12 +9553,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Zum tiefsten verknüpften Objekt gehen - + Select the deepest linked object and switch to its owner document Das am tiefsten verknüpfte Objekt auswählen und zu seinem Eigentümerdokument wechseln @@ -9556,12 +9566,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Verknüpfung auflösen - + Strip on level of link Auf Verbindungsebene schneiden @@ -9794,9 +9804,11 @@ the current copy will be lost. Baugruppe erstellen - - Create a new part and make it active - Neue Baugruppe erstellen und aktivieren + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10097,48 +10109,20 @@ the current copy will be lost. Szenengraph untersuchen - - StdCmdSelBack - - - &Back - &Zurück - - - - - Go back to previous selection - Zurück zur vorherigen Auswahl - - StdCmdSelBoundingBox - + &Bounding box &Begrenzungsrahmen - - + + Show selection bounding box Auswahlbegrenzungsrahmen zeigen - - StdCmdSelForward - - - &Forward - &Vorwärts - - - - - Repeat the backed selection - Gesicherte Auswahl wiederholen - - StdCmdSelectAll @@ -10396,7 +10380,7 @@ the current copy will be lost. Transform - Transformierung + Bewegen @@ -10450,13 +10434,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Baumansicht-Aktionen - - + + TreeView behavior options and actions TreeView-Einstellungen und -Aktionen @@ -10996,13 +10980,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Arbeitsansicht wiederherstellen - - + + Recall previously stored temporary working view Zuletzt gespeicherte temporäre Arbeitsansicht wiederherstellen @@ -11010,13 +10994,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Arbeitsansicht speichern - - + + Store a document-specific temporary working view Dokument-spezifische temporäre Arbeitsansicht speichern @@ -11024,13 +11008,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Reduzieren/Erweitern - - + + Expand active document and collapse all others Erweitere alle aktiven Dokumente und reduziere die Anderen @@ -11038,12 +11022,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Ziehen initiieren - + Initiate dragging of current selected tree items Ziehen aktuell ausgewählter Baumelemente initiieren @@ -11051,13 +11035,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Mehrfachdokument - - + + Display all documents in the tree view Alle Dokumente in der Baumansicht anzeigen @@ -11065,12 +11049,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Vorauswahl - + Preselect the object in 3D view when mouse over the tree item Zeigt das Objekt in der 3D -Ansicht als vorausgewählt an, wenn der Mauszeiger über das Baumelement fährt @@ -11078,12 +11062,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Auswahl aufzeichnen - + Record selection in tree view in order to go back/forward using navigation button Zeichnet die Auswahl in der Baumansicht auf, um mit einer Navigationstaste zurück- bzw. vorwärtsgehen zu können @@ -11105,13 +11089,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Einzeldokument - - + + Only display the active document in the tree view Nur das aktive Dokument in der Baumansicht anzeigen @@ -11119,12 +11103,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Sync-Platzierung - + Auto adjust placement on drag and drop objects across coordinate systems Automatische Anpassung der Positionierung beim Ziehen und Ablegen von Objekten aus einem Koordinatensystem in ein anderes @@ -11132,12 +11116,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Sync-Auswahl - + Auto expand tree item when the corresponding object is selected in 3D view Baum automatisch ausdehnen, wenn das zugehörige Objekt in der 3D-Ansicht ausgewählt wird @@ -11145,12 +11129,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Sync-Ansicht - + Auto switch to the 3D view containing the selected item Automatischer Wechsel zur 3D-Ansicht mit dem ausgewählten Element @@ -11385,7 +11369,7 @@ Möchten Sie das Dokument jetzt speichern? Std_Group - + Group Gruppe @@ -12082,12 +12066,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Beweglicher Navigationswürfel - + Drag and place NaviCube Navigationswürfel ziehen und platzieren @@ -12527,7 +12511,7 @@ display the splash screen Type - Typ + Art @@ -12947,4 +12931,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_el.ts b/src/Gui/Language/FreeCAD_el.ts index 15defd4704..47ab57c278 100644 --- a/src/Gui/Language/FreeCAD_el.ts +++ b/src/Gui/Language/FreeCAD_el.ts @@ -137,22 +137,22 @@ Δημιουργία ομάδας συνδέσμων - + Make link Δημιουργία συνδέσμου - + Make sub-link Δημιουργήστε υποσύνδεσμο - + Import links Εισαγωγή συνδέσμων - + Import all links Εισαγωγή όλων των συνδέσμων @@ -167,12 +167,12 @@ Εισαγωγή εγγράφου κειμένου - + Add a part Προσθέστε ένα κομμάτι - + Add a group Προσθήκη μιας Ομάδας @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Ρυθμίσεις κάμερας - + Orientation Προσανατολισμός - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Τωρινή προβολή @@ -3962,7 +3962,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Πλοήγηση @@ -4056,35 +4056,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Τρισδιάστατη Πλοήγηση - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Εμφάνιση των ρυθμίσεων του ποντικιού για κάθε επιλεγμένη ρύθμιση πλοήγησης. Επιλέξτε ένα σετ και στη συνέχεια πατήστε το κουμπί για να δείτε αυτές τις ρυθμίσεις. - + Mouse... Ποντίκι... - + Navigation settings set Οι ρυθμίσεις πλοήγησης ορίστηκαν - + Orbit style Τύπος μορφοποίησης τροχιάς - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4095,116 +4120,116 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable Περιστρεφόμενη βάση - + Trackball Ιχνόσφαιρα - + Free Turntable Free Turntable - + Rotation mode Λειτουργία περιστροφής - + Rotations in 3D will use current cursor position as center for rotation Περιστροφή σε 3D θα χρησιμοποιήσει την τρέχουσα θέση του κέρσορα ως κέντρο για περιστροφή - + Window center Κεντράρισμα παραθύρου - + Drag at cursor Σύρετε τον κέρσορα - + Object center Κέντρο αντικειμένων - + Default camera orientation Προεπιλεγμένος προσανατολισμός κάμερας - + Default camera orientation when creating a new document or selecting the home view Προεπιλεγμένος προσανατολισμός κάμερας κατά τη δημιουργία ενός νέου εγγράφου ή την επιλογή της προβολής αρχικής οθόνης - + Camera zoom Μεγέθυνση κάμερας - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Ρυθμίζει το ζουμ της κάμερας για νέα έγγραφα. Η τιμή είναι η διάμετρος της σφαίρας που θα χωρέσει στην οθόνη. - + mm χιλιοστά - + Enable animated rotations Enable animated rotations - + Enable animation Ενεργοποίηση αναπαράστασης κίνησης - + Zoom operations will be performed at position of mouse pointer Zoom operations will be performed at position of mouse pointer - + Zoom at cursor Εστίαση στον κέρσορα - + Zoom step Zoom step - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Πόσο θα μεγεθύνεται. Το βήμα ζουμ του '1' σημαίνει ένα συντελεστή 7,5 για κάθε βήμα ζουμ. - + Direction of zoom operations will be inverted Direction of zoom operations will be inverted - + Invert zoom Αντιστροφή εστίασης - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4213,67 +4238,57 @@ Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - + Disable touchscreen tilt gesture Απενεργοποίηση της χειρονομίας πλαγιάσματος, από την οθόνη αφής - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Ισομετρική - + Dimetric Διμετρική - + Trimetric Τριμετρική - + Top Πάνω - + Front Εμπρόσθια - + Left Αριστερά - + Right Δεξιά - + Rear Οπίσθια - + Bottom Κάτω - + Custom Επιλογή @@ -5836,13 +5851,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Επιλέξτε ένα αρχείο - + Select a directory Επιλέξτε ένα ευρετήριο @@ -5850,13 +5865,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Αποθήκευση ως - - + + Open Άνοιγμα @@ -5864,12 +5879,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Επέκταση - + All files (*.*) Όλα τα αρχεία (*.*) @@ -6818,20 +6833,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Επιλέξτε λειτουργική μονάδα - + Open %1 as Ανοίξτε το %1 ως - - - Select - Επιλέξτε - Gui::StdCmdDescription @@ -8238,7 +8248,7 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8247,44 +8257,44 @@ Do you want to continue? - + Are you sure you want to continue? Are you sure you want to continue? - + Please check report view for more... Ελέγξτε την προβολή αναφοράς για περισσότερα... - + Physical path: Physical path: - - + + Document: Document: - - + + Path: Διαδρομή: - + Identical physical path Identical physical path - + Could not save document Could not save document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8297,102 +8307,102 @@ Would you like to save the file with a different name? Would you like to save the file with a different name? - - - + + + Saving aborted Η αποθήκευση διεκόπη - + Save dependent files Save dependent files - + The file contains external dependencies. Do you want to save the dependent files, too? The file contains external dependencies. Do you want to save the dependent files, too; - - + + Saving document failed Αποτυχία αποθήκευσης εγγράφου - + Save document under new filename... Αποθήκευση εγγράφου με άλλο όνομα αρχείου... - - + + Save %1 Document Αποθήκευση Εγγράφου %1 - + Document Έγγραφο - - + + Failed to save document Failed to save document - + Documents contains cyclic dependencies. Do you still want to save them? Documents contains cyclic dependencies. Do you still want to save them; - + Save a copy of the document under new filename... Αποθηκεύστε ένα αντίγραφο του εγγράφου με νέο όνομα αρχείου... - + %1 document (*.FCStd) έγγραφο %1 (*.FCStd) - + Document not closable Το έγγραφο δεν κλείνει - + The document is not closable for the moment. Το έγγραφο δεν κλείνει προς το παρόν. - + Document not saved Document not saved - + The document%1 could not be saved. Do you want to cancel closing it? Το έγγραφο%1 δεν μπορεί να αποθηκευτεί. Θέλετε να ακυρώσετε το κλείσιμο; - + Undo Undo - + Redo Redo - + There are grouped transactions in the following documents with other preceding transactions There are grouped transactions in the following documents with other preceding transactions - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8475,12 +8485,12 @@ Please open a browser window and type in: http://localhost:%1. Επιλογές... - + Out of memory Μνήμη πλήρης - + Not enough memory available to display the data. Δεν υπάρχει αρκετή μνήμη διαθέσιμη για την προβολή των δεδομένων. @@ -8506,7 +8516,7 @@ Please open a browser window and type in: http://localhost:%1. Μετακίνηση περιγραφής - + Transform Μετατόπιση @@ -8572,7 +8582,7 @@ Please open a browser window and type in: http://localhost:%1. Το %1 δεν είναι άδειο, να διαγραφεί και το περιεχόμενό του; - + Translation: Μετάφραση: @@ -8620,32 +8630,32 @@ Please open a browser window and type in: http://localhost:%1. Create link group failed - + Create link failed Create link failed - + Failed to create relative link Failed to create relative link - + Unlink failed Unlink failed - + Replace link failed Replace link failed - + Failed to import links Failed to import links - + Failed to import all links Failed to import all links @@ -9354,14 +9364,14 @@ the current copy will be lost. StdCmdGroup - + Create group Δημιουργήστε μια ομάδα - - Create a new group for ordering objects - Δημιουργήστε μια νέα ομάδα για διάταξη αντικειμένων + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9419,13 +9429,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Link actions - - + + Actions that apply to link objects Actions that apply to link objects @@ -9433,12 +9443,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Εισαγωγή συνδέσμων - + Import selected external link(s) Import selected external link(s) @@ -9446,12 +9456,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Εισαγωγή όλων των συνδέσμων - + Import all links of the active document Import all links of the active document @@ -9464,9 +9474,9 @@ the current copy will be lost. Δημιουργία συνδέσμου - - Create a link to the selected object(s) - Δημιουργία συνδέσμου για τα επιλεγμένα αντικείμενα(α) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9485,12 +9495,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Δημιουργήστε υποσύνδεσμο - + Create a sub-object or sub-element link Δημιουργία συνδέσμου για ένα υπο-αντικειμένο ή ενός υπο-στοιχείου @@ -9498,12 +9508,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Αντικατάσταση με σύνδεσμο - + Replace the selected object(s) with link Replace the selected object(s) with link @@ -9511,13 +9521,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Link navigation - - + + Link navigation actions Link navigation actions @@ -9525,12 +9535,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Select all links - + Select all links to the current selected object Select all links to the current selected object @@ -9538,12 +9548,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Μετάβαση στο συνδεδεμένο του αντικειμένου - + Select the linked object and switch to its owner document Select the linked object and switch to its owner document @@ -9551,12 +9561,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Go to the deepest linked object - + Select the deepest linked object and switch to its owner document Select the deepest linked object and switch to its owner document @@ -9564,12 +9574,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Αποσύνδεση - + Strip on level of link Strip on level of link @@ -9802,9 +9812,11 @@ the current copy will be lost. Δημιουργήστε εξάρτημα - - Create a new part and make it active - Δημιουργήστε ένα νέο εξάρτημα και ενεργοποιήστε το + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10105,48 +10117,20 @@ the current copy will be lost. Επιθεωρητής σκηνής - - StdCmdSelBack - - - &Back - &Πίσω - - - - - Go back to previous selection - Μετάβαση πίσω στην προηγούμενη επιλογή - - StdCmdSelBoundingBox - + &Bounding box &Πλαίσιο ορισμού - - + + Show selection bounding box Επιλογή εμφάνιση πλαισίου οριοθέτησης - - StdCmdSelForward - - - &Forward - &Εμπρός - - - - - Repeat the backed selection - Επανάληψη της υποστηριζόμενης επιλογής - - StdCmdSelectAll @@ -10458,13 +10442,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions TreeView actions - - + + TreeView behavior options and actions TreeView behavior options and actions @@ -11004,13 +10988,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11018,13 +11002,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11032,13 +11016,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Σύμπτυξη/Επέκταση - - + + Expand active document and collapse all others Επέκταση του ενεργού εγγράφου, και σύμπτυξη όλων των άλλων @@ -11046,12 +11030,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Initiate dragging - + Initiate dragging of current selected tree items Initiate dragging of current selected tree items @@ -11059,13 +11043,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Multi document - - + + Display all documents in the tree view Εμφάνιση όλων των εγγράφων στην προβολή δέντρου @@ -11073,12 +11057,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Pre-selection - + Preselect the object in 3D view when mouse over the tree item Preselect the object in 3D view when mouse over the tree item @@ -11086,12 +11070,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Record selection - + Record selection in tree view in order to go back/forward using navigation button Record selection in tree view in order to go back/forward using navigation button @@ -11113,13 +11097,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Single document - - + + Only display the active document in the tree view Εμφάνιση μόνο του ενεργού εγγράφου, στην προβολή σαν δέντρο @@ -11127,12 +11111,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Συγχρονισμός τοποθέτησης - + Auto adjust placement on drag and drop objects across coordinate systems Αυτόματη προσαρμογή της τοποθέτησης σε αντικείμενα μεταφοράς και απόθεσης στα συστήματα συντεταγμένων @@ -11141,12 +11125,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Επιλογή συγχρονισμού - + Auto expand tree item when the corresponding object is selected in 3D view Auto expand tree item when the corresponding object is selected in 3D view @@ -11154,12 +11138,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Συγχρονισμός προβολής - + Auto switch to the 3D view containing the selected item Αυτόματη μετάβαση στην τρισδιάστατη προβολή που περιέχει το επιλεγμένο αντικείμενο @@ -11394,7 +11378,7 @@ Do you want to save the document now? Std_Group - + Group Ομάδα @@ -12092,12 +12076,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12953,4 +12937,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_es-AR.ts b/src/Gui/Language/FreeCAD_es-AR.ts index dc86bd1cdd..62a7446088 100644 --- a/src/Gui/Language/FreeCAD_es-AR.ts +++ b/src/Gui/Language/FreeCAD_es-AR.ts @@ -137,22 +137,22 @@ Crear grupo de enlaces - + Make link Crear enlace - + Make sub-link Crear sub-enlace - + Import links Importar enlaces - + Import all links Importar todos los enlaces @@ -167,12 +167,12 @@ Insertar documento de texto - + Add a part Añadir una pieza - + Add a group Añadir un grupo @@ -778,37 +778,37 @@ mientras hace un clic izquierdo o derecho y mueve el mouse hacia arriba o hacia Gui::Dialog::CameraDialog - + Camera settings Ajustes de cámara - + Orientation Orientación - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vista actual @@ -1818,22 +1818,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Buscar archivo: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Búsqueda sin distinción de mayúsculas y minúsculas; admite expresiones regulares Find in files: - Find in files: + Buscar en archivos: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Filtrar por contenido de archivo insensible a mayúsculas y minúsculas, expresiones regulares soportadas @@ -3961,7 +3961,7 @@ También puede utilizar el formulario: John Doe <john@doe.com>Gui::Dialog::DlgSettingsNavigation - + Navigation Navegación @@ -4055,35 +4055,60 @@ También puede utilizar el formulario: John Doe <john@doe.com>Base color for all elements Color base para todos los elementos + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navegación 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Lista la configuración de botones del ratón para cada configuración de navegación elegida. Seleccione un conjunto y, a continuación, presione el botón para ver dichas configuraciones. - + Mouse... Mouse... - + Navigation settings set Configuración de navegación establecida - + Orbit style Estilo de órbita - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4094,183 +4119,173 @@ Turntable: la pieza se girará alrededor del eje Z (con ejes restringidos). Turntable libre: la pieza se girará alrededor del eje z. - + Turntable Mesa giratoria - + Trackball Trackball - + Free Turntable Turntable libre - + Rotation mode Modo de rotación - + Rotations in 3D will use current cursor position as center for rotation Las rotaciones en 3D usarán la posición actual del cursor como centro de rotación - + Window center Centro de la ventana - + Drag at cursor Arrastre el cursor - + Object center Centro del objeto - + Default camera orientation Orientación de cámara por defecto - + Default camera orientation when creating a new document or selecting the home view Orientación por defecto de la cámara al crear un nuevo documento o seleccionar la vista de inicio - + Camera zoom Zoom de cámara - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Establece el zoom de la cámara para nuevos documentos. El valor es el diámetro de la esfera que cabe en la pantalla. - + mm mm - + Enable animated rotations Permite las rotaciones animadas - + Enable animation Habilitar animación - + Zoom operations will be performed at position of mouse pointer Las operaciones de zoom se realizarán en la posición del puntero del ratón - + Zoom at cursor Zoom en el cursor - + Zoom step Paso de zoom - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Cuánto zoom se aplicará. Paso de zoom de ´1´ significa un factor de 7.5 para cada paso de zoom. - + Direction of zoom operations will be inverted La dirección de las operaciones de zoom se invertirá - + Invert zoom Invertir zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. Impide que la vista se incline cuando se hace zoom. Afecta solo el estilo de navegación por gestos. La inclinación del ratón no está desactivada por esta configuración. - + Disable touchscreen tilt gesture Desactivar gesto de inclinación de la pantalla táctil - - Show the rotation center when dragging. - Mostrar el centro de rotación al arrastrar. - - - - Enable rotation center indication - Habilitar la indicación del centro de rotación - - - + Isometric Isométrica - + Dimetric Dimétrica - + Trimetric Trimétrica - + Top Superior - + Front Anterior - + Left Izquierda - + Right Derecha - + Rear Posterior - + Bottom Inferior - + Custom Personalizado @@ -4322,12 +4337,12 @@ espacio horizontal disponible en la consola de Python Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Intervalo del perfilador Python (milisegundos): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + El intervalo en el que se ejecuta el perfilador cuando hay código Python en ejecución (para mantener la interfaz de usuario). Establecer a 0 para desactivar. @@ -4456,27 +4471,27 @@ Valor más grande facilita la selección de cosas, pero puede hacer imposible se Color Bar - Color Bar + Barra de color Label text color - Label text color + Color del texto de la etiqueta Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Color de la barra (usado en entornos de trabajo Mesh y FEM) Color de la etiqueta de texto Label text size - Label text size + Tamaño de texto de etiqueta Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Color de la barra (usado en entornos de trabajo Mesh y FEM) Tamaño del texto de la etiqueta @@ -5832,13 +5847,13 @@ Desea guardar los cambios? Gui::FileChooser - - + + Select a file Seleccionar un archivo - + Select a directory Seleccione una carpeta @@ -5846,13 +5861,13 @@ Desea guardar los cambios? Gui::FileDialog - + Save as Guardar como - - + + Open Abrir @@ -5860,12 +5875,12 @@ Desea guardar los cambios? Gui::FileOptionsDialog - + Extended Extendido - + All files (*.*) Todos los archivos (*.*) @@ -5993,7 +6008,7 @@ Desea guardar los cambios? Graphviz format - Graphviz format + Formato Graphviz @@ -6811,20 +6826,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Seleccionar módulo - + Open %1 as Abrir %1 como - - - Select - Seleccionar - Gui::StdCmdDescription @@ -8228,7 +8238,7 @@ Desea continuar? Demasiadas notificaciones no intrusivas abiertas. ¡Las notificaciones serán omitidas! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8237,44 +8247,44 @@ Desea continuar? - + Are you sure you want to continue? ¿Estás seguro/a de que quieres continuar? - + Please check report view for more... Por favor, compruebe la vista del informe para más... - + Physical path: Ruta física: - - + + Document: Documento: - - + + Path: Trayectoria: - + Identical physical path Ruta física idéntica - + Could not save document No se pudo guardar el documento - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8287,102 +8297,102 @@ Would you like to save the file with a different name? ¿Desea guardar el archivo con un nombre diferente? - - - + + + Saving aborted Guardando anulado - + Save dependent files Guardar archivos dependientes - + The file contains external dependencies. Do you want to save the dependent files, too? El archivo contiene dependencias externas. ¿Desea guardar los archivos dependientes también? - - + + Saving document failed No se pudo guardar el documento - + Save document under new filename... Guardar documento con un nombre de archivo nuevo... - - + + Save %1 Document Guardar el documento %1 - + Document Documento - - + + Failed to save document Error al guardar el documento - + Documents contains cyclic dependencies. Do you still want to save them? Los documentos contienen dependencias cíclicas. ¿Desea guardarlos? - + Save a copy of the document under new filename... Guardar una copia del documento con un nuevo nombre de archivo... - + %1 document (*.FCStd) %1 documento (*.FCStd) - + Document not closable El documento no se puede cerrar - + The document is not closable for the moment. El documento no se puede cerrar por el momento. - + Document not saved Documento no guardado - + The document%1 could not be saved. Do you want to cancel closing it? El documento%1 no se pudo guardar. ¿Desea cancelar cerrando? - + Undo Deshacer - + Redo Rehacer - + There are grouped transactions in the following documents with other preceding transactions Hay transacciones de grupo en los siguientes documentos con otras transacciones anteriores - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8465,12 +8475,12 @@ Por favor abra una ventana del navegador y escriba en ella: http://localhost:%1. Opciones... - + Out of memory Memoria insuficiente - + Not enough memory available to display the data. Insuficiente memoria disponible para mostrar los datos. @@ -8496,7 +8506,7 @@ Por favor abra una ventana del navegador y escriba en ella: http://localhost:%1. Mover anotación - + Transform Transformar @@ -8562,14 +8572,14 @@ Por favor abra una ventana del navegador y escriba en ella: http://localhost:%1. La %1 no está vacía, ¿borrar su contenido? - + Translation: Traslación: Translation XY: - Translation XY: + Traducción XY: @@ -8610,32 +8620,32 @@ Por favor abra una ventana del navegador y escriba en ella: http://localhost:%1. Error al crear vínculo de grupo - + Create link failed La creación del vínculo falló - + Failed to create relative link Error al crear vínculo relativo - + Unlink failed Error al desvincular - + Replace link failed Error al reemplazar vínculo - + Failed to import links Error al importar vínculo - + Failed to import all links Error al importar todos los vínculos @@ -9346,14 +9356,14 @@ la copia actual se perderá. StdCmdGroup - + Create group Crear grupo - - Create a new group for ordering objects - Crea un nuevo grupo para ordenar objetos + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9411,13 +9421,13 @@ la copia actual se perderá. StdCmdLinkActions - + Link actions Acciones de vínculos - - + + Actions that apply to link objects Acciones que se aplican a los objetos de enlace @@ -9425,12 +9435,12 @@ la copia actual se perderá. StdCmdLinkImport - + Import links Importar enlaces - + Import selected external link(s) Importar vínculo(s) externo(s) seleccionado(s) @@ -9438,12 +9448,12 @@ la copia actual se perderá. StdCmdLinkImportAll - + Import all links Importar todos los enlaces - + Import all links of the active document Importar todos los vínculos del documento activo @@ -9456,9 +9466,9 @@ la copia actual se perderá. Crear enlace - - Create a link to the selected object(s) - Crea un vínculo al(los) objeto(s) seleccionado(s) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9477,12 +9487,12 @@ la copia actual se perderá. StdCmdLinkMakeRelative - + Make sub-link Crear sub-enlace - + Create a sub-object or sub-element link Crear un vínculo de sub-objeto o sub-elemento @@ -9490,12 +9500,12 @@ la copia actual se perderá. StdCmdLinkReplace - + Replace with link Reemplazar con vínculo - + Replace the selected object(s) with link Reemplazar el(los) objeto(s) seleccionados con vínculo @@ -9503,13 +9513,13 @@ la copia actual se perderá. StdCmdLinkSelectActions - + Link navigation Navegación de vínculos - - + + Link navigation actions Acciones de navegación de vínculos @@ -9517,12 +9527,12 @@ la copia actual se perderá. StdCmdLinkSelectAllLinks - + Select all links Seleccionar todos los vínculos - + Select all links to the current selected object Seleccionar todos los vínculos al objeto seleccionado actual @@ -9530,12 +9540,12 @@ la copia actual se perderá. StdCmdLinkSelectLinked - + Go to linked object Ir al objeto vinculado - + Select the linked object and switch to its owner document Seleccione el objeto vinculado y cambie al documento propietario @@ -9543,12 +9553,12 @@ la copia actual se perderá. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Ir al objeto vinculado más profundo - + Select the deepest linked object and switch to its owner document Selecciona el objeto vinculado más profundo y cambia al documento propietario @@ -9556,12 +9566,12 @@ la copia actual se perderá. StdCmdLinkUnlink - + Unlink Desvincular - + Strip on level of link Listón en el nivel de vínculo @@ -9794,9 +9804,11 @@ la copia actual se perderá. Crear pieza - - Create a new part and make it active - Crea una nueva pieza y la hace activa + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10097,48 +10109,20 @@ la copia actual se perderá. Inspecciona la escena - - StdCmdSelBack - - - &Back - &Atrás - - - - - Go back to previous selection - Volver a la selección anterior - - StdCmdSelBoundingBox - + &Bounding box &Cuadro delimitador - - + + Show selection bounding box Muestra el cuadro delimitador de selección - - StdCmdSelForward - - - &Forward - Avanzar - - - - - Repeat the backed selection - Repetir la selección respaldada - - StdCmdSelectAll @@ -10450,13 +10434,13 @@ la copia actual se perderá. StdCmdTreeViewActions - + TreeView actions Acciones de la vista de árbol - - + + TreeView behavior options and actions Opciones y acciones de comportamiento de la vista de árbol @@ -10996,13 +10980,13 @@ la copia actual se perderá. StdRecallWorkingView - + Recall working view Recordar vista de trabajo - - + + Recall previously stored temporary working view Recordar vista de trabajo temporal almacenada previamente @@ -11010,13 +10994,13 @@ la copia actual se perderá. StdStoreWorkingView - + Store working view Guardar vista de trabajo - - + + Store a document-specific temporary working view Guardar una vista de trabajo temporal específica del documento @@ -11024,13 +11008,13 @@ la copia actual se perderá. StdTreeCollapseDocument - + Collapse/Expand Contraer/expandir - - + + Expand active document and collapse all others Expande el documento activo y contrae todos los demás @@ -11038,12 +11022,12 @@ la copia actual se perderá. StdTreeDrag - + Initiate dragging Iniciar arrastre - + Initiate dragging of current selected tree items Inicia el arrastre de los elementos del árbol seleccionados @@ -11051,13 +11035,13 @@ la copia actual se perderá. StdTreeMultiDocument - + Multi document Documento múltiple - - + + Display all documents in the tree view Muestra todos los documentos en la vista de árbol @@ -11065,12 +11049,12 @@ la copia actual se perderá. StdTreePreSelection - + Pre-selection Pre-selección - + Preselect the object in 3D view when mouse over the tree item Preselecciona el objeto en la vista 3D cuando el puntero de ratón esté sobre el objeto del árbol @@ -11078,12 +11062,12 @@ la copia actual se perderá. StdTreeRecordSelection - + Record selection Grabar selección - + Record selection in tree view in order to go back/forward using navigation button Graba la selección en la vista de árbol para retroceder/avanzar usando el botón de navegación @@ -11105,13 +11089,13 @@ la copia actual se perderá. StdTreeSingleDocument - + Single document Documento único - - + + Only display the active document in the tree view Muestra sólo el documento activo en la vista de árbol @@ -11119,12 +11103,12 @@ la copia actual se perderá. StdTreeSyncPlacement - + Sync placement Sincronizar ubicación - + Auto adjust placement on drag and drop objects across coordinate systems Ajusta automáticamente la posición al arrastrar y soltar objetos a través de los sistemas de coordenadas @@ -11132,12 +11116,12 @@ la copia actual se perderá. StdTreeSyncSelection - + Sync selection Sincronizar selección - + Auto expand tree item when the corresponding object is selected in 3D view Autoexpande el elemento del árbol cuando se selecciona el objeto correspondiente en la vista 3D @@ -11145,12 +11129,12 @@ la copia actual se perderá. StdTreeSyncView - + Sync view Vista sincronizada - + Auto switch to the 3D view containing the selected item Cambia automáticamente a la vista 3D que contiene el elemento seleccionado @@ -11385,7 +11369,7 @@ Do you want to save the document now? Std_Group - + Group Grupo @@ -12082,12 +12066,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Cubo de navegación movible - + Drag and place NaviCube Arrastrar y colocar NaviCube @@ -12936,13 +12920,39 @@ Ahora puedes usar tema para obtener una personalización completa de la interfaz Export dependency graph... - Export dependency graph... + Exportar gráfico de dependencias... Export the dependency graph to a file - Export the dependency graph to a file + Exportar el gráfico de dependencias a un archivo + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_es-ES.ts b/src/Gui/Language/FreeCAD_es-ES.ts index 3caccfeff2..2033938493 100644 --- a/src/Gui/Language/FreeCAD_es-ES.ts +++ b/src/Gui/Language/FreeCAD_es-ES.ts @@ -137,22 +137,22 @@ Hacer vínculo de grupo - + Make link Crear vínculo - + Make sub-link Crear sub-vínculo - + Import links Importar vínculo - + Import all links Importar todos los vínculos @@ -167,12 +167,12 @@ Insertar documento de texto - + Add a part Añadir una pieza - + Add a group Añade un grupo @@ -778,37 +778,37 @@ mientras hace clic con el botón izquierdo o derecho y mueve el ratón hacia arr Gui::Dialog::CameraDialog - + Camera settings Ajustes de la cámara - + Orientation Orientación - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vista actual @@ -1818,22 +1818,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Buscar archivo: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Búsqueda sin distinción de mayúsculas y minúsculas; admite expresiones regulares Find in files: - Find in files: + Buscar en archivos: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Filtrar por contenido de archivo insensible a mayúsculas y minúsculas, expresiones regulares soportadas @@ -3964,7 +3964,7 @@ También puede utilizar el formulario: John Doe <john@doe.com>Gui::Dialog::DlgSettingsNavigation - + Navigation Navegación @@ -4058,35 +4058,60 @@ También puede utilizar el formulario: John Doe <john@doe.com>Base color for all elements Color base para todos los elementos + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navegación 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Lista la configuración de botones del ratón para cada configuración de navegación elegida. Seleccione un conjunto y, a continuación, presione el botón para ver dichas configuraciones. - + Mouse... Ratón... - + Navigation settings set Configuración de navegación - + Orbit style Estilo órbita - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4097,183 +4122,173 @@ Turntable: la pieza se girará alrededor del eje Z (con ejes restringidos). Turntable libre: la pieza se girará alrededor del eje z. - + Turntable Mesa giratoria - + Trackball Trackball - + Free Turntable Turntable libre - + Rotation mode Modo de rotación - + Rotations in 3D will use current cursor position as center for rotation Las rotaciones en 3D usarán la posición actual del cursor como centro de rotación - + Window center Centro de la ventana - + Drag at cursor Arrastra el cursor - + Object center Centro del objeto - + Default camera orientation Orientación de cámara por defecto - + Default camera orientation when creating a new document or selecting the home view Orientación de cámara por defecto al crear un nuevo documento o seleccionar la vista de inicio - + Camera zoom Zoom de cámara - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Establece el zoom de la cámara para nuevos documentos. El valor es el diámetro de la esfera que cabe en la pantalla. - + mm mm - + Enable animated rotations Activar rotaciones animadas - + Enable animation Activar animación - + Zoom operations will be performed at position of mouse pointer Las operaciones de zoom se realizarán en la posición del puntero del ratón - + Zoom at cursor Zoom en cursor - + Zoom step Paso de zoom - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Cuánto se ampliará. El paso de zoom de '1' significa un factor de 7.5 para cada paso de acercamiento. - + Direction of zoom operations will be inverted La dirección de las operaciones de zoom se invertirá - + Invert zoom Invertir zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. Impide que la vista se incline cuando se hace zoom. Afecta solo el estilo de navegación por gestos. La inclinación del ratón no está desactivada por esta configuración. - + Disable touchscreen tilt gesture Desactivar el gesto de inclinación de la pantalla táctil - - Show the rotation center when dragging. - Mostrar el centro de rotación al arrastrar. - - - - Enable rotation center indication - Habilitar la indicación del centro de rotación - - - + Isometric Isométrica - + Dimetric Dimétrica - + Trimetric Trimétrica - + Top Planta - + Front Alzado - + Left Izquierda - + Right Derecha - + Rear Posterior - + Bottom Inferior - + Custom Personalizado @@ -4325,12 +4340,12 @@ espacio horizontal disponible en la consola de Python Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Intervalo del perfilador Python (milisegundos): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + El intervalo en el que se ejecuta el perfilador cuando hay código Python en ejecución (para mantener la interfaz de usuario). Establecer a 0 para desactivar. @@ -4459,27 +4474,27 @@ Un valor más grande facilita la selección de cosas, pero puede hacer que las c Color Bar - Color Bar + Barra de color Label text color - Label text color + Color del texto de la etiqueta Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Color de la barra (usado en entornos de trabajo Mesh y FEM) Color de la etiqueta de texto Label text size - Label text size + Tamaño de texto de etiqueta Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Color de la barra (usado en entornos de trabajo Mesh y FEM) Tamaño del texto de la etiqueta @@ -5251,7 +5266,7 @@ La columna 'Estado' muestra si el documento puede ser recuperado. Reset - Restablecer + Reiniciar @@ -5294,7 +5309,7 @@ La columna 'Estado' muestra si el documento puede ser recuperado. Command - Orden + Comando @@ -5835,13 +5850,13 @@ Desea guardar los cambios? Gui::FileChooser - - + + Select a file Seleccionar un archivo - + Select a directory Seleccionar un directorio @@ -5849,13 +5864,13 @@ Desea guardar los cambios? Gui::FileDialog - + Save as Guardar como - - + + Open Abrir @@ -5863,12 +5878,12 @@ Desea guardar los cambios? Gui::FileOptionsDialog - + Extended Extendida - + All files (*.*) Todos los archivos (*.*) @@ -5996,7 +6011,7 @@ Desea guardar los cambios? Graphviz format - Graphviz format + Formato Graphviz @@ -6814,20 +6829,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Seleccionar módulo - + Open %1 as Abrir %1 como - - - Select - Seleccionar - Gui::StdCmdDescription @@ -7012,7 +7022,7 @@ Do you want to specify another directory? Line width: - Anchura de línea: + Ancho de línea: @@ -8231,7 +8241,7 @@ Desea continuar? Demasiadas notificaciones no intrusivas abiertas. ¡Se están omitiendo las notificaciones! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8240,44 +8250,44 @@ Desea continuar? - + Are you sure you want to continue? ¿Está seguro de que desea continuar? - + Please check report view for more... Por favor, compruebe la vista del informe para más... - + Physical path: Ruta física: - - + + Document: Documento: - - + + Path: Ruta: - + Identical physical path Ruta física idéntica - + Could not save document No se pudo guardar el documento - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8290,102 +8300,102 @@ Would you like to save the file with a different name? ¿Desea guardar el archivo con un nombre diferente? - - - + + + Saving aborted Guardar abortado - + Save dependent files Guardar archivos dependientes - + The file contains external dependencies. Do you want to save the dependent files, too? El archivo contiene dependencias externas. ¿Desea guardar los archivos dependientes también? - - + + Saving document failed No se pudo guardar el documento - + Save document under new filename... Guardar documento con un nombre de archivo nuevo... - - + + Save %1 Document Guardar el documento %1 - + Document Documento - - + + Failed to save document Error al guardar el documento - + Documents contains cyclic dependencies. Do you still want to save them? Los documentos contienen dependencias cíclicas. ¿Desea guardarlos? - + Save a copy of the document under new filename... Guardar una copia del documento con un nuevo nombre de archivo... - + %1 document (*.FCStd) %1 documento (*.FCStd) - + Document not closable El documento no se puede cerrar - + The document is not closable for the moment. El documento no se puede cerrar por el momento. - + Document not saved Documento no guardado - + The document%1 could not be saved. Do you want to cancel closing it? El documento%1 no se pudo guardar. ¿Desea cancelar cerrando? - + Undo Deshacer - + Redo Rehacer - + There are grouped transactions in the following documents with other preceding transactions Hay transacciones de grupo en los siguientes documentos con otras transacciones anteriores - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8468,12 +8478,12 @@ Por favor abra una ventana del navegador y escriba en ella: http://localhost:%1. Opciones... - + Out of memory Memoria insuficiente - + Not enough memory available to display the data. Insuficiente memoria disponible para mostrar los datos. @@ -8499,7 +8509,7 @@ Por favor abra una ventana del navegador y escriba en ella: http://localhost:%1. Mover anotación - + Transform Transformar @@ -8565,14 +8575,14 @@ Por favor abra una ventana del navegador y escriba en ella: http://localhost:%1. La %1 no está vacía, ¿borrar su contenido? - + Translation: Traslación: Translation XY: - Translation XY: + Traducción XY: @@ -8613,32 +8623,32 @@ Por favor abra una ventana del navegador y escriba en ella: http://localhost:%1. Error al crear vínculo de grupo - + Create link failed La creación del vínculo falló - + Failed to create relative link Error al crear vínculo relativo - + Unlink failed Error al desvincular - + Replace link failed Error al reemplazar vínculo - + Failed to import links Error al importar vínculo - + Failed to import all links Error al importar todos los vínculos @@ -9349,14 +9359,14 @@ la copia actual se perderá. StdCmdGroup - + Create group Crear grupo - - Create a new group for ordering objects - Crear un nuevo grupo para ordenar objetos + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9414,13 +9424,13 @@ la copia actual se perderá. StdCmdLinkActions - + Link actions Acciones de vínculos - - + + Actions that apply to link objects Acciones que se aplican a los objetos de enlace @@ -9428,12 +9438,12 @@ la copia actual se perderá. StdCmdLinkImport - + Import links Importar vínculo - + Import selected external link(s) Importar vínculo(s) externo(s) seleccionado(s) @@ -9441,12 +9451,12 @@ la copia actual se perderá. StdCmdLinkImportAll - + Import all links Importar todos los vínculos - + Import all links of the active document Importar todos los vínculos del documento activo @@ -9459,9 +9469,9 @@ la copia actual se perderá. Crear vínculo - - Create a link to the selected object(s) - Crear un vínculo al(los) objeto(s) seleccionado(s) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9480,12 +9490,12 @@ la copia actual se perderá. StdCmdLinkMakeRelative - + Make sub-link Crear sub-vínculo - + Create a sub-object or sub-element link Crear un vínculo de sub-objeto o sub-elemento @@ -9493,12 +9503,12 @@ la copia actual se perderá. StdCmdLinkReplace - + Replace with link Reemplazar con vínculo - + Replace the selected object(s) with link Reemplazar el(los) objeto(s) seleccionados con vínculo @@ -9506,13 +9516,13 @@ la copia actual se perderá. StdCmdLinkSelectActions - + Link navigation Navegación de vínculos - - + + Link navigation actions Acciones de navegación de vínculos @@ -9520,12 +9530,12 @@ la copia actual se perderá. StdCmdLinkSelectAllLinks - + Select all links Seleccionar todos los vínculos - + Select all links to the current selected object Seleccionar todos los vínculos al objeto seleccionado actual @@ -9533,12 +9543,12 @@ la copia actual se perderá. StdCmdLinkSelectLinked - + Go to linked object Ir al objeto vinculado - + Select the linked object and switch to its owner document Seleccione el objeto vinculado y cambie al documento propietario @@ -9546,12 +9556,12 @@ la copia actual se perderá. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Ir al objeto vinculado más profundo - + Select the deepest linked object and switch to its owner document Selecciona el objeto vinculado más profundo y cambia al documento propietario @@ -9559,12 +9569,12 @@ la copia actual se perderá. StdCmdLinkUnlink - + Unlink Desvincular - + Strip on level of link Listón en el nivel de vínculo @@ -9797,9 +9807,11 @@ la copia actual se perderá. Crear pieza - - Create a new part and make it active - Crea una nueva pieza y hacerla activa + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10100,48 +10112,20 @@ la copia actual se perderá. Inspector de escena - - StdCmdSelBack - - - &Back - &Atrás - - - - - Go back to previous selection - Volver a la selección anterior - - StdCmdSelBoundingBox - + &Bounding box &Cuadro delimitador - - + + Show selection bounding box Muestra el cuadro delimitador de selección - - StdCmdSelForward - - - &Forward - &Adelante - - - - - Repeat the backed selection - Repetir la selección respaldada - - StdCmdSelectAll @@ -10453,13 +10437,13 @@ la copia actual se perderá. StdCmdTreeViewActions - + TreeView actions Acciones del vista de árbol - - + + TreeView behavior options and actions Opciones y acciones de comportamiento de la vista de árbol @@ -10999,13 +10983,13 @@ la copia actual se perderá. StdRecallWorkingView - + Recall working view Recordar vista de trabajo - - + + Recall previously stored temporary working view Recordar vista de trabajo temporal almacenada previamente @@ -11013,13 +10997,13 @@ la copia actual se perderá. StdStoreWorkingView - + Store working view Guardar vista de trabajo - - + + Store a document-specific temporary working view Guardar una vista de trabajo temporal específica del documento @@ -11027,13 +11011,13 @@ la copia actual se perderá. StdTreeCollapseDocument - + Collapse/Expand Contraer/expandir - - + + Expand active document and collapse all others Expande el documento activo y colapsa todos los demás @@ -11041,12 +11025,12 @@ la copia actual se perderá. StdTreeDrag - + Initiate dragging Iniciar arrastre - + Initiate dragging of current selected tree items Inicia el arrastre de los elementos del árbol seleccionados @@ -11054,13 +11038,13 @@ la copia actual se perderá. StdTreeMultiDocument - + Multi document Documento múltiple - - + + Display all documents in the tree view Muestra todos los documentos en la vista de árbol @@ -11068,12 +11052,12 @@ la copia actual se perderá. StdTreePreSelection - + Pre-selection Pre-selección - + Preselect the object in 3D view when mouse over the tree item Preselecciona el objeto en la vista 3D cuando el puntero de ratón esté sobre el objeto del árbol @@ -11081,12 +11065,12 @@ la copia actual se perderá. StdTreeRecordSelection - + Record selection Grabar selección - + Record selection in tree view in order to go back/forward using navigation button Graba la selección en la vista de árbol para retroceder/avanzar usando el botón de navegación @@ -11108,13 +11092,13 @@ la copia actual se perderá. StdTreeSingleDocument - + Single document Documento simple - - + + Only display the active document in the tree view Muestra sólo el documento activo en la vista de árbol @@ -11122,12 +11106,12 @@ la copia actual se perderá. StdTreeSyncPlacement - + Sync placement Colocación de sincronización - + Auto adjust placement on drag and drop objects across coordinate systems Ajusta automáticamente la posición al arrastrar y soltar objetos a través de los sistemas de coordenadas @@ -11135,12 +11119,12 @@ la copia actual se perderá. StdTreeSyncSelection - + Sync selection Sincronizar selección - + Auto expand tree item when the corresponding object is selected in 3D view Auto expande el elemento del árbol cuando se selecciona el objeto correspondiente en la vista 3D @@ -11148,12 +11132,12 @@ la copia actual se perderá. StdTreeSyncView - + Sync view Sincronizar vista - + Auto switch to the 3D view containing the selected item Cambia automáticamente a la vista 3D que contiene el elemento seleccionado @@ -11388,7 +11372,7 @@ Do you want to save the document now? Std_Group - + Group Grupo @@ -12086,12 +12070,12 @@ después de que FreeCAD inicie NaviCubeDraggableCmd - + Movable navigation cube Cubo de navegación movible - + Drag and place NaviCube Arrastrar y colocar NaviCube @@ -12939,13 +12923,39 @@ Ahora puedes usar tema para obtener una personalización completa de la interfaz Export dependency graph... - Export dependency graph... + Exportar gráfico de dependencias... Export the dependency graph to a file - Export the dependency graph to a file + Exportar el gráfico de dependencias a un archivo + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_eu.ts b/src/Gui/Language/FreeCAD_eu.ts index 85e9f8ccb5..d053b50163 100644 --- a/src/Gui/Language/FreeCAD_eu.ts +++ b/src/Gui/Language/FreeCAD_eu.ts @@ -137,22 +137,22 @@ Sortu esteka taldea - + Make link Sortu esteka - + Make sub-link Sortu azpiesteka - + Import links Inportatu estekak - + Import all links Inportatu esteka guztiak @@ -167,12 +167,12 @@ Txertatu testu-dokumentua - + Add a part Gehitu zati bat - + Add a group Gehitu talde bat @@ -687,7 +687,7 @@ while doing a left or right click and move the mouse up or down - + [empty string] @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Kameraren ezarpenak - + Orientation Orientazioa - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Uneko bista @@ -951,7 +951,7 @@ while doing a left or right click and move the mouse up or down - + [empty string] @@ -1043,7 +1043,7 @@ Hau markatuta ez badago, propietateak izen bakarra izan behar du eta 'obj.Izena' - + [empty string] @@ -1230,7 +1230,7 @@ Hau markatuta ez badago, propietateak izen bakarra izan behar du eta 'obj.Izena' Gui::Dialog::DlgCustomCommands - + [empty string] @@ -1332,7 +1332,7 @@ same time. The one with the highest priority will be triggered. - + [empty string] @@ -1516,7 +1516,7 @@ same time. The one with the highest priority will be triggered. - + [empty string] @@ -1657,7 +1657,7 @@ same time. The one with the highest priority will be triggered. - + [empty string] @@ -1777,7 +1777,7 @@ same time. The one with the highest priority will be triggered. Gui::Dialog::DlgEditorSettings - + [empty string] @@ -1789,7 +1789,7 @@ same time. The one with the highest priority will be triggered. - + [empty string] @@ -1816,22 +1816,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Aurkitu fitxategia: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Ftixategi-izenen bilaketa maiuskulak/minuskulak kontuan hartu gabe, adierazpen erregularrak onartzen dira Find in files: - Find in files: + Aurkitu fitxategietan: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Iragazi fitxategi-edukien maiuskulak/minuskulak kontuan hartu gabe, adierazpen erregularrak onartzen dira @@ -2173,7 +2173,7 @@ Fitxategi-baimenen arazo bat ote da? - + [empty string] @@ -2429,7 +2429,7 @@ Zehaztu beste direktorio, mesedez. - + [empty string] @@ -2554,7 +2554,7 @@ Zehaztu beste direktorio, mesedez. - + [empty string] @@ -2688,7 +2688,7 @@ Zehaztu beste direktorio, mesedez. Gui::Dialog::DlgReportView - + [empty string] @@ -3032,7 +3032,7 @@ muga-koadroaren tamainarekin biderkatuko den faktore bat da. - + [empty string] @@ -3306,7 +3306,7 @@ kolore-barraz aparte - + [empty string] @@ -3965,7 +3965,7 @@ Honako forma ere erabili dezakezu: Jon Inor <jon@inor.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Nabigazioa @@ -4059,35 +4059,60 @@ Honako forma ere erabili dezakezu: Jon Inor <jon@inor.com> Base color for all elements Elementu guztietarako oinarri-kolorea + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D nabigazioa - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Zerrendatu saguaren botoien konfigurazioak hautatutako nabigazio-ezarpen bakoitzerako. Hautatu multzo bat eta sakatu botoia konfigurazioak ikusteko. - + Mouse... Sagua... - + Navigation settings set Nabigazio-ezarpenen multzoa - + Orbit style Orbita-estiloa - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4099,116 +4124,116 @@ Tornu askea: Pieza Z ardatzaren inguruan biratuko da. - + Turntable Tornua - + Trackball Trackball - + Free Turntable Tornu librea - + Rotation mode Biraketa modua - + Rotations in 3D will use current cursor position as center for rotation 3D moduko biraketek kurtsorearen uneko posizioa erabiliko dute biraketarako erdigune gisa - + Window center Leihoaren zentroa - + Drag at cursor Arrastatu kurtsorera - + Object center Objektuaren zentroa - + Default camera orientation Kameraren orientazio lehenetsia - + Default camera orientation when creating a new document or selecting the home view Kameraren orientazio lehenetsia dokumentu bat sortzean edo bista nagusia hautatzean - + Camera zoom Kamera-zooma - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Kameraren zooma ezartzen du dokumentu berrietarako. Balioa da pantailari doituko zaion esferaren diametroa. - + mm mm - + Enable animated rotations Gaitu biraketa animatuak - + Enable animation Gaitu animazioa - + Zoom operations will be performed at position of mouse pointer Zoom-eragiketak saguaren erakuslearen posizioan gauzatuko dira - + Zoom at cursor Zooma kurtsorean - + Zoom step Zoom-urratsa - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Zenbateko zooma egingo den. '1' mailako zoomak 7,5eko faktorea da zoom-maila bakoitzerako. - + Direction of zoom operations will be inverted Zoom-eragiketen norabidea alderantzikatu egingo da. - + Invert zoom Alderantzikatu zooma - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4217,67 +4242,57 @@ Keinu-nabigazioaren estiloari soilik eragiten dio. Ezarpen honek ez du desgaitzen sagu bidezko inklinazioa. - + Disable touchscreen tilt gesture Desgaitu ukimen-pantailaren inklinazio keinua - - Show the rotation center when dragging. - Arrastatzean, erakutsi biraketa-zentroa. - - - - Enable rotation center indication - Gaitu biraketa-zentroaren adierazlea - - - + Isometric Isometrikoa - + Dimetric Dimetrikoa - + Trimetric Trimetrikoa - + Top Goikoa - + Front Aurrekoa - + Left Ezkerrekoa - + Right Eskuinekoa - + Rear Atzekoa - + Bottom Azpikoa - + Custom Pertsonalizatua @@ -4329,12 +4344,12 @@ espazioa baino gehiago behar dutenean Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Python profilatzailearen tartea (milisegundoak): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + Profilatzaileak exekutatzeko erabiltzen duen denbora-tartea Python kodea exekutatzen ari denean (erabiltzaile-interfazea ez blokeatzeko). Ezarri 0 desgaitzeko. @@ -4463,27 +4478,27 @@ Balio handiagoak elementuak aukeratzea errazten du, baina elementu txikiak hauta Color Bar - Color Bar + Kolore-barra Label text color - Label text color + Etiketako testuaren kolorea Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Kolore-barra (Amaraun eta FEM lan-mahaietan erabilia) Etiketako testuaren kolorea Label text size - Label text size + Etiketako testuaren tamaina Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Kolore-barra (Amaraun eta FEM lan-mahaietan erabilia) Etiketako testuaren tamaina @@ -4556,7 +4571,7 @@ Balio handiagoak elementuak aukeratzea errazten du, baina elementu txikiak hauta Gui::Dialog::DlgTipOfTheDay - + [empty string] @@ -5520,7 +5535,7 @@ hautatutako objektuekin - + [empty string] @@ -5841,13 +5856,13 @@ Aldaketak gorde nahi dituzu? Gui::FileChooser - - + + Select a file Hautatu fitxategi bat - + Select a directory Hautatu direktorio bat @@ -5855,13 +5870,13 @@ Aldaketak gorde nahi dituzu? Gui::FileDialog - + Save as Gorde honela - - + + Open Ireki @@ -5869,12 +5884,12 @@ Aldaketak gorde nahi dituzu? Gui::FileOptionsDialog - + Extended Hedatua - + All files (*.*) Fitxategi guztiak (*.*) @@ -6002,7 +6017,7 @@ Aldaketak gorde nahi dituzu? Graphviz format - Graphviz format + Graphviz formatua @@ -6823,20 +6838,15 @@ Datuak gorde gabe irten nahi duzu? Gui::SelectModule - + Select module Hautatu modulua - + Open %1 as Ireki %1 honela: - - - Select - Hautatu - Gui::StdCmdDescription @@ -8242,7 +8252,7 @@ Jarraitu nahi duzu? Jakinarazpen ez intrusibo gehiegi dago irekita. Jakinarazpenei ez ikusiarena egiten ari zaie. - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8251,44 +8261,44 @@ Jarraitu nahi duzu? - + Are you sure you want to continue? Ziur zaude jarraitu nahi duzula? - + Please check report view for more... Begiratu txosten-bista gehiagorako... - + Physical path: Bide-izen fisikoa: - - + + Document: Dokumentua: - - + + Path: Bidea: - + Identical physical path Bide-izen fisiko berdina - + Could not save document Ezin da dokumentua gorde - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8301,102 +8311,102 @@ Would you like to save the file with a different name? Fitxategia beste izen batekin gorde nahi al duzu? - - - + + + Saving aborted Gordetzea abortatu da - + Save dependent files Gorde mendeko fitxategiak - + The file contains external dependencies. Do you want to save the dependent files, too? Fitxategiak kanpoko mendekotasunak ditu. Mendeko fitxategiak ere gorde nahi al dituzu? - - + + Saving document failed Dokumentua ezin izan da gorde - + Save document under new filename... Gorde dokumentua beste fitxategi-izen batekin... - - + + Save %1 Document Gorde %1 dokumentua - + Document Dokumentua - - + + Failed to save document Dokumentua gordetzeak huts egin du - + Documents contains cyclic dependencies. Do you still want to save them? Dokumentuek mendekotasun ziklikoak dituzte. Gorde nahi dituzu ala ere? - + Save a copy of the document under new filename... Gorde dokumentuaren kopia bat fitxategi-izen berri batekin... - + %1 document (*.FCStd) %1 dokumentua (*.FCStd) - + Document not closable Dokumentua ezin da itxi - + The document is not closable for the moment. Dokumentua ezin da momentuz itxi. - + Document not saved Dokumentua ez da gorde - + The document%1 could not be saved. Do you want to cancel closing it? %1 dokumentua ezin izan da gorde. Hura ixtea bertan behera utzi nahi duzu? - + Undo Desegin - + Redo Berregin - + There are grouped transactions in the following documents with other preceding transactions Transakzio taldekatuak daude aurretiko beste transakzio batzuk dituzten hurrengo dokumentuetan - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8479,12 +8489,12 @@ Mesedez, ireki nabigatzaile-leiho bat eta idatzi: http://localhost:%1.Aukerak... - + Out of memory Memoria gutxiegi - + Not enough memory available to display the data. Ez dago nahiko memoriarik datuak bistaratzeko. @@ -8510,7 +8520,7 @@ Mesedez, ireki nabigatzaile-leiho bat eta idatzi: http://localhost:%1.Mugitu oharpena - + Transform Transformatu @@ -8576,14 +8586,14 @@ Mesedez, ireki nabigatzaile-leiho bat eta idatzi: http://localhost:%1.%1 ez dago hutsik, bere edukiak ere ezabatu nahi dituzu? - + Translation: Translazioa: Translation XY: - Translation XY: + XY traslazioa: @@ -8624,32 +8634,32 @@ Mesedez, ireki nabigatzaile-leiho bat eta idatzi: http://localhost:%1.Esteka-taldea sortzeak huts egin du - + Create link failed Esteka sortzeak huts egin du - + Failed to create relative link Esteka erlatiboa sortzeak huts egin du - + Unlink failed Esteka askatzeak huts egin du - + Replace link failed Esteka ordezteak huts egin du - + Failed to import links Estekak inportatzeak huts egin du - + Failed to import all links Esteka guztiak inportatzeak huts egin du @@ -9359,14 +9369,14 @@ egindako aldaketak galdu egingo direla. StdCmdGroup - + Create group Sortu taldea - - Create a new group for ordering objects - Sortu talde berria objektuak ordenatzeko + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9424,13 +9434,13 @@ egindako aldaketak galdu egingo direla. StdCmdLinkActions - + Link actions Esteka-ekintzak - - + + Actions that apply to link objects Esteka-objektuei aplikatzen zaizkien ekintzak @@ -9438,12 +9448,12 @@ egindako aldaketak galdu egingo direla. StdCmdLinkImport - + Import links Inportatu estekak - + Import selected external link(s) Inportatu hautatutako kanpo-esteka(k) @@ -9451,12 +9461,12 @@ egindako aldaketak galdu egingo direla. StdCmdLinkImportAll - + Import all links Inportatu esteka guztiak - + Import all links of the active document Inportatu dokumentu aktiboaren esteka guztiak @@ -9469,9 +9479,9 @@ egindako aldaketak galdu egingo direla. Sortu esteka - - Create a link to the selected object(s) - Sortu hautatutako objektu(ar)en esteka + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9490,12 +9500,12 @@ egindako aldaketak galdu egingo direla. StdCmdLinkMakeRelative - + Make sub-link Sortu azpiesteka - + Create a sub-object or sub-element link Sortu azpiobjektu edo azpielementu baten esteka @@ -9503,12 +9513,12 @@ egindako aldaketak galdu egingo direla. StdCmdLinkReplace - + Replace with link Ordeztu estekarekin - + Replace the selected object(s) with link Ordeztu hautatutako objektua(k) estekarekin @@ -9516,13 +9526,13 @@ egindako aldaketak galdu egingo direla. StdCmdLinkSelectActions - + Link navigation Esteka-nabigazioa - - + + Link navigation actions Esteka-nabigazioaren ekintzak @@ -9530,12 +9540,12 @@ egindako aldaketak galdu egingo direla. StdCmdLinkSelectAllLinks - + Select all links Hautatu esteka guztiak - + Select all links to the current selected object Hautatu unean hautatutako objektuaren esteka guztiak @@ -9543,12 +9553,12 @@ egindako aldaketak galdu egingo direla. StdCmdLinkSelectLinked - + Go to linked object Joan estekatutako objektura - + Select the linked object and switch to its owner document Hautatu estekatutako objektua eta joan bere dokumentu jabera @@ -9556,12 +9566,12 @@ egindako aldaketak galdu egingo direla. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Joan sakonen estekatutako objektura - + Select the deepest linked object and switch to its owner document Hautatu sakonen estekatutako objektua eta joan bere dokumentu jabera @@ -9569,12 +9579,12 @@ egindako aldaketak galdu egingo direla. StdCmdLinkUnlink - + Unlink Askatu - + Strip on level of link Biluztu estekaren maila @@ -9807,9 +9817,11 @@ egindako aldaketak galdu egingo direla. Sortu pieza - - Create a new part and make it active - Sortu pieza berria eta hura aktibatu + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10110,48 +10122,20 @@ egindako aldaketak galdu egingo direla. Eszena-ikuskatzailea - - StdCmdSelBack - - - &Back - A&tzera - - - - - Go back to previous selection - Joan aurreko hautapenera - - StdCmdSelBoundingBox - + &Bounding box &Muga-kutxa - - + + Show selection bounding box Erakutsi hautapenaren muga-kutxa - - StdCmdSelForward - - - &Forward - A&urrera - - - - - Repeat the backed selection - Errepikatu aurreko hautapena - - StdCmdSelectAll @@ -10463,13 +10447,13 @@ egindako aldaketak galdu egingo direla. StdCmdTreeViewActions - + TreeView actions Zuhaitz-bistako ekintzak - - + + TreeView behavior options and actions Zuhaitz-bistaren portaeraren aukerak eta ekintzak @@ -11009,13 +10993,13 @@ egindako aldaketak galdu egingo direla. StdRecallWorkingView - + Recall working view Berreskuratu laneko bista - - + + Recall previously stored temporary working view Berreskuratu aurretik gorde den aldi baterako laneko bista @@ -11023,13 +11007,13 @@ egindako aldaketak galdu egingo direla. StdStoreWorkingView - + Store working view Biltegiratu laneko bista - - + + Store a document-specific temporary working view Biltegiratu dokumentuan espezifikoa den aldi baterako laneko bista @@ -11037,13 +11021,13 @@ egindako aldaketak galdu egingo direla. StdTreeCollapseDocument - + Collapse/Expand Tolestu/hedatu - - + + Expand active document and collapse all others Hedatu dokumentu aktiboa eta tolestu beste guztiak @@ -11051,12 +11035,12 @@ egindako aldaketak galdu egingo direla. StdTreeDrag - + Initiate dragging Hasi arrastatzea - + Initiate dragging of current selected tree items Hasi unean hautatutako zuhaitz-elementuen arrastatzea @@ -11064,13 +11048,13 @@ egindako aldaketak galdu egingo direla. StdTreeMultiDocument - + Multi document Dokumentu anitza - - + + Display all documents in the tree view Bistaratu dokumentu guztiak zuhaitz-bistan @@ -11078,12 +11062,12 @@ egindako aldaketak galdu egingo direla. StdTreePreSelection - + Pre-selection Aurretiko hautapena - + Preselect the object in 3D view when mouse over the tree item Aurretik hautatu objektua 3D bistan sagua zuhaitz-elementuaren gainean dagoenean @@ -11091,12 +11075,12 @@ egindako aldaketak galdu egingo direla. StdTreeRecordSelection - + Record selection Grabatu hautapena - + Record selection in tree view in order to go back/forward using navigation button Grabatu zuhaitz-bistako hautapena aurrera/atzera egin ahal izateko nabigazio-botoia erabilita @@ -11118,13 +11102,13 @@ egindako aldaketak galdu egingo direla. StdTreeSingleDocument - + Single document Dokumentu bakarra - - + + Only display the active document in the tree view Bistaratu dokumentu aktiboa soilik zuhaitz-bistan @@ -11132,12 +11116,12 @@ egindako aldaketak galdu egingo direla. StdTreeSyncPlacement - + Sync placement Sinkronizatu kokapena - + Auto adjust placement on drag and drop objects across coordinate systems Automatikoki doitu kokapena objektuak koordenatu-sistema batetik bestera arrastatu eta jaregitean @@ -11145,12 +11129,12 @@ egindako aldaketak galdu egingo direla. StdTreeSyncSelection - + Sync selection Sinkronizatu hautapena - + Auto expand tree item when the corresponding object is selected in 3D view Automatikoki hedatu zuhaitz-elementua hari dagokion objektua 3D bistan hautatuta dagoenean @@ -11158,12 +11142,12 @@ egindako aldaketak galdu egingo direla. StdTreeSyncView - + Sync view Sinkronizatu bista - + Auto switch to the 3D view containing the selected item Automatikoki aldatu hautatutako elementua duen 3D bistara @@ -11398,7 +11382,7 @@ Dokumentua gorde nahi al duzu? Std_Group - + Group Taldea @@ -12096,12 +12080,12 @@ FreeCAD abiarazi ondoren NaviCubeDraggableCmd - + Movable navigation cube Nabigazio-kubo mugikorra - + Drag and place NaviCube Arrastatu eta kokatu nabigazio-kuboa @@ -12954,13 +12938,39 @@ Orain gaiak erabili daitezke interfazea osorik pertsonalizatzeko. Export dependency graph... - Export dependency graph... + Esportatu mendekotasun-grafikoa... Export the dependency graph to a file - Export the dependency graph to a file + Esportatu mendekotasun-grafikoa fitxategi batera + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_fi.ts b/src/Gui/Language/FreeCAD_fi.ts index 1aa481c75f..980776718f 100644 --- a/src/Gui/Language/FreeCAD_fi.ts +++ b/src/Gui/Language/FreeCAD_fi.ts @@ -137,22 +137,22 @@ Tee linkkiryhmä - + Make link Tee linkki - + Make sub-link Tee alilinkki - + Import links Tuo linkkejä - + Import all links Tuo kaikki linkit @@ -167,12 +167,12 @@ Lisää tekstiasiakirja - + Add a part Lisää osa - + Add a group Lisää ryhmä @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Kameran asetukset - + Orientation Suunta - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Nykyinen Näkymä @@ -1819,17 +1819,17 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Etsi tiedosto: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Tiedostohaku, kirjainkoolla ei merkitystä, tavalliset hakulausekkeet sallittu Find in files: - Find in files: + Etsi tiedostoista: @@ -3966,7 +3966,7 @@ Voit myös käyttää muotoa: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Siirtyminen @@ -4060,35 +4060,60 @@ Voit myös käyttää muotoa: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D-navigointi - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Listaa hiiren painike asetukset kunkin valitun navigointiasetuksen osalta. Valitse sarja ja paina sitten painiketta nähdäksesi mainitut asetukset. - + Mouse... Hiiri... - + Navigation settings set Navigoinnin asetukset - + Orbit style Kiertoradan tyyli - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4099,116 +4124,116 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable Pyörähdyspöytä - + Trackball Trackball - + Free Turntable Free Turntable - + Rotation mode Kiertotila - + Rotations in 3D will use current cursor position as center for rotation Kiertäminen 3D: ssä käyttää nykyistä kursorin sijaintia pyörimisen keskipisteenä - + Window center Ikkunan keskipiste - + Drag at cursor Vedä kohdistimeen - + Object center Objektin keskipiste - + Default camera orientation Kameran oletussuunta - + Default camera orientation when creating a new document or selecting the home view Kameran oletussuunta luotaessa uutta asiakirjaa tai valitsemalla kotinäkymä - + Camera zoom Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Asettaa kameran zoomaus uusille dokumenteille. Arvo on pallon halkaisija, joka mahtuu ruudulle. - + mm mm - + Enable animated rotations Käytä animoituja kiertoja - + Enable animation Ota animaatiot käyttöön - + Zoom operations will be performed at position of mouse pointer Zoomaus toiminnot suoritetaan hiiren osoittimen kohdassa - + Zoom at cursor Suurenna osoittimen kohdalta - + Zoom step Zoom step - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. - + Direction of zoom operations will be inverted Suurennuksen suunta käännetään ylösalaisin - + Invert zoom Käännä zoom päinvastaiseksi - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4217,67 +4242,57 @@ Vaikuttaa vain ele navigointi tyyliin. Hiiren kallistaminen ei ole pois käytöstä tällä asetuksella. - + Disable touchscreen tilt gesture Poista kosketusnäytön kallistusele käytöstä - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Isometrinen - + Dimetric Dimetrinen - + Trimetric Trimetrinen - + Top Yläpuoli - + Front Etupuoli - + Left Vasen - + Right Oikea - + Rear Takana - + Bottom Pohja - + Custom Mukautettu @@ -5839,13 +5854,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Valitse tiedosto - + Select a directory Valitse hakemisto @@ -5853,13 +5868,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Tallenna nimellä - - + + Open Avaa @@ -5867,12 +5882,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Laajennettu - + All files (*.*) Kaikki tiedostot (*.*) @@ -6819,20 +6834,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Valitse moduuli - + Open %1 as Avaa kuin %1 - - - Select - Valitse - Gui::StdCmdDescription @@ -8238,7 +8248,7 @@ Haluatko jatkaa? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8247,44 +8257,44 @@ Haluatko jatkaa? - + Are you sure you want to continue? Haluatko varmasti jatkaa? - + Please check report view for more... Please check report view for more... - + Physical path: Fyysinen polku: - - + + Document: Document: - - + + Path: Polku: - + Identical physical path Identtinen fyysinen polku - + Could not save document Could not save document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8297,102 +8307,102 @@ Would you like to save the file with a different name? Would you like to save the file with a different name? - - - + + + Saving aborted Tallentaminen keskeytettiin - + Save dependent files Tallenna riippuvaiset tiedostot - + The file contains external dependencies. Do you want to save the dependent files, too? Tiedosto sisältää ulkoisia riippuvuuksia. Haluatko tallentaa myös riippuvaiset tiedostot? - - + + Saving document failed Asiakirjan tallennus epäonnistui - + Save document under new filename... Tallenna asiakirja uudella tiedostonimellä... - - + + Save %1 Document Tallenna %1-asiakirja - + Document Asiakirja - - + + Failed to save document Asiakirjan tallennus epäonnistui - + Documents contains cyclic dependencies. Do you still want to save them? Asiakirjat sisältävät syklisiä riippuvuuksia. Haluatko silti tallentaa ne? - + Save a copy of the document under new filename... Tallenna kopio asiakirjasta uudelle tiedostonimelle... - + %1 document (*.FCStd) %1-asiakirja (*.FCStd) - + Document not closable Asiakirja ei ole suljettavissa - + The document is not closable for the moment. Asiakirja ei ole tällä hetkellä suljettavissa. - + Document not saved Document not saved - + The document%1 could not be saved. Do you want to cancel closing it? The document%1 could not be saved. Do you want to cancel closing it? - + Undo Kumoa - + Redo Tee uudelleen - + There are grouped transactions in the following documents with other preceding transactions Seuraavissa asiakirjoissa on ryhmiteltyjä yhteistoimintoja muiden edeltävien yhteistoimintojen kanssa - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8473,12 +8483,12 @@ Please open a browser window and type in: http://localhost:%1. Asetukset... - + Out of memory Muisti loppui - + Not enough memory available to display the data. Muisti ei riitä tietojen näyttämiseen. @@ -8504,7 +8514,7 @@ Please open a browser window and type in: http://localhost:%1. Siirrä lisähuomautusta - + Transform Muunna @@ -8570,7 +8580,7 @@ Please open a browser window and type in: http://localhost:%1. The %1 ei ole tyhjä, poista myös sen sisältö? - + Translation: Sijainti: @@ -8618,32 +8628,32 @@ Please open a browser window and type in: http://localhost:%1. Linkkiryhmän luonti epäonnistui - + Create link failed Linkin luonti epäonnistui - + Failed to create relative link Suhteellisen linkin luominen epäonnistui - + Unlink failed Linkin poisto epäonnistui - + Replace link failed Linkin korvaaminen epäonnistui - + Failed to import links Linkkien tuominen epäonnistui - + Failed to import all links Kaikkien linkkien tuominen epäonnistui @@ -9355,14 +9365,14 @@ the current copy will be lost. StdCmdGroup - + Create group Luo ryhmä - - Create a new group for ordering objects - Luo uusi ryhmä objektien järjestämistä varten + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9420,13 +9430,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Linkin toiminnot - - + + Actions that apply to link objects Actions that apply to link objects @@ -9434,12 +9444,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Tuo linkkejä - + Import selected external link(s) Tuo valitut ulkoiset linkit @@ -9447,12 +9457,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Tuo kaikki linkit - + Import all links of the active document Tuo kaikki aktiivisen asiakirjan linkit @@ -9465,9 +9475,9 @@ the current copy will be lost. Tee linkki - - Create a link to the selected object(s) - Luo linkki valittuihin kohteisiin + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9486,12 +9496,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Tee alilinkki - + Create a sub-object or sub-element link Luo aliobjekti- tai alielementtilinkki @@ -9499,12 +9509,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Korvaa linkillä - + Replace the selected object(s) with link Korvaa valittu objekti tai objektit linkillä @@ -9512,13 +9522,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Linkeissä liikkuminen - - + + Link navigation actions Linkeissä liikkumisen toiminnot @@ -9526,12 +9536,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Valitse kaikki linkit - + Select all links to the current selected object Valitse kaikki linkit valittuun kohteeseen @@ -9539,12 +9549,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Siirry linkitettyyn objektiin - + Select the linked object and switch to its owner document Valitse linkitetty objekti ja vaihda sen omistaja-asiakirjaan @@ -9552,12 +9562,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Siirry syvimpään linkitettyyn objektiin - + Select the deepest linked object and switch to its owner document Valitse syvin linkitetty objekti ja vaihda sen omistaja-asiakirjaan @@ -9565,12 +9575,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Pura linkki - + Strip on level of link Poista linkin taso @@ -9803,9 +9813,11 @@ the current copy will be lost. Luo osa - - Create a new part and make it active - Luo uusi osa ja tee se aktiiviseksi + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10106,48 +10118,20 @@ the current copy will be lost. Näkymän tarkastaja - - StdCmdSelBack - - - &Back - Takaisin &B - - - - - Go back to previous selection - Siirry edelliseen valintaan - - StdCmdSelBoundingBox - + &Bounding box &Kehykset - - + + Show selection bounding box Näytä valintaa rajaava laatikko - - StdCmdSelForward - - - &Forward - Eteenpäin - - - - - Repeat the backed selection - Toista tallennettu valinta - - StdCmdSelectAll @@ -10459,13 +10443,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Puunäkymän (TreeView) toiminnot - - + + TreeView behavior options and actions Puunäkymän käyttäytymisvaihtoehdot ja toiminnot @@ -11005,13 +10989,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11019,13 +11003,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11033,13 +11017,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Tiivistä/Laajenna - - + + Expand active document and collapse all others Laajenna aktiivinen asiakirja ja kutista kaikki muut @@ -11047,12 +11031,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Käynnistä vetämällä - + Initiate dragging of current selected tree items Aloita valitun puun nimikkeiden vetäminen @@ -11060,13 +11044,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Useita asiakirjoja - - + + Display all documents in the tree view Näytä kaikki asiakirjat puunäkymässä @@ -11074,12 +11058,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Esivalinta - + Preselect the object in 3D view when mouse over the tree item Esivalitse objekti 3D-näkymässä, kun hiiri on puu kohteen yllä @@ -11087,12 +11071,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Tallennuksen valinta - + Record selection in tree view in order to go back/forward using navigation button Tallenna valinta puunäkymään, jotta voit siirtyä takaisin/eteenpäin navigointipainikkeella @@ -11114,13 +11098,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Yksi asiakirja - - + + Only display the active document in the tree view Näytä vain aktiivinen asiakirja puunäkymässä @@ -11128,12 +11112,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Synkronoi sijoitus - + Auto adjust placement on drag and drop objects across coordinate systems Säädä automaattisesti sijoitusta vedä ja pudota -kohteissa koordinaattijärjestelmien välillä @@ -11141,12 +11125,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Synkronoi valinta - + Auto expand tree item when the corresponding object is selected in 3D view Laajenna puun kohde automaattisesti kun vastaava objekti on valittu 3D-näkymässä @@ -11154,12 +11138,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Synkronoi näkymä - + Auto switch to the 3D view containing the selected item Vaihda automaattisesti 3D-näkymään, joka sisältää valitun kohteen @@ -11394,7 +11378,7 @@ Haluatko tallentaa asiakirjan nyt? Std_Group - + Group Ryhmä @@ -12092,12 +12076,12 @@ FreeCAD käynnistyksen jälkeen NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12959,4 +12943,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_fr.ts b/src/Gui/Language/FreeCAD_fr.ts index 84420218aa..6d089a29b4 100644 --- a/src/Gui/Language/FreeCAD_fr.ts +++ b/src/Gui/Language/FreeCAD_fr.ts @@ -137,22 +137,22 @@ Créer un groupe de liens - + Make link Créer un lien - + Make sub-link Créer un sous-lien - + Import links Importer des liens - + Import all links Importer tous les liens @@ -167,12 +167,12 @@ Insérer un document texte - + Add a part Ajouter une pièce - + Add a group Ajouter un groupe @@ -413,7 +413,7 @@ Default - Défaut + Par défaut @@ -443,12 +443,12 @@ Color - Couleur + Colorier The object will have the color of its individual faces editable with the Part FaceColors command - La couleur des faces individuelles de l’objet sera modifiable à l’aide de la commande Part FaceColors + La couleur de chaque face de l’objet est modifiable à l’aide de la commande Part Définir les couleurs. @@ -587,7 +587,7 @@ Press middle mouse button - Appuyez sur la roulette de la souris + Appuyer sur la roulette de la souris @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Paramètres de la caméra - + Orientation Orientation - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vue actuelle @@ -1382,7 +1382,7 @@ same time. The one with the highest priority will be triggered. none - aucun + rien @@ -1817,22 +1817,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Rechercher un fichier : Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Recherche insensible à la casse des noms de fichiers. Les expressions régulières sont prises en charge. Find in files: - Find in files: + Rechercher dans des fichiers : Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Filtrer par le contenu de fichier, insensible à la casse. Les expressions régulières sont prises en charge. @@ -2727,7 +2727,7 @@ Veuillez spécifier un autre répertoire. TextLabel - Étiquette de texte + TextLabel @@ -2978,7 +2978,7 @@ la taille de la boîte englobante de l'objet 3D affichée. Backlight is enabled with the defined color - Le rétroéclairage est activé avec la couleur définie + Le rétroéclairage est activé avec la couleur définie. @@ -3192,7 +3192,7 @@ la taille de la boîte englobante de l'objet 3D affichée. Color gradient is used with its full color range - Le dégradé de couleur est utilisé avec sa gamme de couleurs complètes + Le dégradé de couleurs est utilisé avec sa gamme de couleurs complètes @@ -3207,7 +3207,7 @@ la taille de la boîte englobante de l'objet 3D affichée. Color gradient starts from the zero value - Le dégradé de couleur commence à partir de la valeur zéro + Le dégradé de couleurs commence à partir de la valeur zéro @@ -3955,7 +3955,7 @@ Vous pouvez également utiliser la forme : John Doe <john@doe.com>Gui::Dialog::DlgSettingsNavigation - + Navigation Navigation @@ -4027,7 +4027,7 @@ Vous pouvez également utiliser la forme : John Doe <john@doe.com> Default - Par défaut + Défaut @@ -4049,35 +4049,60 @@ Vous pouvez également utiliser la forme : John Doe <john@doe.com>Base color for all elements Couleur de base pour tous les éléments + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navigation 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Liste les configurations du bouton de la souris pour chaque paramètre de navigation choisi. Sélectionnez un réglage puis appuyez sur le bouton pour afficher ces configurations. - + Mouse... Souris... - + Navigation settings set - Ensemble des paramètres de navigation + Ensemble des réglages de navigation - + Orbit style Style d'orbite - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4088,116 +4113,116 @@ Vue en rotation : la pièce sera pivotée autour de l’axe z (avec des axes con Vue en rotation libre : la pièce sera pivotée autour de l’axe z. - + Turntable Vue en rotation - + Trackball Trackball - + Free Turntable Vue en rotation libre - + Rotation mode Mode de rotation - + Rotations in 3D will use current cursor position as center for rotation Les rotations en 3D utiliseront la position actuelle du curseur comme centre de rotation - + Window center Centre de la fenêtre - + Drag at cursor Positionner au curseur - + Object center Centre de l'objet - + Default camera orientation Orientation par défaut de la caméra - + Default camera orientation when creating a new document or selecting the home view Orientation par défaut de la caméra lors de la création d'un nouveau document ou de la sélection de la vue initiale - + Camera zoom Zoom de la caméra - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Définit le zoom de la caméra pour de nouveaux documents. La valeur est le diamètre de la sphère qui rentre à l'écran. - + mm mm - + Enable animated rotations Activer les rotations animées - + Enable animation Permettre l'animation - + Zoom operations will be performed at position of mouse pointer Les opérations de zoom seront effectuées à la position du pointeur de la souris - + Zoom at cursor Zoomer sur le curseur - + Zoom step Pas de zoom - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Quel sera le zoom. Le zoom au pas de '1' signifie un facteur de 7.5 pour chaque pas de zoom. - + Direction of zoom operations will be inverted Le sens du zoom sera inversé - + Invert zoom Inverser le zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4206,67 +4231,57 @@ N’affecte que le style de navigation Gesture. L’inclinaison à la souris n’est pas désactivée par ce réglage. - + Disable touchscreen tilt gesture Désactiver l’inclinaison par geste de l’écran tactile - - Show the rotation center when dragging. - Afficher le centre de rotation lors d'un déplacement. - - - - Enable rotation center indication - Activer l'indication du centre de rotation - - - + Isometric Isométrique - + Dimetric Dimétrique - + Trimetric Trimétrique - + Top Dessus - + Front Face - + Left Gauche - + Right Droit - + Rear Arrière - + Bottom Dessous - + Custom Personnaliser @@ -4318,12 +4333,12 @@ dans la console Python Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Intervalle du profileur Python (millisecondes) : The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + L'intervalle auquel le profileur s'exécute lorsqu'il y a du code Python en cours d'exécution (pour que l'interface graphique continue à répondre). Mettez 0 pour le désactiver. @@ -4452,32 +4467,32 @@ Une valeur plus grande facilite la sélection, mais peut rendre les petites fonc Color Bar - Color Bar + Barre des couleurs Label text color - Label text color + Couleur du texte des étiquettes Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Barre des couleurs (utilisée dans les ateliers Mesh et FEM). Couleur du texte des étiquettes. Label text size - Label text size + Taille de la police des étiquettes Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Barre des couleurs (utilisée dans les ateliers Mesh et FEM). Taille du texte des étiquettes. Switches the colors of the gradient - Echange les couleurs du dégradé + Échanger les couleurs du dégradé @@ -4487,7 +4502,7 @@ Une valeur plus grande facilite la sélection, mais peut rendre les petites fonc Color gradient will get selected color as middle color - Le dégradé de couleur obtiendra la couleur sélectionnée comme couleur moyenne + Le dégradé de couleur obtiendra la couleur sélectionnée comme couleur moyenne. @@ -4513,7 +4528,7 @@ Une valeur plus grande facilite la sélection, mais peut rendre les petites fonc Background color for objects in tree view that are currently edited - Couleur d'arrière-plan pour les objets de l'arborescence en cours d'édition + Couleur de l'arrière-plan pour les objets de la vue en arborescence en cours d'édition @@ -4523,7 +4538,7 @@ Une valeur plus grande facilite la sélection, mais peut rendre les petites fonc Background color for active containers in tree view - Couleur de fond pour les conteneurs actifs dans la vue en arborescence + Couleur de l'arrière-plan pour les conteneurs actifs dans la vue en arborescence @@ -4642,7 +4657,7 @@ Le système par défaut est celui défini dans les préférences générales. Close - Faible + Fermer @@ -5343,7 +5358,7 @@ La colonne "État" indique si le document a pu être récupéré. Close - Fermer + Faible @@ -5432,12 +5447,12 @@ La colonne "État" indique si le document a pu être récupéré. Object selection - Sélection d'objet + Sélection d'un objet The selected objects contain other dependencies. Please select which objects to export. All dependencies are auto selected by default. - Les objets sélectionnés contiennent d'autres dépendances. Veuillez sélectionner les objets à exporter. Toutes les dépendances sont automatiquement sélectionnées par défaut. + Les objets sélectionnés contiennent d'autres dépendances. Sélectionner les objets à exporter. Toutes les dépendances sont automatiquement sélectionnées par défaut. @@ -5829,13 +5844,13 @@ Voulez enregistrer les modifications ? Gui::FileChooser - - + + Select a file Sélectionner un fichier - + Select a directory Sélectionner un répertoire @@ -5843,13 +5858,13 @@ Voulez enregistrer les modifications ? Gui::FileDialog - + Save as Enregistrer sous - - + + Open Ouvrir @@ -5857,12 +5872,12 @@ Voulez enregistrer les modifications ? Gui::FileOptionsDialog - + Extended Étendu - + All files (*.*) Tous les fichiers (*.*) @@ -5990,7 +6005,7 @@ Voulez enregistrer les modifications ? Graphviz format - Graphviz format + Format Graphviz @@ -6033,7 +6048,7 @@ Voulez enregistrer les modifications ? Scroll middle mouse button - Faites défiler le bouton milieu de la souris + Faites rouler la roulette de la souris @@ -6741,7 +6756,7 @@ Voulez vous quitter sans sauvegarder vos données? none - rien + aucun @@ -6808,20 +6823,15 @@ Voulez vous quitter sans sauvegarder vos données? Gui::SelectModule - + Select module Sélectionner le module - + Open %1 as Ouvrir '%1' comme - - - Select - Sélectionner - Gui::StdCmdDescription @@ -6940,7 +6950,7 @@ Do you want to specify another directory? TextLabel - TextLabel + Étiquette de texte @@ -7090,7 +7100,7 @@ Do you want to specify another directory? Press middle mouse button - Appuyer sur la roulette de la souris + Appuyez sur la roulette de la souris @@ -7100,7 +7110,7 @@ Do you want to specify another directory? Scroll middle mouse button - Faites rouler la roulette de la souris + Faites défiler le bouton milieu de la souris @@ -8223,7 +8233,7 @@ Do you want to continue? Trop de notifications non intrusives ouvertes. Des notifications sont omises ! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8232,44 +8242,44 @@ Do you want to continue? - + Are you sure you want to continue? Êtes-vous sûr de vouloir continuer ? - + Please check report view for more... Veuillez consulter la Vue rapport pour plus... - + Physical path: Chemin d'accès physique : - - + + Document: Document : - - + + Path: Chemin d'accès : - + Identical physical path Chemin d'accès physique identique - + Could not save document Impossible d'enregistrer le document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8282,102 +8292,102 @@ Would you like to save the file with a different name? Voulez-vous enregistrer le fichier avec un nom différent ? - - - + + + Saving aborted Sauvegarde abandonnée - + Save dependent files Enregistrer les fichiers dépendants - + The file contains external dependencies. Do you want to save the dependent files, too? Le fichier contient des dépendances externes. Voulez-vous également enregistrer les fichiers dépendants ? - - + + Saving document failed L'enregistrement du document a échoué - + Save document under new filename... Enregistrer le document sous un nouveau nom… - - + + Save %1 Document Enregistrer le document %1 - + Document Document - - + + Failed to save document Échec de l'enregistrement du document - + Documents contains cyclic dependencies. Do you still want to save them? Les documents contiennent des dépendances cycliques. Voulez-vous les enregistrer ? - + Save a copy of the document under new filename... Enregistrer une copie du document avec un nouveau nom... - + %1 document (*.FCStd) Document %1 (*.FCStd) - + Document not closable Impossible de fermer le document - + The document is not closable for the moment. Impossible de fermer le document pour le moment. - + Document not saved Document non enregistré - + The document%1 could not be saved. Do you want to cancel closing it? Le document%1 n'a pas pu être enregistré. Voulez-vous annuler sa fermeture ? - + Undo Annuler - + Redo Rétablir - + There are grouped transactions in the following documents with other preceding transactions Les documents suivants contiennent des opérations groupées avec d'autres opérations précédentes - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8460,12 +8470,12 @@ Veuillez ouvrir une fenêtre de navigateur et saisir : http://localhost:%1.Options... - + Out of memory Mémoire insuffisante - + Not enough memory available to display the data. Mémoire insuffisante pour afficher les données. @@ -8491,7 +8501,7 @@ Veuillez ouvrir une fenêtre de navigateur et saisir : http://localhost:%1.Déplacer l'annotation - + Transform Transformer @@ -8557,14 +8567,14 @@ Veuillez ouvrir une fenêtre de navigateur et saisir : http://localhost:%1.Le %1 n’est pas vide, supprimer son contenu quand même ? - + Translation: Translation : Translation XY: - Translation XY: + Déplacement en XY : @@ -8605,32 +8615,32 @@ Veuillez ouvrir une fenêtre de navigateur et saisir : http://localhost:%1.La création du groupe avec des liens a échoué - + Create link failed La création du lien a échoué - + Failed to create relative link La création du lien relatif a échoué - + Unlink failed La suppression du lien a échoué - + Replace link failed Le remplacement du lien a échoué - + Failed to import links Impossible d'importer les liens - + Failed to import all links Impossible d'importer tous les liens @@ -8779,12 +8789,12 @@ apportée à la copie en cours sera perdue. Color Gradient - Dégradé de couleur + Dégradé de couleurs Color Legend - Légende de couleur + Légende des couleurs @@ -9342,14 +9352,14 @@ apportée à la copie en cours sera perdue. StdCmdGroup - + Create group Créer un groupe - - Create a new group for ordering objects - Créer un nouveau groupe pour ordonner des objets + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9407,13 +9417,13 @@ apportée à la copie en cours sera perdue. StdCmdLinkActions - + Link actions Actions sur les liens - - + + Actions that apply to link objects Actions s’appliquant à des objets lien @@ -9421,12 +9431,12 @@ apportée à la copie en cours sera perdue. StdCmdLinkImport - + Import links Importer des liens - + Import selected external link(s) Importer le ou les liens externes sélectionnés @@ -9434,12 +9444,12 @@ apportée à la copie en cours sera perdue. StdCmdLinkImportAll - + Import all links Importer tous les liens - + Import all links of the active document Importer tous les liens du document actif @@ -9452,9 +9462,9 @@ apportée à la copie en cours sera perdue. Créer un lien - - Create a link to the selected object(s) - Créer un lien vers le ou les objets sélectionnés + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9473,12 +9483,12 @@ apportée à la copie en cours sera perdue. StdCmdLinkMakeRelative - + Make sub-link Créer un sous-lien - + Create a sub-object or sub-element link Créer un sous-objet ou un lien de sous-élément @@ -9486,12 +9496,12 @@ apportée à la copie en cours sera perdue. StdCmdLinkReplace - + Replace with link Remplacer par un lien - + Replace the selected object(s) with link Remplacer le(s) objet(s) sélectionné(s) par un lien @@ -9499,13 +9509,13 @@ apportée à la copie en cours sera perdue. StdCmdLinkSelectActions - + Link navigation Navigation par lien - - + + Link navigation actions Actions de navigation des liens @@ -9513,12 +9523,12 @@ apportée à la copie en cours sera perdue. StdCmdLinkSelectAllLinks - + Select all links Sélectionner tous les liens - + Select all links to the current selected object Sélectionner tous les liens vers l'objet sélectionné actif @@ -9526,12 +9536,12 @@ apportée à la copie en cours sera perdue. StdCmdLinkSelectLinked - + Go to linked object Aller à l'objet lié - + Select the linked object and switch to its owner document Sélectionner l'objet lié et basculer vers son document propriétaire @@ -9539,12 +9549,12 @@ apportée à la copie en cours sera perdue. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Aller à l'objet lié le plus lointain - + Select the deepest linked object and switch to its owner document Sélectionner l'objet lié le plus lointain et basculer vers son document d'origine @@ -9552,12 +9562,12 @@ apportée à la copie en cours sera perdue. StdCmdLinkUnlink - + Unlink Délier - + Strip on level of link Couper au niveau du lien @@ -9651,7 +9661,7 @@ apportée à la copie en cours sera perdue. Measure distance - Mesurer une distance + Mesurer la distance @@ -9665,7 +9675,7 @@ apportée à la copie en cours sera perdue. Measure distance - Mesurer la distance + Mesurer une distance @@ -9779,7 +9789,7 @@ apportée à la copie en cours sera perdue. Loading the file %1 is not supported - Charger le fichier %1 n'est pas pris en charge + Le chargement du fichier %1 n'est pas pris en charge. @@ -9790,9 +9800,11 @@ apportée à la copie en cours sera perdue. Créer une pièce - - Create a new part and make it active - Créer une nouvelle pièce et l'activer + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -9814,7 +9826,7 @@ apportée à la copie en cours sera perdue. Placement... - Positionnement... + Positionner... @@ -10093,48 +10105,20 @@ apportée à la copie en cours sera perdue. Inspecteur de scène - - StdCmdSelBack - - - &Back - Précédent - - - - - Go back to previous selection - Retour à la sélection précédente - - StdCmdSelBoundingBox - + &Bounding box &Boîte englobante - - + + Show selection bounding box Afficher la boîte englobante de la sélection - - StdCmdSelForward - - - &Forward - Suivant - - - - - Repeat the backed selection - Répéter la sélection sauvegardée - - StdCmdSelectAll @@ -10446,13 +10430,13 @@ apportée à la copie en cours sera perdue. StdCmdTreeViewActions - + TreeView actions Vue en arborescence - - + + TreeView behavior options and actions Configurations et options de la vue en arborescence @@ -10994,13 +10978,13 @@ cette dernière fonction s'ouvre. StdRecallWorkingView - + Recall working view Rappeler la vue de travail - - + + Recall previously stored temporary working view Rappeler la vue de travail temporaire précédemment stockée @@ -11008,13 +10992,13 @@ cette dernière fonction s'ouvre. StdStoreWorkingView - + Store working view Stocker la vue de travail - - + + Store a document-specific temporary working view Stocker une vue de travail temporaire spécifique au document @@ -11022,13 +11006,13 @@ cette dernière fonction s'ouvre. StdTreeCollapseDocument - + Collapse/Expand Réduire/développer - - + + Expand active document and collapse all others Développer le document actif et réduire tous les autres @@ -11036,12 +11020,12 @@ cette dernière fonction s'ouvre. StdTreeDrag - + Initiate dragging Commencer un déplacement - + Initiate dragging of current selected tree items Commencer le déplacement des éléments sélectionnés @@ -11049,13 +11033,13 @@ cette dernière fonction s'ouvre. StdTreeMultiDocument - + Multi document Document multiple - - + + Display all documents in the tree view Afficher tous les documents dans l’arborescence @@ -11063,12 +11047,12 @@ cette dernière fonction s'ouvre. StdTreePreSelection - + Pre-selection Pré-sélectionner - + Preselect the object in 3D view when mouse over the tree item Préselectionner l'objet dans la vue 3D quand la souris passe au-dessus d'un élément de l'arborescence @@ -11076,12 +11060,12 @@ cette dernière fonction s'ouvre. StdTreeRecordSelection - + Record selection Enregistrer la sélection - + Record selection in tree view in order to go back/forward using navigation button Sauvegarder la sélection dans l'arborescence pour aller en avant/arrière avec les boutons de navigation @@ -11103,13 +11087,13 @@ cette dernière fonction s'ouvre. StdTreeSingleDocument - + Single document Document unique - - + + Only display the active document in the tree view Afficher uniquement le document actif dans l’arborescence @@ -11117,12 +11101,12 @@ cette dernière fonction s'ouvre. StdTreeSyncPlacement - + Sync placement Synchroniser le positionnement - + Auto adjust placement on drag and drop objects across coordinate systems Ajuster automatiquement le positionnement des objets glissés-déposés dans les différents systèmes de coordonnées @@ -11130,12 +11114,12 @@ cette dernière fonction s'ouvre. StdTreeSyncSelection - + Sync selection Synchroniser la sélection - + Auto expand tree item when the corresponding object is selected in 3D view Déplier automatiquement l'arborescence quand l'objet correspondant est sélectionné dans la vue 3D @@ -11143,12 +11127,12 @@ cette dernière fonction s'ouvre. StdTreeSyncView - + Sync view Synchroniser la vue - + Auto switch to the 3D view containing the selected item Basculer automatiquement vers la vue 3D contenant l'objet sélectionné @@ -11383,7 +11367,7 @@ Voulez-vous enregistrer le document maintenant ? Std_Group - + Group Groupe @@ -12081,12 +12065,12 @@ après le lancement de FreeCAD NaviCubeDraggableCmd - + Movable navigation cube Cube de navigation déplaçable - + Drag and place NaviCube Glisser et placer le NaviCube @@ -12901,7 +12885,7 @@ Vous pouvez désormais utiliser Theme pour une personnalisation complète de l'i Select Edge(s) - Sélectionner un ou des arête(s) + Sélectionner une ou des arête(s) @@ -12933,13 +12917,39 @@ Vous pouvez désormais utiliser Theme pour une personnalisation complète de l'i Export dependency graph... - Export dependency graph... + Exporter le graphique de dépendance... Export the dependency graph to a file - Export the dependency graph to a file + Exporter le graphique de dépendance vers un fichier + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_gl.ts b/src/Gui/Language/FreeCAD_gl.ts index a5d948be90..7f88b99ab4 100644 --- a/src/Gui/Language/FreeCAD_gl.ts +++ b/src/Gui/Language/FreeCAD_gl.ts @@ -137,22 +137,22 @@ Facer un grupo de ligazóns - + Make link Crear ligazón - + Make sub-link Crear unha sub-ligazón - + Import links Importar ligazón - + Import all links Importar todas as ligazóns @@ -167,12 +167,12 @@ Inserir documento de texto - + Add a part Engadir unha peza - + Add a group Engadir un grupo @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Axustes da cámara - + Orientation Orientación - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vista actual @@ -3967,7 +3967,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navegación @@ -4061,35 +4061,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navegación 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. - + Mouse... Rato... - + Navigation settings set Navigation settings set - + Orbit style Estilo orbital - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4100,116 +4125,116 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable Plataforma xiratoria - + Trackball Trackball - + Free Turntable Free Turntable - + Rotation mode Modo de rotación - + Rotations in 3D will use current cursor position as center for rotation Rotations in 3D will use current cursor position as center for rotation - + Window center Centro da fiestra - + Drag at cursor Arrastra o cursor - + Object center Centro do obxecto - + Default camera orientation Default camera orientation - + Default camera orientation when creating a new document or selecting the home view Default camera orientation when creating a new document or selecting the home view - + Camera zoom Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. - + mm mm - + Enable animated rotations Enable animated rotations - + Enable animation Activar animación - + Zoom operations will be performed at position of mouse pointer Zoom operations will be performed at position of mouse pointer - + Zoom at cursor Zoom no cursor - + Zoom step Zoom step - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. - + Direction of zoom operations will be inverted Direction of zoom operations will be inverted - + Invert zoom Inverter Zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4218,67 +4243,57 @@ Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - + Disable touchscreen tilt gesture Desactiva o xesto de inclinación de pantalla táctil - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Isométrica - + Dimetric Dimétrica - + Trimetric Trimétrica - + Top Enriba - + Front Fronte - + Left Esquerda - + Right Dereita - + Rear Traseira - + Bottom Embaixo - + Custom Personalizar @@ -5841,13 +5856,13 @@ Quere gardar os cambios? Gui::FileChooser - - + + Select a file Escolmar un ficheiro - + Select a directory Escolmar un cartafol @@ -5855,13 +5870,13 @@ Quere gardar os cambios? Gui::FileDialog - + Save as Gardar como - - + + Open Abrir @@ -5869,12 +5884,12 @@ Quere gardar os cambios? Gui::FileOptionsDialog - + Extended Estendido - + All files (*.*) Tódolos ficheiros (*.*) @@ -6825,20 +6840,15 @@ Quere saír sen gardar os seus datos? Gui::SelectModule - + Select module Escoller módulo - + Open %1 as Abrir %1 como - - - Select - Escolmar - Gui::StdCmdDescription @@ -8241,7 +8251,7 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8250,44 +8260,44 @@ Do you want to continue? - + Are you sure you want to continue? Are you sure you want to continue? - + Please check report view for more... Please check report view for more... - + Physical path: Physical path: - - + + Document: Document: - - + + Path: Directorio: - + Identical physical path Identical physical path - + Could not save document Non se puido gardar o documento - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8300,102 +8310,102 @@ Would you like to save the file with a different name? Would you like to save the file with a different name? - - - + + + Saving aborted Gardado interrompido - + Save dependent files Save dependent files - + The file contains external dependencies. Do you want to save the dependent files, too? The file contains external dependencies. Do you want to save the dependent files, too? - - + + Saving document failed Fallou o gardado do documento - + Save document under new filename... Gardar documento cun nome de ficheiro novo... - - + + Save %1 Document Gardar o documento %1 - + Document Documento - - + + Failed to save document Failed to save document - + Documents contains cyclic dependencies. Do you still want to save them? Documents contains cyclic dependencies. Do you still want to save them? - + Save a copy of the document under new filename... Gardar unha copia do documento cun novo nome... - + %1 document (*.FCStd) documento %1 (*.FCStd) - + Document not closable O documento non se pode pechar - + The document is not closable for the moment. O documento non se pode pechar neste intre. - + Document not saved O documento non se pode gardar - + The document%1 could not be saved. Do you want to cancel closing it? The document%1 could not be saved. Do you want to cancel closing it? - + Undo Desfacer - + Redo Refacer - + There are grouped transactions in the following documents with other preceding transactions There are grouped transactions in the following documents with other preceding transactions - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8478,12 +8488,12 @@ Por favor, abra un buscador e escriba: http://localhost:%1. Opcións... - + Out of memory Sen memoria - + Not enough memory available to display the data. Non hai memoria dispoñíbel para visualizar os datos. @@ -8509,7 +8519,7 @@ Por favor, abra un buscador e escriba: http://localhost:%1. Mover apuntamento - + Transform Transformar @@ -8575,7 +8585,7 @@ Por favor, abra un buscador e escriba: http://localhost:%1. A %1 non está baleira, eliminar o seu contido, así a todo? - + Translation: Tradución: @@ -8623,32 +8633,32 @@ Por favor, abra un buscador e escriba: http://localhost:%1. Create link group failed - + Create link failed Create link failed - + Failed to create relative link Failed to create relative link - + Unlink failed Unlink failed - + Replace link failed Replace link failed - + Failed to import links Failed to import links - + Failed to import all links Failed to import all links @@ -9360,14 +9370,14 @@ the current copy will be lost. StdCmdGroup - + Create group Crear grupo - - Create a new group for ordering objects - Crear un novo grupo para ordear obxectos + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9425,13 +9435,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Link actions - - + + Actions that apply to link objects Actions that apply to link objects @@ -9439,12 +9449,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Importar ligazón - + Import selected external link(s) Import selected external link(s) @@ -9452,12 +9462,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Importar todas as ligazóns - + Import all links of the active document Import all links of the active document @@ -9470,9 +9480,9 @@ the current copy will be lost. Crear ligazón - - Create a link to the selected object(s) - Create a link to the selected object(s) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9491,12 +9501,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Crear unha sub-ligazón - + Create a sub-object or sub-element link Create a sub-object or sub-element link @@ -9504,12 +9514,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Replace with link - + Replace the selected object(s) with link Replace the selected object(s) with link @@ -9517,13 +9527,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Link navigation - - + + Link navigation actions Link navigation actions @@ -9531,12 +9541,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Select all links - + Select all links to the current selected object Select all links to the current selected object @@ -9544,12 +9554,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Go to linked object - + Select the linked object and switch to its owner document Select the linked object and switch to its owner document @@ -9557,12 +9567,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Go to the deepest linked object - + Select the deepest linked object and switch to its owner document Select the deepest linked object and switch to its owner document @@ -9570,12 +9580,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Desligar - + Strip on level of link Strip on level of link @@ -9808,9 +9818,11 @@ the current copy will be lost. Crear peza - - Create a new part and make it active - Facer unha nova peza e tornala activa + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10111,48 +10123,20 @@ the current copy will be lost. Inspector da escena - - StdCmdSelBack - - - &Back - Volver - - - - - Go back to previous selection - Go back to previous selection - - StdCmdSelBoundingBox - + &Bounding box &Carcasa - - + + Show selection bounding box Show selection bounding box - - StdCmdSelForward - - - &Forward - &Adiante - - - - - Repeat the backed selection - Repeat the backed selection - - StdCmdSelectAll @@ -10464,13 +10448,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Accións de vista en árbore - - + + TreeView behavior options and actions Opcións e accións de comportamento da vista en árbore @@ -11010,13 +10994,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11024,13 +11008,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11038,13 +11022,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Ocultar/Expandir - - + + Expand active document and collapse all others Expandir documento activo e ocultar tódolos demais @@ -11052,12 +11036,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Iniciar o arrastre - + Initiate dragging of current selected tree items Inicia o arrastre dos elementos actuais da árbore escollida @@ -11065,13 +11049,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Múltiple Documento - - + + Display all documents in the tree view Amosar tódolos documentos na vista árbore @@ -11079,12 +11063,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Preselección - + Preselect the object in 3D view when mouse over the tree item Preselect the object in 3D view when mouse over the tree item @@ -11092,12 +11076,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Record selection - + Record selection in tree view in order to go back/forward using navigation button Record selection in tree view in order to go back/forward using navigation button @@ -11119,13 +11103,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Documento Individual - - + + Only display the active document in the tree view Amosa só o documento activo na vista árbore @@ -11133,12 +11117,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Sincronizar a colocación - + Auto adjust placement on drag and drop objects across coordinate systems Auto adjust placement on drag and drop objects across coordinate systems @@ -11146,12 +11130,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Sincronizar selección - + Auto expand tree item when the corresponding object is selected in 3D view Auto expand tree item when the corresponding object is selected in 3D view @@ -11159,12 +11143,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Vista sincronizada - + Auto switch to the 3D view containing the selected item Auto switch to the 3D view containing the selected item @@ -11399,7 +11383,7 @@ Do you want to save the document now? Std_Group - + Group Grupo @@ -12097,12 +12081,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12964,4 +12948,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_hr.ts b/src/Gui/Language/FreeCAD_hr.ts index b5f607fe85..13ee0ab0b1 100644 --- a/src/Gui/Language/FreeCAD_hr.ts +++ b/src/Gui/Language/FreeCAD_hr.ts @@ -137,22 +137,22 @@ Napravi grupu poveznica - + Make link Napravi poveznicu - + Make sub-link Napravi podpoveznicu - + Import links Uvoz poveznica - + Import all links Uvoz svih poveznica @@ -167,12 +167,12 @@ Umetni tekst dokument - + Add a part Dodaj dio - + Add a group Dodaj grupu @@ -779,37 +779,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Postavke kamere - + Orientation Orijentacija - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Trenutni prikaz @@ -3986,7 +3986,7 @@ Možete koristiti i obrazac: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navigacija @@ -4082,13 +4082,38 @@ Možete koristiti i obrazac: John Doe <john@doe.com> Base color for all elements Osnovna boja za sve elemente + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D navigacija - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Navedite konfiguracije gumba miša za svaku odabranu navigacijsku postavku. @@ -4096,22 +4121,22 @@ Odaberite set, a zatim pritisnite gumb za prikaz navedenih konfiguracija. - + Mouse... Miš... - + Navigation settings set Set navigacijskih postavki - + Orbit style Način okretanja - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4122,66 +4147,66 @@ Okretna ploča: dio će se rotirati oko z-osi (s ograničenim osima). Free Turntable: dio će se rotirati oko z-osi. - + Turntable Okretano - + Trackball Prećeno - + Free Turntable Slobodna okretna ploča - + Rotation mode Način rotacije - + Rotations in 3D will use current cursor position as center for rotation Rotacije u 3D upotrebljavat će trenutni položaj pokazivača kao središte rotacije - + Window center Središte prozora - + Drag at cursor Povucite kod pokazivača - + Object center Središte objekta - + Default camera orientation Zadana orijentacija kamere - + Default camera orientation when creating a new document or selecting the home view Zadana orijentacija kamere prilikom izrade novog dokumenta ili odabira zadanog početnog prikaza - + Camera zoom Zumiranje kamere - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Postavlja zumiranje za nove dokumente. @@ -4189,54 +4214,54 @@ Vrijednost je promjer sfere koja će stati na zaslon. - + mm mm - + Enable animated rotations Omogući animirane rotacije - + Enable animation Omogući animacije - + Zoom operations will be performed at position of mouse pointer Operacije zumiranja izvodit će se na položaju pokazivača miša - + Zoom at cursor Približavaj na kursor - + Zoom step Korak zumiranja - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Koliko će se zumirati. Korak zumiranja '1' znači faktor 7,5 za svaki korak zumiranja. - + Direction of zoom operations will be inverted Smjer operacija zumiranja će se obrnuti - + Invert zoom Invertiraj zumiranje - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4245,67 +4270,57 @@ Utječe samo na navigacijski stil gestama. Naginjanje miša nije onemogućeno ovom postavkom. - + Disable touchscreen tilt gesture Onemogući nagib geste zaslona osjetljivog na dodir - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Izometrički - + Dimetric Dvometrički - + Trimetric Trimetrički - + Top Gore - + Front Ispred - + Left Lijevo - + Right Desno - + Rear Iza - + Bottom Ispod - + Custom Prilagođeno @@ -5871,13 +5886,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Odaberite datoteku - + Select a directory Odaberite direktorij @@ -5885,13 +5900,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Spremi kao - - + + Open Otvori @@ -5899,12 +5914,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Produženo - + All files (*.*) Sve datoteke (*.*) @@ -6858,20 +6873,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Odaberite modul - + Open %1 as Otvori %1 kao - - - Select - Odaberite - Gui::StdCmdDescription @@ -8280,7 +8290,7 @@ Do you want to continue? Previše otvorenih nenametljivih obavijesti. Obavijesti se izostavljaju! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8289,46 +8299,46 @@ Do you want to continue? - + Are you sure you want to continue? Jeste li sigurni da želite nastaviti? - + Please check report view for more... Molimo provjerite prikaz izvješća za više ... - + Physical path: Fizički put: - - + + Document: Dokument: - - + + Path: Put: - + Identical physical path Identičan fizički put - + Could not save document Ne mogu spremiti dokument - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8341,105 +8351,105 @@ Would you like to save the file with a different name? Želite li datoteku spremiti pod drugim imenom? - - - + + + Saving aborted Spremanje prekinuto - + Save dependent files Spremite ovisne datoteke - + The file contains external dependencies. Do you want to save the dependent files, too? Datoteka sadrži vanjske ovisnosti. Želite li spremiti i ovisne datoteke? - - + + Saving document failed Spremanje dokumenta nije uspjelo - + Save document under new filename... Spremi dokument pod novim imenom ... - - + + Save %1 Document Spremi %1 dokument - + Document Dokument - - + + Failed to save document Spremanje dokumenta nije uspjelo - + Documents contains cyclic dependencies. Do you still want to save them? Dokumenti sadrže cikličke ovisnosti. Želite li ih još spremiti? - + Save a copy of the document under new filename... Spremanje kopije dokumenta pod novi naziv datoteke... - + %1 document (*.FCStd) %1 dokument (*.FCStd) - + Document not closable Dokument nije moguće zatvoriti - + The document is not closable for the moment. Dokument trenutno nije moguće zatvoriti. - + Document not saved Dokument nije spremljen - + The document%1 could not be saved. Do you want to cancel closing it? Dokument%1 nije bilo moguće spremiti. Želite li otkazati zatvaranje? - + Undo Poništi promjenu - + Redo Vrati - + There are grouped transactions in the following documents with other preceding transactions U sljedećim dokumentima su grupirane transakcije s ostalim prethodnim transakcijama - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8521,12 +8531,12 @@ Please open a browser window and type in: http://localhost:%1. Opcije ... - + Out of memory Bez memorije - + Not enough memory available to display the data. Nema dovoljno dostupne memorije za prikaz podataka. @@ -8552,7 +8562,7 @@ Please open a browser window and type in: http://localhost:%1. Premjesti primjedbu - + Transform Transformiraj @@ -8618,7 +8628,7 @@ Please open a browser window and type in: http://localhost:%1. %1 nije prazan, izbrisati njegov sadržaj? - + Translation: Translacija: @@ -8666,32 +8676,32 @@ Please open a browser window and type in: http://localhost:%1. Stvaranje grupe poveznica nije uspjelo - + Create link failed Stvaranje poveznica nije uspjelo - + Failed to create relative link Stvaranje relativne poveznice nije uspjelo - + Unlink failed Prekid veze nije uspio - + Replace link failed Zamjena poveznice nije uspjela - + Failed to import links Uvoz poveznica nije uspio - + Failed to import all links Uvoz svih poveznica nije uspio @@ -9405,14 +9415,14 @@ trenutnu kopiju će biti izgubljene. StdCmdGroup - + Create group Napravi grupu - - Create a new group for ordering objects - Stvaranje nove grupe za naručivanje predmeta + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9470,13 +9480,13 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkActions - + Link actions Radnje poveznica - - + + Actions that apply to link objects Radnje koje se primenjuju na objekte poveznica @@ -9484,12 +9494,12 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkImport - + Import links Uvoz poveznica - + Import selected external link(s) Uvoz odabranih vanjskih poveznica @@ -9497,12 +9507,12 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkImportAll - + Import all links Uvoz svih poveznica - + Import all links of the active document Uvoz svih poveznica aktivnog dokumenta @@ -9515,9 +9525,9 @@ trenutnu kopiju će biti izgubljene. Napravi poveznicu - - Create a link to the selected object(s) - Stvara poveznicu na odabrani(e) objekt(e) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9536,12 +9546,12 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkMakeRelative - + Make sub-link Napravi podpoveznicu - + Create a sub-object or sub-element link Stvara podobjekt ili podelement poveznicu @@ -9549,12 +9559,12 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkReplace - + Replace with link Zamijenite poveznicom - + Replace the selected object(s) with link Zamijenite odabrani objekt(e) poveznicom @@ -9562,13 +9572,13 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkSelectActions - + Link navigation Link navigacija - - + + Link navigation actions Povežite navigacijske radnje @@ -9576,12 +9586,12 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkSelectAllLinks - + Select all links Odaberite sve poveznice - + Select all links to the current selected object Odaberite sve poveznice na trenutni odabrani objekt @@ -9589,12 +9599,12 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkSelectLinked - + Go to linked object Idite na povezani objekt - + Select the linked object and switch to its owner document Odaberite povezani objekt i prebacite se na njegov vlasnički dokument @@ -9602,12 +9612,12 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Idi do najdubljeg povezanog objekta - + Select the deepest linked object and switch to its owner document Odaberite najdublji povezani objekt i prebacite se na njegov vlasnički dokument @@ -9616,12 +9626,12 @@ trenutnu kopiju će biti izgubljene. StdCmdLinkUnlink - + Unlink Prekini poveznicu - + Strip on level of link Strip na razini veze @@ -9856,9 +9866,11 @@ trenutnu kopiju će biti izgubljene. Stvori dio - - Create a new part and make it active - Stvori novi dio i postavi ga kao aktivan + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10163,48 +10175,20 @@ trenutnu kopiju će biti izgubljene. Pregled scene - - StdCmdSelBack - - - &Back - &Natrag - - - - - Go back to previous selection - Vratite se na prethodni odabir - - StdCmdSelBoundingBox - + &Bounding box &Granični okvir - - + + Show selection bounding box Prikaži odabir Graničnog okvira - - StdCmdSelForward - - - &Forward - &Naprijed - - - - - Repeat the backed selection - Ponovite podržani izbor - - StdCmdSelectAll @@ -10516,13 +10500,13 @@ trenutnu kopiju će biti izgubljene. StdCmdTreeViewActions - + TreeView actions Akcije Stabla pogleda - - + + TreeView behavior options and actions Opcije ponašanja i radnje Stabla pogleda @@ -11064,13 +11048,13 @@ trenutnu kopiju će biti izgubljene. StdRecallWorkingView - + Recall working view Opozovite radni prikaz - - + + Recall previously stored temporary working view Opozovite prethodno pohranjeni privremeni radni prikaz @@ -11078,13 +11062,13 @@ trenutnu kopiju će biti izgubljene. StdStoreWorkingView - + Store working view Spremite radni prikaz - - + + Store a document-specific temporary working view Spremite privremeni radni prikaz specifičan za dokument @@ -11092,13 +11076,13 @@ trenutnu kopiju će biti izgubljene. StdTreeCollapseDocument - + Collapse/Expand Sažimati/Proširiti - - + + Expand active document and collapse all others Proširivanje aktivnog dokumenta a sve druge sažeti @@ -11106,12 +11090,12 @@ trenutnu kopiju će biti izgubljene. StdTreeDrag - + Initiate dragging Pokrenite povlačenjem - + Initiate dragging of current selected tree items Pokrenite povlačenjem odabrane stavke stabla @@ -11119,13 +11103,13 @@ trenutnu kopiju će biti izgubljene. StdTreeMultiDocument - + Multi document Više dokumenata - - + + Display all documents in the tree view Prikaži sve dokumente u pogledu grananja @@ -11133,12 +11117,12 @@ trenutnu kopiju će biti izgubljene. StdTreePreSelection - + Pre-selection Pred odabir - + Preselect the object in 3D view when mouse over the tree item Pred odaberite predmet u 3D prikazu kad mišem pređete preko stavke @@ -11146,12 +11130,12 @@ trenutnu kopiju će biti izgubljene. StdTreeRecordSelection - + Record selection Snimi odabir - + Record selection in tree view in order to go back/forward using navigation button Snimite odabir u prikazu stabla kako biste se kretali nazad/naprijed pomoću navigacijskog gumba @@ -11173,13 +11157,13 @@ trenutnu kopiju će biti izgubljene. StdTreeSingleDocument - + Single document Jedan dokument - - + + Only display the active document in the tree view Prikaži samo aktivni dokument u pogledu grananja @@ -11187,12 +11171,12 @@ trenutnu kopiju će biti izgubljene. StdTreeSyncPlacement - + Sync placement Sinkroniziranje položaja - + Auto adjust placement on drag and drop objects across coordinate systems Automatski prilagodite postavljanje povlačenjem i ispuštanjem objekata diljem koordinatnih sustava @@ -11201,12 +11185,12 @@ trenutnu kopiju će biti izgubljene. StdTreeSyncSelection - + Sync selection Sinkroniziranje odabira - + Auto expand tree item when the corresponding object is selected in 3D view Automatski proširi stavku stabla kad je u 3D prikazu odabran odgovarajući objekt @@ -11215,12 +11199,12 @@ trenutnu kopiju će biti izgubljene. StdTreeSyncView - + Sync view Sinkroniziranje pogleda - + Auto switch to the 3D view containing the selected item Automatski se prebaci na 3D prikaz koji sadrži odabranu stavku @@ -11456,7 +11440,7 @@ Do you want to save the document now? Std_Group - + Group Grupa @@ -12158,12 +12142,12 @@ nakon pokretanja FreeCAD-a NaviCubeDraggableCmd - + Movable navigation cube Pokretna navigacijska kocka - + Drag and place NaviCube Prevuci i postavi Navigacijsku kocku @@ -13038,4 +13022,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_hu.ts b/src/Gui/Language/FreeCAD_hu.ts index 8e33819b71..fb6f73f1c0 100644 --- a/src/Gui/Language/FreeCAD_hu.ts +++ b/src/Gui/Language/FreeCAD_hu.ts @@ -137,22 +137,22 @@ Hivatkozás csoport létrehozása - + Make link Hivatkozás létrehozása - + Make sub-link Alhivatkozás létrehozása - + Import links Hivatkozások importálása - + Import all links Összes hivatkozás importálása @@ -167,12 +167,12 @@ Szöveges dokumentum beszúrása - + Add a part Alkatrész hozzáadása - + Add a group Csoport hozzáadása @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Kamera beállításai - + Orientation Tájolás - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Aktuális nézet @@ -2727,7 +2727,7 @@ Kérem válasszon másik könyvtárat. TextLabel - Szövegcimke + Szövegfelirat @@ -3962,7 +3962,7 @@ Használhatja az űrlapot is: Gipsz Jakab <gipsz@jakab.hu> Gui::Dialog::DlgSettingsNavigation - + Navigation Navigáció @@ -4056,35 +4056,60 @@ Használhatja az űrlapot is: Gipsz Jakab <gipsz@jakab.hu> Base color for all elements Alapszín minden elemnek + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D-s navigáció - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Felsorolja az egérgomb konfigurációját az egyes kijelölt navigációs beállításokhoz. Jelöljön ki egy beállítást, majd nyomja meg a gombot a beállítások megtekintéséhez. - + Mouse... Egér ... - + Navigation settings set A navigációs sáv beállításai mentésre kerültek - + Orbit style Orbit stílus - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4095,116 +4120,116 @@ Forgóasztal: az alkatrészt a z-tengely körül forgatják (korlátozott tengel Szabad forgóasztal: az alkatrész a z tengely körül forog. - + Turntable Fordítótábla - + Trackball Trackball - + Free Turntable Forgóasztal - + Rotation mode Elforgatási mód - + Rotations in 3D will use current cursor position as center for rotation A 3D-ben való elforgatás az aktuális kurzorpozíciót fogja használni forgatási központként - + Window center Az ablak közepére - + Drag at cursor Húzás a kurzornál - + Object center A tárgy központba - + Default camera orientation Szabványos kamerabeállítás - + Default camera orientation when creating a new document or selecting the home view Az új dokumentumok szabványos kamera tájolása vagy az otthoni nézet kiválasztásakor - + Camera zoom Nagyítás a nézeten - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Beállítja az új dokumentumok kameranagyítását. Az érték a képernyőn elférő gömb átmérője. - + mm mm - + Enable animated rotations Animált forgatások aktiválása - + Enable animation Animáció engedélyezése - + Zoom operations will be performed at position of mouse pointer A nagyítási műveleteket az egérmutató helyén hajtják végre - + Zoom at cursor Kurzorra nagyítás - + Zoom step Zoomolási lépték - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Mennyire nagyítson. Az '1' nagyítási lépés minden nagyítási lépésnél 7,5-ös tényezőt jelent. - + Direction of zoom operations will be inverted A nagyítási műveletek iránya megfordul - + Invert zoom Zoomolás megfordítása - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4213,67 +4238,57 @@ Csak a kézmozdulat-navigációs stílusra vonatkozik. Ez a beállítás nem tiltja le az egér megdöntése beállítást. - + Disable touchscreen tilt gesture Érintőképernyős döntés kikapcsolása - - Show the rotation center when dragging. - Forgatási középpont megjelenítése húzáskor. - - - - Enable rotation center indication - Forgatási középpont kijelzés engedélyezése - - - + Isometric Izometrikus - + Dimetric Dimetrikus - + Trimetric Trimetrikus - + Top Felülnézet - + Front Elölnézet - + Left Bal - + Right Jobb oldalnézet - + Rear Hátsó nézet - + Bottom Alsó - + Custom Egyéni @@ -5834,13 +5849,13 @@ El akarja menteni a változásokat? Gui::FileChooser - - + + Select a file Válasszon ki egy fájlt - + Select a directory Válasszon ki egy könyvtárat @@ -5848,13 +5863,13 @@ El akarja menteni a változásokat? Gui::FileDialog - + Save as Mentés másként - - + + Open Megnyit @@ -5862,12 +5877,12 @@ El akarja menteni a változásokat? Gui::FileOptionsDialog - + Extended Kiterjesztett - + All files (*.*) Minden fájl (*.*) @@ -6818,20 +6833,15 @@ Ki szeretne lépni az adatok mentése nélkül? Gui::SelectModule - + Select module Modul választás - + Open %1 as Megnyitás mint %1 - - - Select - Kiválaszt - Gui::StdCmdDescription @@ -6950,7 +6960,7 @@ Meg szeretne adni egy másik könyvtárat? TextLabel - Szövegfelirat + Szövegcimke @@ -8235,7 +8245,7 @@ Folytatni kívánja? Túl sok megnyitott nem zavaró értesítés. Az értesítések elmaradnak! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8244,44 +8254,44 @@ Folytatni kívánja? - + Are you sure you want to continue? Biztosan folytatja? - + Please check report view for more... Kérjük, ellenőrizze a jelentés nézetet továbbiakért... - + Physical path: Fizikai útvonal: - - + + Document: Dokumentum: - - + + Path: Útvonalak: - + Identical physical path Azonos fizikai elérési út - + Could not save document Nem lehet menteni a dokumentumot - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8294,102 +8304,102 @@ Would you like to save the file with a different name? Szeretné menteni a fájlt egy másik névvel? - - - + + + Saving aborted Mentés megszakítva - + Save dependent files Függő fájlok mentése - + The file contains external dependencies. Do you want to save the dependent files, too? A fájl külső függőségeket tartalmaz. Menti a függő fájlokat is? - - + + Saving document failed Dokumentum mentése sikertelen - + Save document under new filename... Dokumentum mentése új fájlnéven... - - + + Save %1 Document A(z) %1 dokumentum mentése - + Document Dokumentum - - + + Failed to save document Nem sikerült menteni a dokumentumot - + Documents contains cyclic dependencies. Do you still want to save them? A dokumentumok ciklikus függőségeket tartalmaznak. Még mindig menteni szeretné? - + Save a copy of the document under new filename... Menti új fájlnév alatt a dokumentum egy másolatát... - + %1 document (*.FCStd) %1 dokumentum (*.FCStd) - + Document not closable A dokumentum nem zárható be - + The document is not closable for the moment. A dokumentum nem zárható be pillanatnyilag. - + Document not saved Dokumentum nincs mentve - + The document%1 could not be saved. Do you want to cancel closing it? A dokumentum%1 nem menthető. Nem szeretné bezárni? - + Undo Visszavonás - + Redo Ismétlés - + There are grouped transactions in the following documents with other preceding transactions A következő dokumentumokban csoportosított tranzakciók vannak más korábbi tranzakciókkal - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8471,12 +8481,12 @@ Nyisson meg egy böngészőt, és írja be: http://localhost:%1. Beállítások... - + Out of memory Kevés a memória - + Not enough memory available to display the data. Nincs elég memória az adatok megjelenítéséhez. @@ -8502,7 +8512,7 @@ Nyisson meg egy böngészőt, és írja be: http://localhost:%1. Lépés leírása - + Transform Átalakítás @@ -8568,7 +8578,7 @@ Nyisson meg egy böngészőt, és írja be: http://localhost:%1. A %1 nem üres, törölheti annak tartalmát is? - + Translation: Fordítás: @@ -8616,32 +8626,32 @@ Nyisson meg egy böngészőt, és írja be: http://localhost:%1. Hivatkozás csoport létrehozása nem sikerült - + Create link failed Hivatkozás létrehozása nem sikerült - + Failed to create relative link Nem sikerült relatív hivatkozást létrehozni - + Unlink failed Hivatkozás leválasztása nem sikerült - + Replace link failed Hivatkozás cseréje nem sikerült - + Failed to import links Hivatkozások importálása sikertelen - + Failed to import all links Összes hivatkozás importálása sikertelen @@ -9353,14 +9363,14 @@ az aktuális példány elveszik. StdCmdGroup - + Create group Csoport létrehozása - - Create a new group for ordering objects - Készítsen egy új csoportot az objektumok rendezéséhez + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9418,13 +9428,13 @@ az aktuális példány elveszik. StdCmdLinkActions - + Link actions Hivatkozás műveletek - - + + Actions that apply to link objects Tárgyak hivatkozására vonatkozó műveletek @@ -9432,12 +9442,12 @@ az aktuális példány elveszik. StdCmdLinkImport - + Import links Hivatkozások importálása - + Import selected external link(s) Kiválasztott külső hivatkozás(ok) importálása @@ -9445,12 +9455,12 @@ az aktuális példány elveszik. StdCmdLinkImportAll - + Import all links Összes hivatkozás importálása - + Import all links of the active document Összes hivatkozás importálása az aktív dokumentumba @@ -9463,9 +9473,9 @@ az aktuális példány elveszik. Hivatkozás létrehozása - - Create a link to the selected object(s) - Hivatkozás létrehozása a kiválasztott objektum(ok)-hoz + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9484,12 +9494,12 @@ az aktuális példány elveszik. StdCmdLinkMakeRelative - + Make sub-link Alhivatkozás létrehozása - + Create a sub-object or sub-element link Alárendelt- tárgy vagy elem hivatkozás létrehozása @@ -9497,12 +9507,12 @@ az aktuális példány elveszik. StdCmdLinkReplace - + Replace with link Csere hivatkozással - + Replace the selected object(s) with link Kiválasztott objektum(ok) cseréje hivatkozással @@ -9510,13 +9520,13 @@ az aktuális példány elveszik. StdCmdLinkSelectActions - + Link navigation Hivatkozás navigálás - - + + Link navigation actions Hivatkozás navigálás műveletek @@ -9524,12 +9534,12 @@ az aktuális példány elveszik. StdCmdLinkSelectAllLinks - + Select all links Összes hivatkozás kijelölése - + Select all links to the current selected object Kiválasztott objektum összes hivatkozásának a kiválasztása @@ -9537,12 +9547,12 @@ az aktuális példány elveszik. StdCmdLinkSelectLinked - + Go to linked object Ugrás a hivatkozott tárgyra - + Select the linked object and switch to its owner document A csatolt tárgy kijelölése és váltás a tulajdonosi dokumentumra @@ -9550,12 +9560,12 @@ az aktuális példány elveszik. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Ugrás a legmélyebben hivatkozott tárgyra - + Select the deepest linked object and switch to its owner document Jelölje ki a legalacsonyabban csatolt tárgyat, és váltson a tulajdonosi dokumentumra @@ -9563,12 +9573,12 @@ az aktuális példány elveszik. StdCmdLinkUnlink - + Unlink Hivatkozás megszüntetése - + Strip on level of link Vágás a csatlakozás szintjén @@ -9801,9 +9811,11 @@ az aktuális példány elveszik. Alkatrész létrehozása - - Create a new part and make it active - Új alkatrész létrehozása és aktívvá tétele + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10104,48 +10116,20 @@ az aktuális példány elveszik. Jelenet ellenőr - - StdCmdSelBack - - - &Back - &Vissza - - - - - Go back to previous selection - Ugrás az előző kijelölésre - - StdCmdSelBoundingBox - + &Bounding box &Határolókeret - - + + Show selection bounding box Kijelölési határolókeret megjelenése - - StdCmdSelForward - - - &Forward - &Előre - - - - - Repeat the backed selection - Biztonságos kijelölés ismétlése - - StdCmdSelectAll @@ -10457,13 +10441,13 @@ az aktuális példány elveszik. StdCmdTreeViewActions - + TreeView actions FaNézet műveletei - - + + TreeView behavior options and actions A FaNézet viselkedés beállításai és műveletei @@ -11003,13 +10987,13 @@ az aktuális példány elveszik. StdRecallWorkingView - + Recall working view Munkanézet visszahívása - - + + Recall previously stored temporary working view Korábban tárolt ideiglenes munkanézet visszahívása @@ -11017,13 +11001,13 @@ az aktuális példány elveszik. StdStoreWorkingView - + Store working view Munkanézet mentése - - + + Store a document-specific temporary working view Dokumentumspecifikus ideiglenes munkanézet tárolása @@ -11031,13 +11015,13 @@ az aktuális példány elveszik. StdTreeCollapseDocument - + Collapse/Expand Összecsukás/kibontás - - + + Expand active document and collapse all others Aktív dokumentum kibontása és az összes többi összecsukása @@ -11045,12 +11029,12 @@ az aktuális példány elveszik. StdTreeDrag - + Initiate dragging Húzás kezdeményezése - + Initiate dragging of current selected tree items Az aktuálisan kijelölt faelemek húzásának kezdeményezése @@ -11058,13 +11042,13 @@ az aktuális példány elveszik. StdTreeMultiDocument - + Multi document Több dokumentum - - + + Display all documents in the tree view Összes dokumentumot a fa nézetben megjeleníteni @@ -11072,12 +11056,12 @@ az aktuális példány elveszik. StdTreePreSelection - + Pre-selection Előválogatás - + Preselect the object in 3D view when mouse over the tree item A tárgy előre kijelölése 3D nézetben, amikor az egér a faelem felett mozog @@ -11085,12 +11069,12 @@ az aktuális példány elveszik. StdTreeRecordSelection - + Record selection Rekordkijelölés - + Record selection in tree view in order to go back/forward using navigation button Kijelölés rögzítése a fa nézetben. Előre/hátra a navigációs gombokkal @@ -11112,13 +11096,13 @@ az aktuális példány elveszik. StdTreeSingleDocument - + Single document Egyetlen dokumentum - - + + Only display the active document in the tree view A fa nézetben csak az aktív dokumentumot jelenítse meg @@ -11126,12 +11110,12 @@ az aktuális példány elveszik. StdTreeSyncPlacement - + Sync placement Elhelyezés szinkronizálása - + Auto adjust placement on drag and drop objects across coordinate systems Tárgyak automatikus beállítása a koordináta-rendszerek között húzni kívánt tárgyakon @@ -11139,12 +11123,12 @@ az aktuális példány elveszik. StdTreeSyncSelection - + Sync selection Kijelölés szinkronizálása - + Auto expand tree item when the corresponding object is selected in 3D view A fa automatikus kibontása, ha a társított tárgy 3D nézetben van kijelölve @@ -11152,12 +11136,12 @@ az aktuális példány elveszik. StdTreeSyncView - + Sync view Nézet szinkronizálása - + Auto switch to the 3D view containing the selected item Automatikus váltás 3D nézetre a kijelölt elemmel @@ -11392,7 +11376,7 @@ Menti most a dokumentumot? Std_Group - + Group Csoport @@ -12090,12 +12074,12 @@ a FreeCAD elindítása után NaviCubeDraggableCmd - + Movable navigation cube Mozgatható navigációs kocka - + Drag and place NaviCube Húzd és helyezd NaviCube @@ -12956,4 +12940,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_id.ts b/src/Gui/Language/FreeCAD_id.ts index 675ffd181d..4b1bf18f89 100644 --- a/src/Gui/Language/FreeCAD_id.ts +++ b/src/Gui/Language/FreeCAD_id.ts @@ -137,22 +137,22 @@ Buat grup tautan - + Make link Buat tautan - + Make sub-link Make sub-link - + Import links Impor tautan - + Import all links Impor semua tautan @@ -167,12 +167,12 @@ Sisipkan teks dokumen - + Add a part Add a part - + Add a group Add a group @@ -778,37 +778,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Setelan kamera - + Orientation Orientasi - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Current view @@ -3962,7 +3962,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navigasi @@ -4056,35 +4056,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navigasi 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. - + Mouse... Mouse... - + Navigation settings set Navigation settings set - + Orbit style Gaya Orbit - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4095,116 +4120,116 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable Turntable - + Trackball Trackball - + Free Turntable Free Turntable - + Rotation mode Rotation mode - + Rotations in 3D will use current cursor position as center for rotation Rotations in 3D will use current cursor position as center for rotation - + Window center Window center - + Drag at cursor Drag at cursor - + Object center Pusat objek - + Default camera orientation Default camera orientation - + Default camera orientation when creating a new document or selecting the home view Default camera orientation when creating a new document or selecting the home view - + Camera zoom Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. - + mm mm - + Enable animated rotations Enable animated rotations - + Enable animation Aktifkan animasi - + Zoom operations will be performed at position of mouse pointer Zoom operations will be performed at position of mouse pointer - + Zoom at cursor Perbesar kursor - + Zoom step Zoom step - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. - + Direction of zoom operations will be inverted Direction of zoom operations will be inverted - + Invert zoom Balikkan zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4213,67 +4238,57 @@ Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - + Disable touchscreen tilt gesture Disable touchscreen tilt gesture - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Isometrik - + Dimetric Dimetrik - + Trimetric Trimetrik - + Top Puncak - + Front Depan - + Left Kiri - + Right Kanan - + Rear Belakang - + Bottom Bawah - + Custom Adat @@ -5831,13 +5846,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Pilih berkas - + Select a directory Pilih sebuah direktori @@ -5845,13 +5860,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Simpan sebagai - - + + Open Buka @@ -5859,12 +5874,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Diperpanjang - + All files (*.*) Semua data (*.*) @@ -6809,20 +6824,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Pilih modul - + Open %1 as Buka % 1 sebagai - - - Select - Memilih - Gui::StdCmdDescription @@ -8221,7 +8231,7 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8230,44 +8240,44 @@ Do you want to continue? - + Are you sure you want to continue? Apakah yakin ingin melanjutkan? - + Please check report view for more... Please check report view for more... - + Physical path: Physical path: - - + + Document: Document: - - + + Path: Jalan: - + Identical physical path Identical physical path - + Could not save document Could not save document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8280,102 +8290,102 @@ Would you like to save the file with a different name? Would you like to save the file with a different name? - - - + + + Saving aborted Menyimpan dibatalkan - + Save dependent files Save dependent files - + The file contains external dependencies. Do you want to save the dependent files, too? The file contains external dependencies. Do you want to save the dependent files, too? - - + + Saving document failed Menyimpan dokumen gagal - + Save document under new filename... Simpan dokumen dengan nama file baru... - - + + Save %1 Document Simpan % 1 Dokumen - + Document Dokumen - - + + Failed to save document Gagal menyimpan dokumen - + Documents contains cyclic dependencies. Do you still want to save them? Documents contains cyclic dependencies. Do you still want to save them? - + Save a copy of the document under new filename... Simpan salinan dokumen di bawah nama file baru... - + %1 document (*.FCStd) % 1 dokumen (*.FCStd) - + Document not closable Dokumen tidak bisa ditutup - + The document is not closable for the moment. Dokumen ini tidak bisa ditutup untuk saat ini. - + Document not saved Document not saved - + The document%1 could not be saved. Do you want to cancel closing it? The document%1 could not be saved. Do you want to cancel closing it? - + Undo Urung - + Redo Redo - + There are grouped transactions in the following documents with other preceding transactions There are grouped transactions in the following documents with other preceding transactions - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8456,12 +8466,12 @@ Please open a browser window and type in: http://localhost:%1. Pilihan... - + Out of memory Kehabisan memori - + Not enough memory available to display the data. Memori tidak cukup tersedia untuk menampilkan data. @@ -8487,7 +8497,7 @@ Please open a browser window and type in: http://localhost:%1. Pindahkan anotasi - + Transform Transform @@ -8553,7 +8563,7 @@ Please open a browser window and type in: http://localhost:%1. The % 1 tidak kosong, menghapus isinya juga? - + Translation: Terjemahan: @@ -8601,32 +8611,32 @@ Please open a browser window and type in: http://localhost:%1. Create link group failed - + Create link failed Create link failed - + Failed to create relative link Failed to create relative link - + Unlink failed Unlink failed - + Replace link failed Gagal mengganti tautan - + Failed to import links Gagal mengimpor tautan - + Failed to import all links Gagal mengimpor semua tautan @@ -9338,14 +9348,14 @@ the current copy will be lost. StdCmdGroup - + Create group Membuat grup - - Create a new group for ordering objects - Buat grup baru untuk memesan objek + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9403,13 +9413,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Link actions - - + + Actions that apply to link objects Actions that apply to link objects @@ -9417,12 +9427,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Impor tautan - + Import selected external link(s) Import selected external link(s) @@ -9430,12 +9440,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Impor semua tautan - + Import all links of the active document Import all links of the active document @@ -9448,9 +9458,9 @@ the current copy will be lost. Buat tautan - - Create a link to the selected object(s) - Create a link to the selected object(s) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9469,12 +9479,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Make sub-link - + Create a sub-object or sub-element link Create a sub-object or sub-element link @@ -9482,12 +9492,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Replace with link - + Replace the selected object(s) with link Replace the selected object(s) with link @@ -9495,13 +9505,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Link navigation - - + + Link navigation actions Link navigation actions @@ -9509,12 +9519,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Select all links - + Select all links to the current selected object Select all links to the current selected object @@ -9522,12 +9532,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Go to linked object - + Select the linked object and switch to its owner document Select the linked object and switch to its owner document @@ -9535,12 +9545,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Go to the deepest linked object - + Select the deepest linked object and switch to its owner document Select the deepest linked object and switch to its owner document @@ -9548,12 +9558,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Awataut - + Strip on level of link Strip on level of link @@ -9786,9 +9796,11 @@ the current copy will be lost. Create part - - Create a new part and make it active - Buat bagian baru dan membuatnya aktif + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10089,48 +10101,20 @@ the current copy will be lost. Inspektur pemandangan - - StdCmdSelBack - - - &Back - &Back - - - - - Go back to previous selection - Go back to previous selection - - StdCmdSelBoundingBox - + &Bounding box &Bounding box - - + + Show selection bounding box Show selection bounding box - - StdCmdSelForward - - - &Forward - &Forward - - - - - Repeat the backed selection - Repeat the backed selection - - StdCmdSelectAll @@ -10442,13 +10426,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions TreeView actions - - + + TreeView behavior options and actions TreeView behavior options and actions @@ -10988,13 +10972,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11002,13 +10986,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11016,13 +11000,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Ciutkan/Perluas - - + + Expand active document and collapse all others Perluas dokumen aktif dan ciutkan yang lainnya @@ -11030,12 +11014,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Initiate dragging - + Initiate dragging of current selected tree items Initiate dragging of current selected tree items @@ -11043,13 +11027,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Multi document - - + + Display all documents in the tree view Display all documents in the tree view @@ -11057,12 +11041,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Pre-selection - + Preselect the object in 3D view when mouse over the tree item Preselect the object in 3D view when mouse over the tree item @@ -11070,12 +11054,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Record selection - + Record selection in tree view in order to go back/forward using navigation button Record selection in tree view in order to go back/forward using navigation button @@ -11097,13 +11081,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Dokumen tunggal - - + + Only display the active document in the tree view Only display the active document in the tree view @@ -11111,12 +11095,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Selaraskan penempatan - + Auto adjust placement on drag and drop objects across coordinate systems Auto adjust placement on drag and drop objects across coordinate systems @@ -11124,12 +11108,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Sync selection - + Auto expand tree item when the corresponding object is selected in 3D view Auto expand tree item when the corresponding object is selected in 3D view @@ -11137,12 +11121,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Sync view - + Auto switch to the 3D view containing the selected item Auto switch to the 3D view containing the selected item @@ -11377,7 +11361,7 @@ Do you want to save the document now? Std_Group - + Group Kelompok @@ -12075,12 +12059,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12942,4 +12926,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_it.ts b/src/Gui/Language/FreeCAD_it.ts index 251700b3c1..9a2d9d6fdb 100644 --- a/src/Gui/Language/FreeCAD_it.ts +++ b/src/Gui/Language/FreeCAD_it.ts @@ -137,22 +137,22 @@ Crea un gruppo di link - + Make link Crea un link - + Make sub-link Crea un link relativo - + Import links Importa un link - + Import all links Importa tutti i link @@ -167,12 +167,12 @@ Inserimento documento di testo - + Add a part Aggiungi parte - + Add a group Aggiungi gruppo @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Impostazioni telecamera - + Orientation Orientamento - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vista corrente @@ -3963,7 +3963,7 @@ Si può anche utilizzare il modulo: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navigazione @@ -4057,35 +4057,60 @@ Si può anche utilizzare il modulo: John Doe <john@doe.com> Base color for all elements Colore di base per tutti gli elementi + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navigazione 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Elenca le configurazioni dei pulsanti del mouse per ogni impostazione di navigazione selezionata. Seleziona un set e poi premi il pulsante per visualizzare le configurazioni indicate. - + Mouse... Mouse... - + Navigation settings set Impostazioni di navigazione - + Orbit style Stile orbita - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4096,116 +4121,116 @@ Giradischi: la parte sarà ruotata attorno all'asse z (con assi vincolati). Giradischi Libero: la parte sarà ruotata attorno all'asse z. - + Turntable Piatto - + Trackball Trackball - + Free Turntable Piatto Libero - + Rotation mode Modalità rotazione - + Rotations in 3D will use current cursor position as center for rotation Le rotazioni in 3D utilizzeranno la posizione corrente del cursore come centro per la rotazione - + Window center Centro finestra - + Drag at cursor Trascina al cursore - + Object center Centro oggetto - + Default camera orientation Orientamento predefinito della camera - + Default camera orientation when creating a new document or selecting the home view Orientamento predefinito della fotocamera quando si crea un nuovo documento o si seleziona la vista iniziale - + Camera zoom Zoom fotocamera - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Imposta lo zoom della fotocamera per i nuovi documenti. Il valore è il diametro della sfera da adattare allo schermo. - + mm mm - + Enable animated rotations Abilita le rotazioni animate - + Enable animation Abilita animazione - + Zoom operations will be performed at position of mouse pointer Le operazioni di zoom verranno eseguite sulla posizione del puntatore del mouse - + Zoom at cursor Ingrandimento al cursore - + Zoom step Fattore di zoom - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Quanto verrà ingrandito. Il passo di zoom di '1' significa un fattore di 7.5 per ogni fase di zoom. - + Direction of zoom operations will be inverted La direzione delle operazioni di zoom verrà invertita - + Invert zoom Inverti lo zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4214,67 +4239,57 @@ Interessa solo lo stile gesture. Questa impostazione non disabilitata l'inclinazione tramite mouse. - + Disable touchscreen tilt gesture Disattiva l'inclinazione dai gesti del touch screen - - Show the rotation center when dragging. - Mostra il centro di rotazione durante il trascinamento. - - - - Enable rotation center indication - Abilita indicazione centro di rotazione - - - + Isometric Isometrica - + Dimetric Dimetrica - + Trimetric Trimetrica - + Top Dall'alto - + Front Di fronte - + Left Da sinistra - + Right Da destra - + Rear Da dietro - + Bottom Dal basso - + Custom Personalizza @@ -5835,13 +5850,13 @@ Si desidera salvare le modifiche? Gui::FileChooser - - + + Select a file Seleziona un file - + Select a directory Seleziona una cartella @@ -5849,13 +5864,13 @@ Si desidera salvare le modifiche? Gui::FileDialog - + Save as Salva con nome - - + + Open Apri @@ -5863,12 +5878,12 @@ Si desidera salvare le modifiche? Gui::FileOptionsDialog - + Extended Esteso - + All files (*.*) Tutti i file (*.*) @@ -6816,20 +6831,15 @@ Vuoi uscire senza salvare i tuoi dati? Gui::SelectModule - + Select module Seleziona il modulo - + Open %1 as Apri %1 come - - - Select - Seleziona - Gui::StdCmdDescription @@ -8235,7 +8245,7 @@ Vuoi continuare? Troppe notifiche aperte non invasive. Le notifiche sono state omesse! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8244,44 +8254,44 @@ Vuoi continuare? - + Are you sure you want to continue? Sei sicuro di voler continuare? - + Please check report view for more... Per favore controlla la visualizzazione dei report per saperne di più... - + Physical path: Percorso fisico: - - + + Document: Documento: - - + + Path: Percorso: - + Identical physical path Percorso fisico identico - + Could not save document Impossibile salvare il documento - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8294,102 +8304,102 @@ Would you like to save the file with a different name? Vuoi salvare il file con un nome diverso? - - - + + + Saving aborted Salvataggio annullato - + Save dependent files Salva i file dipendenti - + The file contains external dependencies. Do you want to save the dependent files, too? Il file contiene delle dipendenze esterne. Salvare anche i file dipendenti? - - + + Saving document failed Salvataggio del documento non riuscito - + Save document under new filename... Salva il documento con nome... - - + + Save %1 Document Salva il documento %1 - + Document Documento - - + + Failed to save document Impossibile salvare il documento - + Documents contains cyclic dependencies. Do you still want to save them? I documenti contengono delle dipendenze cicliche. Volete ancora salvarli? - + Save a copy of the document under new filename... Salvare una copia del documento con un nuovo nome di file... - + %1 document (*.FCStd) Documento %1 (*.FCStd) - + Document not closable Impossibile chiudere il documento - + The document is not closable for the moment. Impossibile chiudere il documento al momento. - + Document not saved Documento non salvato - + The document%1 could not be saved. Do you want to cancel closing it? Il documento %1 non può essere salvato. Vuoi annullare la chiusura? - + Undo Annulla - + Redo Ripristina - + There are grouped transactions in the following documents with other preceding transactions Nei seguenti documenti ci sono transazioni raggruppate con altre transazioni precedenti - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8472,12 +8482,12 @@ Aprire una finestra browser e scrivere http://localhost:%1. Opzioni... - + Out of memory Memoria insufficiente - + Not enough memory available to display the data. Memoria disponibile insufficiente per visualizzare i dati. @@ -8503,7 +8513,7 @@ Aprire una finestra browser e scrivere http://localhost:%1. Sposta annotazione - + Transform Trasforma @@ -8569,7 +8579,7 @@ Aprire una finestra browser e scrivere http://localhost:%1. Il %1 non è vuoto, eliminare anche il suo contenuto? - + Translation: Traslazione: @@ -8617,32 +8627,32 @@ Aprire una finestra browser e scrivere http://localhost:%1. Creazione del gruppo di link fallita - + Create link failed Creazione del link fallita - + Failed to create relative link Impossibile creare il link relativo - + Unlink failed Scollegamento non riuscito - + Replace link failed Sostituzione del link fallita - + Failed to import links Impossibile importare i link - + Failed to import all links Impossibile importare tutti i link @@ -9354,14 +9364,14 @@ la copia corrente andranno perse. StdCmdGroup - + Create group Crea gruppo - - Create a new group for ordering objects - Crea un nuovo gruppo per ordinare oggetti + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9419,13 +9429,13 @@ la copia corrente andranno perse. StdCmdLinkActions - + Link actions Azioni link - - + + Actions that apply to link objects Azioni che si applicano agli oggetti collegati @@ -9433,12 +9443,12 @@ la copia corrente andranno perse. StdCmdLinkImport - + Import links Importa un link - + Import selected external link(s) Importa i link esterni selezionati @@ -9446,12 +9456,12 @@ la copia corrente andranno perse. StdCmdLinkImportAll - + Import all links Importa tutti i link - + Import all links of the active document Importa tutti i link del documento attivo @@ -9464,9 +9474,9 @@ la copia corrente andranno perse. Crea un link - - Create a link to the selected object(s) - Crea un link agli oggetti selezionati + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9485,12 +9495,12 @@ la copia corrente andranno perse. StdCmdLinkMakeRelative - + Make sub-link Crea un link relativo - + Create a sub-object or sub-element link Crea un sotto-oggetto o un link al sotto-elemento @@ -9498,12 +9508,12 @@ la copia corrente andranno perse. StdCmdLinkReplace - + Replace with link Sostituisci con il link - + Replace the selected object(s) with link Sostituisce gli oggetti selezionati con un link @@ -9511,13 +9521,13 @@ la copia corrente andranno perse. StdCmdLinkSelectActions - + Link navigation Navigazione dei link - - + + Link navigation actions Azioni di navigazione dei link @@ -9525,12 +9535,12 @@ la copia corrente andranno perse. StdCmdLinkSelectAllLinks - + Select all links Seleziona tutti i link - + Select all links to the current selected object Seleziona tutti i link all'oggetto selezionato corrente @@ -9538,12 +9548,12 @@ la copia corrente andranno perse. StdCmdLinkSelectLinked - + Go to linked object Vai all'oggetto collegato - + Select the linked object and switch to its owner document Seleziona l'oggetto collegato e passa al relativo documento proprietario @@ -9551,12 +9561,12 @@ la copia corrente andranno perse. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Vai all'oggetto collegato più profondo - + Select the deepest linked object and switch to its owner document Seleziona l'oggetto collegato più profondo e passa al suo documento proprietario @@ -9564,12 +9574,12 @@ la copia corrente andranno perse. StdCmdLinkUnlink - + Unlink Annulla il link - + Strip on level of link Elimina il link e lo sostituisce con l'oggetto @@ -9802,9 +9812,11 @@ la copia corrente andranno perse. Crea una parte - - Create a new part and make it active - Crea una nuova parte e la rende attiva + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10105,48 +10117,20 @@ la copia corrente andranno perse. Ispettore di scena - - StdCmdSelBack - - - &Back - &Indietro - - - - - Go back to previous selection - Torna alla selezione precedente - - StdCmdSelBoundingBox - + &Bounding box &Box contenitore - - + + Show selection bounding box Mostra il contenitore di delimitazione della selezione - - StdCmdSelForward - - - &Forward - &Avanti - - - - - Repeat the backed selection - Ripeti la selezione precedente - - StdCmdSelectAll @@ -10458,13 +10442,13 @@ la copia corrente andranno perse. StdCmdTreeViewActions - + TreeView actions Azioni della vista ad albero - - + + TreeView behavior options and actions Opzioni e azioni della Vista ad albero @@ -11004,13 +10988,13 @@ la copia corrente andranno perse. StdRecallWorkingView - + Recall working view Richiama vista di lavoro - - + + Recall previously stored temporary working view Richiama la vista di lavoro temporanea precedentemente memorizzata @@ -11018,13 +11002,13 @@ la copia corrente andranno perse. StdStoreWorkingView - + Store working view Memorizza vista di lavoro - - + + Store a document-specific temporary working view Memorizza una vista di lavoro temporanea specifica al documento @@ -11032,13 +11016,13 @@ la copia corrente andranno perse. StdTreeCollapseDocument - + Collapse/Expand Comprimi/Espandi - - + + Expand active document and collapse all others Espandi il documento attivo e comprimi tutti gli altri @@ -11046,12 +11030,12 @@ la copia corrente andranno perse. StdTreeDrag - + Initiate dragging Avvia il trascinamento - + Initiate dragging of current selected tree items Avvia il trascinamento degli elementi dell'albero selezionato @@ -11059,13 +11043,13 @@ la copia corrente andranno perse. StdTreeMultiDocument - + Multi document Multi documento - - + + Display all documents in the tree view Visualizza tutti i documenti nella struttura ad albero @@ -11073,12 +11057,12 @@ la copia corrente andranno perse. StdTreePreSelection - + Pre-selection Pre-selezione - + Preselect the object in 3D view when mouse over the tree item Preseleziona l'oggetto nella vista 3D quando il mouse sopra l'elemento ad albero @@ -11086,12 +11070,12 @@ la copia corrente andranno perse. StdTreeRecordSelection - + Record selection Registra la selezione - + Record selection in tree view in order to go back/forward using navigation button Registra la selezione nella vista ad albero per andare indietro/avanti usando il pulsante di navigazione @@ -11113,13 +11097,13 @@ la copia corrente andranno perse. StdTreeSingleDocument - + Single document Documento singolo - - + + Only display the active document in the tree view Visualizza solo il documento attivo nella struttura ad albero @@ -11127,12 +11111,12 @@ la copia corrente andranno perse. StdTreeSyncPlacement - + Sync placement Sincronizza la posizione - + Auto adjust placement on drag and drop objects across coordinate systems Regola automaticamente il posizionamento degli oggetti trascinandoli tra i sistemi di coordinate @@ -11140,12 +11124,12 @@ la copia corrente andranno perse. StdTreeSyncSelection - + Sync selection Sincronizza la selezione - + Auto expand tree item when the corresponding object is selected in 3D view Espande automaticamente la struttura quando l'oggetto corrispondente viene selezionato nella vista 3D @@ -11153,12 +11137,12 @@ la copia corrente andranno perse. StdTreeSyncView - + Sync view Sincronizza la vista - + Auto switch to the 3D view containing the selected item Passa automaticamente alla vista 3D contenente l'elemento selezionato @@ -11393,7 +11377,7 @@ Vuoi salvare il documento ora? Std_Group - + Group Gruppo @@ -12091,12 +12075,12 @@ dopo l'avvio di FreeCAD NaviCubeDraggableCmd - + Movable navigation cube Cubo di navigazione mobile - + Drag and place NaviCube Trascina e posiziona il Cubo di navigazione @@ -12958,4 +12942,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_ja.ts b/src/Gui/Language/FreeCAD_ja.ts index c5855048b9..1caacbc9eb 100644 --- a/src/Gui/Language/FreeCAD_ja.ts +++ b/src/Gui/Language/FreeCAD_ja.ts @@ -137,22 +137,22 @@ リンクグループを作成 - + Make link リンクを作成 - + Make sub-link サブリンクを作成 - + Import links リンクをインポート - + Import all links 全てのリンクをインポート @@ -167,12 +167,12 @@ テキストドキュメントを挿入 - + Add a part パーツを追加 - + Add a group グループを追加 @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings カメラ設定 - + Orientation 向き - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view 現在のビュー @@ -3941,7 +3941,7 @@ John Doe <john@doe.com> 形式を使用することもできます。Gui::Dialog::DlgSettingsNavigation - + Navigation ナビゲーション @@ -4035,35 +4035,60 @@ John Doe <john@doe.com> 形式を使用することもできます。Base color for all elements すべての要素の基本色 + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3Dナビゲーション - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. 選択したナビゲーション設定ごとにマウスボタン設定をリスト表示。 設定を選択し、ボタンを押すとその設定が表示されます。 - + Mouse... マウス... - + Navigation settings set ナビゲーション設定 - + Orbit style 軌道スタイル - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4074,183 +4099,173 @@ Free Turntable: the part will be rotated around the z-axis. フリーターンテーブル: Z軸周りにオブジェクトを回転 - + Turntable ターンテーブル - + Trackball トラックボール - + Free Turntable フリーターンテーブル - + Rotation mode 回転モード - + Rotations in 3D will use current cursor position as center for rotation 3D回転では現在のカーソル位置が回転中心として使用されます。 - + Window center ウィンドウの中央 - + Drag at cursor カーソル位置にドラッグ - + Object center オブジェクトの中央 - + Default camera orientation デフォルトのカメラの向き - + Default camera orientation when creating a new document or selecting the home view 新しいドキュメントを作成、またはホームビューを選択した場合のデフォルトのカメラの向き - + Camera zoom カメラのズーム - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. 新しいドキュメントのカメラズームを設定。 値は画面にちょうど収まる球の直径。 - + mm mm - + Enable animated rotations アニメーション回転を有効 - + Enable animation アニメーションを有効 - + Zoom operations will be performed at position of mouse pointer ズーム操作はマウスポインタの位置で実行されます - + Zoom at cursor カーソルの位置にズーム - + Zoom step ズーム量 - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. どの程度ズームを行うか。 ズーム量「1」はズーム 1 段階ごとに 7.5 倍することを意味します。 - + Direction of zoom operations will be inverted ズーム操作の方向を反転 - + Invert zoom ズームを反転 - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. ピンチズーム時のビューのチルトを防ぎます。ジェスチャーナビゲーションスタイルに対してのみ有効です。この設定ではマウスでのチルトは無効化されません。 - + Disable touchscreen tilt gesture タッチスクリーンのチルトジェスチャーを無効化 - - Show the rotation center when dragging. - ドラッグ時に回転中心を表示します。 - - - - Enable rotation center indication - 回転中心の表示を有効 - - - + Isometric アイソメトリック - + Dimetric ダイメトリック - + Trimetric 不等角投影図法 - + Top 上面図 - + Front 正面図 - + Left 左面図 - + Right 右面図 - + Rear 背面図 - + Bottom 底面 - + Custom カスタム @@ -5810,13 +5825,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file ファイルを選択してください - + Select a directory ディレクトリを選択 @@ -5824,13 +5839,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as 名前を付けて保存 - - + + Open 開く @@ -5838,12 +5853,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended 拡張 - + All files (*.*) 全てのファイル (*.*) @@ -6788,20 +6803,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module モジュールを選択します。 - + Open %1 as %1 を開く - - - Select - 選択 - Gui::StdCmdDescription @@ -6891,7 +6901,7 @@ Do you want to specify another directory? Position - 位置 + Position @@ -8206,7 +8216,7 @@ Do you want to continue? 非割り込み通知が大量にあります。通知は省略されています！ - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8215,44 +8225,44 @@ Do you want to continue? - + Are you sure you want to continue? 本当に続行しますか？ - + Please check report view for more... 詳細はレポートビューを確認してください... - + Physical path: 物理パス: - - + + Document: ドキュメント: - - + + Path: パス: - + Identical physical path 同一の物理パス - + Could not save document ドキュメントを保存できませんでした - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8265,102 +8275,102 @@ Would you like to save the file with a different name? 別名のファイルとして保存しますか? - - - + + + Saving aborted 保存は中断されました - + Save dependent files 依存ファイルを保存 - + The file contains external dependencies. Do you want to save the dependent files, too? このファイルには外部依存関係が含まれています。依存ファイルも保存しますか? - - + + Saving document failed ドキュメントを保存できませんでした - + Save document under new filename... ドキュメントに新しいファイル名を付けて保存 - - + + Save %1 Document %1 のドキュメントを保存します。 - + Document ドキュメント - - + + Failed to save document ドキュメントの保存に失敗 - + Documents contains cyclic dependencies. Do you still want to save them? ドキュメントに循環する依存関係が含まれています。保存の続行を続けますか? - + Save a copy of the document under new filename... 新しいファイル名でドキュメントのコピーを保存... - + %1 document (*.FCStd) %1 のドキュメント (*.FCStd) - + Document not closable 閉じられないドキュメント - + The document is not closable for the moment. 今閉じることができないドキュメント - + Document not saved ドキュメントが保存されていません - + The document%1 could not be saved. Do you want to cancel closing it? ドキュメント%1 を保存できませんでした。閉じることをキャンセルしますか？ - + Undo 元に戻す - + Redo やり直す - + There are grouped transactions in the following documents with other preceding transactions 以下のドキュメントには先行する他のトランザクションとグループ化されたトランザクショが含まれています。 - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8442,12 +8452,12 @@ Please open a browser window and type in: http://localhost:%1. オプション... - + Out of memory メモリ不足 - + Not enough memory available to display the data. データを表示するのに十分なメモリがありません。 @@ -8473,7 +8483,7 @@ Please open a browser window and type in: http://localhost:%1. 注釈を移動 - + Transform 変換 @@ -8539,7 +8549,7 @@ Please open a browser window and type in: http://localhost:%1. %1は空ではありません。コンテンツごと削除しますか？ - + Translation: 平行移動量: @@ -8587,32 +8597,32 @@ Please open a browser window and type in: http://localhost:%1. リンクグループの作成に失敗しました。 - + Create link failed リンクグループの作成 - + Failed to create relative link 相対リンクの作成に失敗 - + Unlink failed リンク解除に失敗 - + Replace link failed リンクの置き換えに失敗 - + Failed to import links リンクのインポートに失敗 - + Failed to import all links すべてのリンクのインポートに失敗 @@ -9319,14 +9329,14 @@ the current copy will be lost. StdCmdGroup - + Create group グループの作成 - - Create a new group for ordering objects - 並べられたオブジェクトに対して新しいグループを作成 + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9384,13 +9394,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions リンクアクション - - + + Actions that apply to link objects リンクオブジェクトに適用するアクション @@ -9398,12 +9408,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links リンクをインポート - + Import selected external link(s) 選択した（複数の）外部リンクをインポート @@ -9411,12 +9421,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links 全てのリンクをインポート - + Import all links of the active document アクティブなドキュメントのすべてのリンクをインポート @@ -9429,9 +9439,9 @@ the current copy will be lost. リンクを作成 - - Create a link to the selected object(s) - 選択したオブジェクトへのリンクを作成 + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9450,12 +9460,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link サブリンクを作成 - + Create a sub-object or sub-element link サブオブジェクトまたはサブ要素リンクを作成 @@ -9463,12 +9473,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link リンクで置換 - + Replace the selected object(s) with link 選択したオブジェクトをリンクに置き換え @@ -9476,13 +9486,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation リンクのナビゲーション - - + + Link navigation actions リンク・ナビゲーション・アクション @@ -9490,12 +9500,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links すべてのリンクを選択 - + Select all links to the current selected object 現在選択されているオブジェクトへの全てのリンクを選択します @@ -9503,12 +9513,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object リンクされたオブジェクトへ移動 - + Select the linked object and switch to its owner document リンクされたオブジェクトを選択し、それを含むドキュメントに切り替え @@ -9516,12 +9526,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object 最も深いリンクされたオブジェクトへ移動 - + Select the deepest linked object and switch to its owner document 最も深いリンクされたオブジェクトを選択し、それを含むドキュメントに切り替え @@ -9529,12 +9539,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink リンクを解除 - + Strip on level of link リンクのレベルを除去 @@ -9767,9 +9777,11 @@ the current copy will be lost. パーツを作成 - - Create a new part and make it active - 新しいパーツを作成しアクティブ化 + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10070,48 +10082,20 @@ the current copy will be lost. シーンインスペクター - - StdCmdSelBack - - - &Back - 戻る(&B) - - - - - Go back to previous selection - 前の選択に戻る - - StdCmdSelBoundingBox - + &Bounding box バウンディングボックス(&B) - - + + Show selection bounding box 選択バウンディングボックスを表示 - - StdCmdSelForward - - - &Forward - 進む(&F) - - - - - Repeat the backed selection - バックアップされた選択を繰り返し - - StdCmdSelectAll @@ -10423,13 +10407,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions ツリービューアクション - - + + TreeView behavior options and actions ツリービューの動作設定と振る舞い @@ -10969,13 +10953,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view 作業ビューを復元 - - + + Recall previously stored temporary working view 以前に保存された一時的な作業ビューを復元 @@ -10983,13 +10967,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view 作業ビューを保存 - - + + Store a document-specific temporary working view ドキュメント固有の一時的な作業ビューを保存 @@ -10997,13 +10981,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand 折りたたみ/展開 - - + + Expand active document and collapse all others アクティブなドキュメントを展開し、他の全てを折りたたむ @@ -11011,12 +10995,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging ドラッグの開始 - + Initiate dragging of current selected tree items 現在選択されているツリー項目のドラッグを開始 @@ -11024,13 +11008,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document マルチドキュメント - - + + Display all documents in the tree view 全てのドキュメントをツリービューに表示 @@ -11038,12 +11022,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection 事前選択 - + Preselect the object in 3D view when mouse over the tree item ツリーアイテムの上をマウスが通過した時に 3D ビューでオブジェクトを事前選択 @@ -11051,12 +11035,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection 選択の記録 - + Record selection in tree view in order to go back/forward using navigation button ナビゲーションボタンを使用した戻る/進むの動作のためにツリー ビューでの選択を記録 @@ -11078,13 +11062,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document シングルドキュメント - - + + Only display the active document in the tree view アクティブなドキュメントのみをツリービューに表示 @@ -11092,12 +11076,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement 配置の同期 - + Auto adjust placement on drag and drop objects across coordinate systems 座標系間でのオブジェクトのドラッグ&ドロップ時に配置を自動調整 @@ -11105,12 +11089,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection 選択の同期 - + Auto expand tree item when the corresponding object is selected in 3D view 対応するオブジェクトが3Dビューで選択された場合にツリーアイテムを自動的に展開 @@ -11118,12 +11102,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view ビューの同期 - + Auto switch to the 3D view containing the selected item 選択したアイテムを含む3Dビューへ自動切り替え @@ -11358,7 +11342,7 @@ Do you want to save the document now? Std_Group - + Group グループ @@ -12055,12 +12039,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube 移動可能なナビゲーションキューブ - + Drag and place NaviCube ナビゲーションキューブをドラッグして配置 @@ -12912,4 +12896,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_ka.ts b/src/Gui/Language/FreeCAD_ka.ts index 1d026a8c68..c34758a603 100644 --- a/src/Gui/Language/FreeCAD_ka.ts +++ b/src/Gui/Language/FreeCAD_ka.ts @@ -137,22 +137,22 @@ ბმების ჯგუფის შექმნა - + Make link ბმის შექმნა - + Make sub-link ქვებმის შექმნა - + Import links ბმების შემოტანა - + Import all links ყველა ბმის შემოტანა @@ -167,12 +167,12 @@ ტექსტური დოკუმენტის ჩასმა - + Add a part სტანდარტული ნაწილის ჩასმა - + Add a group ჯგუფის დამატება @@ -582,12 +582,12 @@ Press left mouse button - დააჭირეთ თაგუნის მარცხენა ღილაკს + დააწექით მარცხენა თაგუნას ღილაკს Press middle mouse button - დააჭირეთ თაგუნის შუა ღილაკს + დააწექით შუა თაგუნას ღილაკს @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings კამერის პარამეტრები - + Orientation ორიენტაცია - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view მიმდინარე ხედი @@ -1163,7 +1163,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces Remove - მოცილება + წაშლა @@ -1819,22 +1819,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + ფაილის ძებნა: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + მხარდაჭერილია ფაილის სახელების ძებნა რეგისტრისთვის ყურადღების მიქცევის გარეშე და რეგულარული გამოსახულებები Find in files: - Find in files: + ფაილებში ძებნა: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + მხარდაჭერილია ფაილის შემცველობის რეგისტრისთვის ყურადღების მიქცევის გარეშე გაფილტვრა და რეგულარული გამოსახულებები @@ -1874,7 +1874,7 @@ same time. The one with the highest priority will be triggered. Rename - გადარქმევა + სახელის გადარქმევა @@ -2680,7 +2680,7 @@ Specify another directory, please. Reset - დაბრუნება + საწყის მნიშვნელობებზე დაბრუნება @@ -2731,7 +2731,7 @@ Specify another directory, please. TextLabel - ტექსტური ჭდე + ტექსტური წარწერა @@ -3960,7 +3960,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation ნავიგაცია @@ -4054,35 +4054,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements ყველა ელემენტის ძირითადი ფერი + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D ნავიგაცია - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. მაუსის ღილაკის კონფიგურაციების ჩამოთვლა არჩეული ნავიგაციის თითოეული პარამეტრისთვის. აირჩიეთ ნაკრები და შემდეგ დააჭირეთ ღილაკს აღნიშნული კონფიგურაციების სანახავად. - + Mouse... თაგუნა... - + Navigation settings set ნავიგაციის პარამეტრების ნაკრები - + Orbit style ტრიალის სტილი - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4093,116 +4118,116 @@ Free Turntable: the part will be rotated around the z-axis. თავისუფალი ბრუნავი დისკო: ნაწილი Z-ღერძის გარშემო შებრუნდება. - + Turntable გრუნტი - + Trackball ტრეკბოლი - + Free Turntable თავისუფალი გრუნტი - + Rotation mode ბრუნვის რეჟიმი - + Rotations in 3D will use current cursor position as center for rotation 3D-ში ბრუნვის დროს მობრუნების ცენტრი კურსორის მიმდინარე მდებარეობა იქნება - + Window center ფანჯრის ცენტრი - + Drag at cursor კურსორთან გადათრევა - + Object center ობიექტის ცენტრი - + Default camera orientation კამერის ნაგულისხმევი ორიენტაცია - + Default camera orientation when creating a new document or selecting the home view კამერის ნაგულისხმევი ორიენტაცია ახალი დოკუმენტის შექმნისას ან საწყისი ხედის არჩევისას - + Camera zoom კამერის გადიდება - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. აყენებს ახალი დოკუმენტების კამერის მასშტაბს. მნიშვნელობას წარმოადგენს სფეროს დიამეტრი, რომელიც ეკრანზე ეტევა. - + mm მმ - + Enable animated rotations ანიმირებული შებრუნების ჩართვა - + Enable animation ანიმაციის ჩართვა - + Zoom operations will be performed at position of mouse pointer გადიდების მოქმედება თაგუნას მაჩვენებლის პოზიციაზე მოხდება - + Zoom at cursor კურსორთან გადიდება - + Zoom step გადიდების ბიჯი - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. რამდენად შეიძლება გაადიდოთ. გადიდების ბიჯი 1 ნიშნავს 7,5-ჯერ გადიდებას ყოველ ბიჯზე. - + Direction of zoom operations will be inverted გადიდების ოპერაციების ინვერსია - + Invert zoom გადიდების ინვერსია - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4211,67 +4236,57 @@ Mouse tilting is not disabled by this setting. თაგუნათი დახრილობა ამ პარამეტრით არ არის ითიშება. - + Disable touchscreen tilt gesture სენსორული ეკრანის მისახვედრი ჟესტების გამორთვა - - Show the rotation center when dragging. - გადათრევისას შებრუნების ცენტრის ჩვენება. - - - - Enable rotation center indication - შებრუნების ცენტრის მაჩვენებლის ჩართვა - - - + Isometric იზომეტრიული - + Dimetric დიმეტრიული - + Trimetric ტრიმეტრიული - + Top თავზე - + Front წინ - + Left მარცხნივ - + Right მარჯვნივ - + Rear უკან - + Bottom ძირზე - + Custom ხელით @@ -4322,12 +4337,12 @@ horizontal space in Python console Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Python-ის პროფაილერის ინტერვალი (მწმ): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + ინტერვალი, რომლითაც პროფაილერი ეშვება იქ, სადაც Python-ის კოდია გაშვებული (რომ GUI-მა გიპასუხოთ). გამოსართავად დააყენეთ 0. @@ -4456,27 +4471,27 @@ Larger value eases to pick things, but can make small features impossible to sel Color Bar - Color Bar + ფერის პანელი Label text color - Label text color + ჭდის ტექსტის სურათი Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + ფერის პანელის (გამოიყენება ბადისა და სემ მაგიდების მიერ) ჭდის ტექსტის ფერი Label text size - Label text size + ჭდის ტექსტის ზომა Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + ფერის პანელის (გამოიყენება ბადისა და სემ მაგიდების მიერ) ჭდის ტექსტის ზომა @@ -4667,7 +4682,7 @@ The preference system is the one set in the general preferences. Placement - მდებარეობა + განლაგება @@ -5130,7 +5145,7 @@ The 'Status' column shows whether the document could be recovered. Placement - განლაგება + მდებარეობა @@ -5248,7 +5263,7 @@ The 'Status' column shows whether the document could be recovered. Reset - საწყის მნიშვნელობებზე დაბრუნება + დაბრუნება @@ -5833,13 +5848,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file აირჩიეთ ფაილი - + Select a directory აირჩიეთ საქაღალდე @@ -5847,13 +5862,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as შენახვა როგორც - - + + Open გახსნა @@ -5861,12 +5876,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended გაფართოებული - + All files (*.*) ყველა ფაილი (*.*) @@ -5994,7 +6009,7 @@ Do you want to save your changes? Graphviz format - Graphviz format + Graphviz-ის ფორმატი @@ -6037,7 +6052,7 @@ Do you want to save your changes? Scroll middle mouse button - დაატრიალეთ თაგუნის ბორბალი + დაატრიალეთ შუა თაგუნას ღილაკი @@ -6815,20 +6830,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module აირჩიეთ მოდული - + Open %1 as %1-ის გაღება, როგორც - - - Select - არჩევა - Gui::StdCmdDescription @@ -6918,7 +6928,7 @@ Do you want to specify another directory? Position - მდებარეობა + Position @@ -6949,7 +6959,7 @@ Do you want to specify another directory? TextLabel - ტექსტური წარწერა + ტექსტური ჭდე @@ -6964,7 +6974,7 @@ Do you want to specify another directory? Remove - წაშლა + მოცილება @@ -7099,7 +7109,7 @@ Do you want to specify another directory? Press middle mouse button - დააწექით შუა თაგუნას ღილაკს + დააჭირეთ თაგუნის შუა ღილაკს @@ -7109,7 +7119,7 @@ Do you want to specify another directory? Scroll middle mouse button - დაატრიალეთ შუა თაგუნას ღილაკი + დაატრიალეთ თაგუნის ბორბალი @@ -7117,7 +7127,7 @@ Do you want to specify another directory? Press left mouse button - დააწექით მარცხენა თაგუნას ღილაკს + დააჭირეთ თაგუნის მარცხენა ღილაკს @@ -7455,7 +7465,7 @@ Do you want to specify another directory? Rename - სახელის გადარქმევა + გადარქმევა @@ -8234,7 +8244,7 @@ Do you want to continue? ძალიან ბევრი გახსნილი არაშემაწუხებელი გაფრთხილება. გაფრთხილებებს გამოვტოვებთ! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8243,44 +8253,44 @@ Do you want to continue? - + Are you sure you want to continue? დარწმუნებული ბრძანდებით, რომ გნებავთ, გააგრძელოთ? - + Please check report view for more... მეტის გასაგებად, გთხოვთ გაეცნოთ ანგარიშს... - + Physical path: ფიზიკური მისამართი: - - + + Document: დოკუმენტი: - - + + Path: მისამართი: - + Identical physical path იგივე ფიზიკური მისამართი - + Could not save document ფაილის შენახვის შეცდომა - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8293,102 +8303,102 @@ Would you like to save the file with a different name? გსურთ შეინახოთ ფაილი სხვა სახელით? - - - + + + Saving aborted შენახვა შეწყვეტილია - + Save dependent files დამოკიდებული ფაილების ჩაწერა - + The file contains external dependencies. Do you want to save the dependent files, too? ფაილი შეიცავს გარე დამოკიდებულებებს. გსურთ შეინახოთ დამოკიდებული ფაილებიც? - - + + Saving document failed დკუმენტის შენახვის შეცდომა - + Save document under new filename... დოკუმენტის ახალი სახელით შენახვა... - - + + Save %1 Document დოკუმენტ %1-ის შენახვა - + Document დოკუმენტი - - + + Failed to save document დოკუმენტის შენახვის შეცდომა - + Documents contains cyclic dependencies. Do you still want to save them? დოკუმენტები შეიცავენ წრიულ დამოკიდებულებებს. მაინც გნებავთ მათი შენახვა? - + Save a copy of the document under new filename... დოკუმენტის ასლის ახალი სახელით შენახვა... - + %1 document (*.FCStd) %1 დოკუმენტი (*.FCStd) - + Document not closable დოკუმენტი დახურვადი არაა - + The document is not closable for the moment. დოკუმენტი ამ მომენტისთვის დახურვადი არაა. - + Document not saved დოკუმენტი არ იქნა შენახული - + The document%1 could not be saved. Do you want to cancel closing it? %1-ის შენახვა შეუძლებელია. გნებავთ დახურვის გაუქმება? - + Undo დაბრუნება - + Redo გამეორება - + There are grouped transactions in the following documents with other preceding transactions შემდეგ დოკუმენტებში არის დაჯგუფებული ტრანზაქციები სხვა წინა ტრანზაქციებთან ერთად - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8471,12 +8481,12 @@ Please open a browser window and type in: http://localhost:%1. პარამეტრები... - + Out of memory მეხსიერება აღარ არის - + Not enough memory available to display the data. არ არის საკმარისი მეხსიერება მონაცემთა საჩვენებლად. @@ -8502,7 +8512,7 @@ Please open a browser window and type in: http://localhost:%1. ანოტაციის გადატანა - + Transform გარდაქმნა @@ -8568,14 +8578,14 @@ Please open a browser window and type in: http://localhost:%1. %1 ცარიელი არაა. წავშალო მისი შემცველობაც? - + Translation: მოძრაობითი გადატანა: Translation XY: - Translation XY: + მოძრაობითი გადატანა XY: @@ -8616,32 +8626,32 @@ Please open a browser window and type in: http://localhost:%1. ბმულების ჯგუფის შექმნის შეცდომა - + Create link failed ბმის შექმნის შეცდომა - + Failed to create relative link შედარებითი ბმულის შექმნის შეცდომა - + Unlink failed განცალკევების შეცდომა - + Replace link failed ბმულის ჩანაცვლების შეცდომა - + Failed to import links ბმულების შემოტანის შეცდომა - + Failed to import all links ყველა ბმულის შემოტანის შეცდომა @@ -9352,14 +9362,14 @@ the current copy will be lost. StdCmdGroup - + Create group ჯგუფის შექმნა - - Create a new group for ordering objects - ობიექტების დასალაგებლად ახალი ჯგუფის შექმნა + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9417,13 +9427,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions ბმული - - + + Actions that apply to link objects მიბმულ ობიექტებზე გადატარებადი ქმედებები @@ -9431,12 +9441,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links ბმების შემოტანა - + Import selected external link(s) მონიშნული გარე ბმულ(ებ)-ის შემოტანა @@ -9444,12 +9454,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links ყველა ბმის შემოტანა - + Import all links of the active document აქტიური დოკუმენტის ყველა ბმულის შემოტანა @@ -9462,9 +9472,9 @@ the current copy will be lost. ბმის შექმნა - - Create a link to the selected object(s) - მონიშნულ ობიექტ(ებ)-ამდე ბმულის შექმნა + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9483,12 +9493,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link ქვებმის შექმნა - + Create a sub-object or sub-element link ქვეობიექტის ან ქვეელემენტის ბმულის შექმნა @@ -9496,12 +9506,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link ბმულით ჩანაცვლება - + Replace the selected object(s) with link მონიშნული ობიექტ(ებ)-ის ბმულით ჩანაცვლება @@ -9509,13 +9519,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation ბმულით ნავიგაცია - - + + Link navigation actions მოქმედებები ბმულზე გადასვლისას @@ -9523,12 +9533,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links ყველა ბმის მონიშვნა - + Select all links to the current selected object მონიშნული ობიექტის ყველა ბმულის მონიშვნა @@ -9536,12 +9546,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object მიბმულ ობიექტზე გადასვლა - + Select the linked object and switch to its owner document აირჩიეთ მიბმული ობიექტი და გადაერთეთ მისი მფლობელ დოკუმენტზე @@ -9549,12 +9559,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object უღრმეს მიბმულ ობიექტზე გადასვლა - + Select the deepest linked object and switch to its owner document აირჩიეთ უღრმესი მიბმული ობიექტი და გადაერთეთ მისი მფლობელ დოკუმენტზე @@ -9562,12 +9572,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink ბმის მოხსნა - + Strip on level of link ბმულის დონეზესეგმენტაცია @@ -9800,9 +9810,11 @@ the current copy will be lost. ნაწილის შექმნა - - Create a new part and make it active - ახალი ნაწილის შექმნა და მისი აქტიურად მონიშვნა + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10103,48 +10115,20 @@ the current copy will be lost. სცენის ინსპექტორი - - StdCmdSelBack - - - &Back - &უკან - - - - - Go back to previous selection - წინა მონიშნულზე დაბრუნება - - StdCmdSelBoundingBox - + &Bounding box &გაბარიტები - - + + Show selection bounding box მონიშნულის საზღვრების ჩვენება - - StdCmdSelForward - - - &Forward - &წინ - - - - - Repeat the backed selection - ფონის შერჩევის გამეორება - - StdCmdSelectAll @@ -10456,13 +10440,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions TreeVIew-ის ფუნქციები - - + + TreeView behavior options and actions TreeView-ის ქცევებისა და მოქმედებების მორგება @@ -10962,7 +10946,7 @@ the current copy will be lost. Fullscreen - მთელ ეკრანზე + მთლიან ეკრანზე ჩვენების რეჟიმი @@ -11002,13 +10986,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view მუშა ხედს თავიდან გამოძახება - - + + Recall previously stored temporary working view ადრე შენახული დროებით მუშა ხედის თავიდან გამოძახება @@ -11016,13 +11000,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view მუშა ხედის დამახსოვრება - - + + Store a document-specific temporary working view დოკუმენტის დროებითი მუშა ხედის დამახსოვრება @@ -11030,13 +11014,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand ჩაკეცვა/ამოკეცვა - - + + Expand active document and collapse all others აქტიური დოკუმენტის გაფართოება და ყველა დანარჩენის ჩაკეცვა @@ -11044,12 +11028,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging გადათრევის დასაწყისი - + Initiate dragging of current selected tree items ხის მონიშნული ელემენტების გადათრევის დაწყება @@ -11057,13 +11041,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document შედგენილი დოკუმენტი - - + + Display all documents in the tree view დოკუმენტის ხის ფანჯარაში ყველა დოკუმენტის ჩვენება @@ -11071,12 +11055,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection წინასწარ მონიშნული - + Preselect the object in 3D view when mouse over the tree item 3D ხედში ხის ელემენტზე კურსორის გადატარებისას ობიექტების წინასწარი მონიშვნა @@ -11084,12 +11068,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection მონიშნულის ჩაწერა - + Record selection in tree view in order to go back/forward using navigation button მონიშნულის ხის ხედში ჩაწერა მათზე ნავიგაციის ღილაკებით წინ/უკან გადასასვლელად @@ -11111,13 +11095,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document ერთიანი დოკუმენტი - - + + Only display the active document in the tree view ხის ხედში მხოლოდ აქტიური დოკუმენტის ჩვენება @@ -11125,12 +11109,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement მდებარეობის სინქრონიზაცია - + Auto adjust placement on drag and drop objects across coordinate systems კოორდინატთა სისტემებს შორის ობიექტების გადათრევისას განლაგების ავტომატური რეგულირება @@ -11138,12 +11122,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection მონიშნულის სინქრონიზაცია - + Auto expand tree item when the corresponding object is selected in 3D view ხის ელემენტის ავტომატური გაფართოება, როდესაც შესაბამისი ობიექტი მოინიშნება 3D ხედში @@ -11151,12 +11135,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view სინქრონიზაციის ხედი - + Auto switch to the 3D view containing the selected item მონიშნული ობიექტის 3D ხედზე ავტომატური გადართვა @@ -11208,7 +11192,7 @@ the current copy will be lost. Fullscreen - მთლიან ეკრანზე ჩვენების რეჟიმი + მთელ ეკრანზე @@ -11391,7 +11375,7 @@ Do you want to save the document now? Std_Group - + Group ჯგუფი @@ -12089,12 +12073,12 @@ FreeCAD-ის გაშვების შემდეგ NaviCubeDraggableCmd - + Movable navigation cube მოძრავი ნავიგაციის კუბი - + Drag and place NaviCube გადაათრიეთ და მოათავსეთ ნავიგაციის კუბი @@ -12941,13 +12925,39 @@ You can now use Theme to get a full customization of the interface. Export dependency graph... - Export dependency graph... + დამოკიდებულების გრაფიკის გატანა... Export the dependency graph to a file - Export the dependency graph to a file + დამოკიდებულების გატანა ფაილში + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_ko.ts b/src/Gui/Language/FreeCAD_ko.ts index d978ed302e..4c6a03f801 100644 --- a/src/Gui/Language/FreeCAD_ko.ts +++ b/src/Gui/Language/FreeCAD_ko.ts @@ -138,22 +138,22 @@ 링크 그룹 만들기 - + Make link 링크 만들기 - + Make sub-link 서브 링크 만들기 - + Import links 링크 가져오기 - + Import all links 모든 링크 가져오기 @@ -168,12 +168,12 @@ 텍스트 문서 삽입 - + Add a part 부품 추가하기 - + Add a group 그룹 추가하기 @@ -779,37 +779,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings 카메라 설정 - + Orientation Orientation - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view 현재 보기 @@ -3963,7 +3963,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation 탐색 @@ -4057,35 +4057,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D 탐색 - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. 선택한 각 탐색 설정에 대한 마우스 버튼 구성을 나열합니다. 세트를 선택한 다음 단추를 누르면 해당 구성이 표시됩니다. - + Mouse... 마우스... - + Navigation settings set 탐색 설정 설정하기 - + Orbit style 궤도 스타일 - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4096,116 +4121,116 @@ Free Turntable: the part will be rotated around the z-axis. 자유 턴테이블: 대상물이 x축에 대해 회전 하게됨. - + Turntable 턴테이블 - + Trackball 트랙볼 - + Free Turntable Free Turntable - + Rotation mode 회전 모드 - + Rotations in 3D will use current cursor position as center for rotation 3D 회전은 현재 커서 위치를 회전 중심으로 사용합니다 - + Window center 창 중앙 - + Drag at cursor 커서에서 드래그 - + Object center 객체 중심 - + Default camera orientation 기본 카메라 방향 - + Default camera orientation when creating a new document or selecting the home view 새 문서를 만들거나 홈 보기를 선택할 때의 기본 카메라 방향 - + Camera zoom 카메라 줌 - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. 새 문서에 대한 카메라 줌을 설정합니다. 값은 화면에 맞출 구체의 지름입니다. - + mm mm - + Enable animated rotations 애니메이션 회전 활성화하기 - + Enable animation 애니메이션 활성화 - + Zoom operations will be performed at position of mouse pointer 확대/축소 작업은 마우스 포인터 위치에서 수행됩니다 - + Zoom at cursor 커서에서 확대/축소하기 - + Zoom step 확대/축소 단계 - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. 얼마나 확대/축소되는지 여부. '1'의 확대/축소 단계는 모든 확대/축소 단계에 대해 7.5의 계수를 의미합니다. - + Direction of zoom operations will be inverted 확대/축소 작업의 방향이 반전됩니다 - + Invert zoom 확대/축소 반전하기 - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4214,67 +4239,57 @@ Mouse tilting is not disabled by this setting. 이 설정에 의해 마우스 기울기가 비활성화되지 않습니다. - + Disable touchscreen tilt gesture 터치스크린 틸트 제스처 비활성화하기 - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric 아이소메트릭 - + Dimetric 디메트릭 - + Trimetric 트라이메트릭 - + Top 평면 - + Front 정면 - + Left 좌측면 - + Right 우측면 - + Rear 배면 - + Bottom 저면 - + Custom 색상 편집 @@ -5835,13 +5850,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file 파일 선택하기 - + Select a directory 디렉터리 선택하기 @@ -5849,13 +5864,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as 다른 이름으로 저장하기 - - + + Open 열기 @@ -5863,12 +5878,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended 확장 - + All files (*.*) 모든 파일 (*.*) @@ -6816,20 +6831,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module 모듈 선택 - + Open %1 as 다음으로 %1 열기 - - - Select - 선택 - Gui::StdCmdDescription @@ -8235,51 +8245,51 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! 동일한 물리적 경로가 감지되었습니다. 존재하는 문서의 원치 않는 덮어쓰기가 발생할 수 있습니다! - + Are you sure you want to continue? Are you sure you want to continue? - + Please check report view for more... 자세한 내용은 보고서 보기를 확인하십시오... - + Physical path: 물리적 경로: - - + + Document: 문서: - - + + Path: 경로: - + Identical physical path 동일한 물리적 경로 - + Could not save document 문서를 저장할 수 없습니다 - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8292,102 +8302,102 @@ Would you like to save the file with a different name? 파일을 다른 이름으로 저장하시겠습니까? - - - + + + Saving aborted 저장 실패 - + Save dependent files 종속 파일 저장하기 - + The file contains external dependencies. Do you want to save the dependent files, too? 파일에 외부 종속성이 있습니다. 종속 파일도 저장하시겠습니까? - - + + Saving document failed 문서 저장 실패 - + Save document under new filename... 새 파일 이름으로 문서 저장하기... - - + + Save %1 Document %1 문서 저장 - + Document 문서 - - + + Failed to save document 문서 저장 실패 - + Documents contains cyclic dependencies. Do you still want to save them? 문서에는 주기적 종속성이 포함되어 있습니다. 아직도 저장하길 원하나요? - + Save a copy of the document under new filename... 문서의 사본을 새 파일 이름으로 저장하기... - + %1 document (*.FCStd) %1 문서 (*.FCStd) - + Document not closable 문서를 닫을 수 없습니다 - + The document is not closable for the moment. 그 문서는 당분간 닫을 수 없다. - + Document not saved 문서가 저장되지 않았습니다 - + The document%1 could not be saved. Do you want to cancel closing it? %1 문서를 저장할 수 없습니다. 닫기를 취소하시겠습니까? - + Undo Undo - + Redo Redo - + There are grouped transactions in the following documents with other preceding transactions 다음 문서에 다른 이전 트랜잭션과 함께 그룹화된 트랜잭션이 있습니다. - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8470,12 +8480,12 @@ Please open a browser window and type in: http://localhost:%1. 옵션... - + Out of memory 메모리 부족 - + Not enough memory available to display the data. 데이터를 화면표시하는 데 사용할 수 있는 메모리가 충분하지 않습니다. @@ -8501,7 +8511,7 @@ Please open a browser window and type in: http://localhost:%1. 애노테이션 이동하기 - + Transform 변환하기 @@ -8567,7 +8577,7 @@ Please open a browser window and type in: http://localhost:%1. %1이 비어 있지 않습니다. 내용도 삭제하시겠습니까? - + Translation: 이동: @@ -8615,32 +8625,32 @@ Please open a browser window and type in: http://localhost:%1. 링크 그룹 만들기 실패함 - + Create link failed 링크 만들기 실패함 - + Failed to create relative link 상대 링크를 만들지 못했습니다 - + Unlink failed 링크 해제 실패함 - + Replace link failed 링크 바꾸기 실패함 - + Failed to import links 링크를 가져오지 못했습니다 - + Failed to import all links 모든 링크를 가져오지 못했습니다 @@ -9348,14 +9358,14 @@ the current copy will be lost. StdCmdGroup - + Create group 그룹 만들기 - - Create a new group for ordering objects - 객체 순서를 지정할 새 그룹 만들기 + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9413,13 +9423,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions 링크 작업 - - + + Actions that apply to link objects Actions that apply to link objects @@ -9427,12 +9437,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links 링크 가져오기 - + Import selected external link(s) 선택한 외부 링크 가져오기 @@ -9440,12 +9450,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links 모든 링크 가져오기 - + Import all links of the active document 활성 문서의 모든 링크 가져오기 @@ -9458,9 +9468,9 @@ the current copy will be lost. 링크 만들기 - - Create a link to the selected object(s) - 선택한 객체에 대한 링크 만들기 + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9479,12 +9489,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link 서브 링크 만들기 - + Create a sub-object or sub-element link 하위 객체 또는 하위 요소 링크 만들기 @@ -9492,12 +9502,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link 링크로 바꾸기 - + Replace the selected object(s) with link 선택한 객체를 링크로 바꾸기 @@ -9505,13 +9515,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation 탐색 링크 - - + + Link navigation actions 링크 탐색 작업 @@ -9519,12 +9529,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links 모든 링크 선택하기 - + Select all links to the current selected object 현재 선택한 객체에 대한 모든 링크 선택하기 @@ -9532,12 +9542,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object 링크된 객체로 가기 - + Select the linked object and switch to its owner document 링크된 객체를 선택하고 소유자 문서로 전환하기 @@ -9545,12 +9555,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object 가장 깊게 링크 객체로 가기 - + Select the deepest linked object and switch to its owner document 가장 깊게 링크된 객체를 선택하고 소유자 문서로 전환하기 @@ -9558,12 +9568,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink 연결 해제 - + Strip on level of link 링크 레벨의 스트립 @@ -9796,9 +9806,11 @@ the current copy will be lost. 부품 만들기 - - Create a new part and make it active - 새 부품을 만들고 활성 상태로 만듭니다 + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10099,48 +10111,20 @@ the current copy will be lost. 장면 검사기 - - StdCmdSelBack - - - &Back - 뒤로(&B) - - - - - Go back to previous selection - 이전 선택 항목으로 돌아가기 - - StdCmdSelBoundingBox - + &Bounding box 경계 상자(&B) - - + + Show selection bounding box 선택항목 경계 상자 표시하기 - - StdCmdSelForward - - - &Forward - 앞으로(&F) - - - - - Repeat the backed selection - 백업된 선택 반복 - - StdCmdSelectAll @@ -10452,13 +10436,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions 트리보기 작업 - - + + TreeView behavior options and actions 트리보기 동작 옵션 및 작업 @@ -10998,13 +10982,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view 작업 뷰 불러오기 - - + + Recall previously stored temporary working view 이전에 저장된 임시 작업 뷰 호출 @@ -11012,13 +10996,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view 작업 뷰 저장 - - + + Store a document-specific temporary working view 문서별 임시 작업 뷰 저장 @@ -11026,13 +11010,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand 접기/펼치기 - - + + Expand active document and collapse all others 활성 문서 펼치기 및 다른 모든 문서 접기 @@ -11040,12 +11024,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Initiate dragging - + Initiate dragging of current selected tree items Initiate dragging of current selected tree items @@ -11053,13 +11037,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document 다중 문서 - - + + Display all documents in the tree view 트리 뷰에 모든 문서 표시 @@ -11067,12 +11051,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection 사전-선택항목 - + Preselect the object in 3D view when mouse over the tree item 트리 항목 위로 마우스를 가져갈 때 3D 보기에서 객체 미리 선택하기 @@ -11080,12 +11064,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection 선택항목 기록하기 - + Record selection in tree view in order to go back/forward using navigation button 탐색 버튼을 사용하여 뒤로/앞으로 가려면 트리 보기에 선택항목 기록하기 @@ -11107,13 +11091,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document 단일 문서 - - + + Only display the active document in the tree view 트리 보기에서 활성 문서만 보이기 @@ -11121,12 +11105,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement 배치 동기화하기 - + Auto adjust placement on drag and drop objects across coordinate systems 좌표계 전체에서 드래그 앤 드롭 객체의 배치 자동 조정 @@ -11134,12 +11118,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection 선택항목 동기화하기 - + Auto expand tree item when the corresponding object is selected in 3D view 3D 보기에서 해당 객체 선택 시 트리 항목 자동 펼치기 @@ -11147,12 +11131,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view 보기 동기화하기 - + Auto switch to the 3D view containing the selected item 선택한 항목이 포함된 3D 보기로 자동 전환하기 @@ -11386,7 +11370,7 @@ Do you want to save the document now? Std_Group - + Group 그룹 @@ -12082,12 +12066,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12942,4 +12926,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_nl.ts b/src/Gui/Language/FreeCAD_nl.ts index 07cc4da955..23595ef078 100644 --- a/src/Gui/Language/FreeCAD_nl.ts +++ b/src/Gui/Language/FreeCAD_nl.ts @@ -137,22 +137,22 @@ Maak linkgroep - + Make link Maak link - + Make sub-link Maak sublink - + Import links Importeer links - + Import all links Importeer alle links @@ -167,12 +167,12 @@ Tekst document invoegen - + Add a part Voeg een onderdeel toe - + Add a group Een groep toevoegen @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Camera-instellingen - + Orientation Orientatie - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Huidige weergave @@ -857,7 +857,7 @@ while doing a left or right click and move the mouse up or down View - Aanzicht + Weergave @@ -1474,7 +1474,7 @@ same time. The one with the highest priority will be triggered. Command - Opdracht + Commando @@ -1538,7 +1538,7 @@ same time. The one with the highest priority will be triggered. &Close - & Sluiten + &Sluiten @@ -1817,22 +1817,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Bestand zoeken: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Niet-hoofdletter-gevoelige zoekopdracht voor bestandsnamen, gewone uitdrukkingen ondersteund Find in files: - Find in files: + Bestand zoeken: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Filter op niet-hoofdletter-gevoelige bestandsinhoud, gewone uitdrukkingen ondersteund @@ -2091,7 +2091,7 @@ Misschien een fout met bestandsrechten? Close - Afsluiten + Sluiten @@ -2261,7 +2261,7 @@ Kies een andere map, alstublieft. &Close - & Sluiten + &Sluiten @@ -2323,7 +2323,7 @@ Kies een andere map, alstublieft. Group - Groeperen + Groep @@ -3951,7 +3951,7 @@ U kunt ook het formulier gebruiken: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navigatie @@ -4045,35 +4045,60 @@ U kunt ook het formulier gebruiken: John Doe <john@doe.com> Base color for all elements Basiskleur voor alle elementen + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D-navigatie - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Geef een lijst met de configuratie van de muisknop voor elke gekozen navigatie-instelling. Selecteer een set en druk vervolgens op de knop om deze configuraties te bekijken. - + Mouse... Muis... - + Navigation settings set Navigatie-instellingen ingesteld - + Orbit style Rotatiebaan stijl - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4084,116 +4109,116 @@ Draaitafel: het object wordt rond de z-as gedraaid (met beperkte assen). Vrije draaitafel: het object zal worden gedraaid rond de z-as. - + Turntable Draaitafel - + Trackball Trackball - + Free Turntable Vrije draaitafel - + Rotation mode Draai modus - + Rotations in 3D will use current cursor position as center for rotation Rotaties in 3D zullen de huidige cursorpositie als middelpunt voor de rotatie gebruiken - + Window center Venster midden - + Drag at cursor Sleep bij cursor - + Object center Object midden - + Default camera orientation Standaard cameraoriëntatie - + Default camera orientation when creating a new document or selecting the home view Standaard cameraoriëntatie bij het aanmaken van een nieuw document of het selecteren van het startscherm - + Camera zoom Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Stelt de camerazoom in voor nieuwe documenten. De waarde is de diameter van de bol die op het scherm past. - + mm mm - + Enable animated rotations Geanimeerde rotaties inschakelen - + Enable animation Animatie inschakelen - + Zoom operations will be performed at position of mouse pointer Zoombewerkingen worden uitgevoerd bij de positie van de muisaanwijzer - + Zoom at cursor Inzoomen bij cursor - + Zoom step Zoomstap - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Hoeveel zal er worden ingezoomd. Zoomstap van '1' betekent een factor 7,5 voor elke zoomstap. - + Direction of zoom operations will be inverted Richting van zoombewerkingen zullen omgedraaid worden - + Invert zoom Zoom omkeren - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4202,67 +4227,57 @@ Beïnvloedt alleen gebaar nav. stijl. De kanteling van de muis wordt niet uitgeschakeld door deze instelling. - + Disable touchscreen tilt gesture Touchscreen kantel gebaar uitschakelen - - Show the rotation center when dragging. - Toon het rotatiepunt tijdens slepen. - - - - Enable rotation center indication - Schakel de indicatie van het rotatiecentrum in - - - + Isometric Isometrisch - + Dimetric Dimetrisch - + Trimetric Trimetrisch - + Top Boven - + Front Voorkant - + Left Links - + Right Rechts - + Rear Achter - + Bottom Onder - + Custom Eigen @@ -4314,12 +4329,12 @@ horizontale ruimte in de Python-console overschrijden Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Python profiler interval (milliseconden): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + Het interval waarop de profiler werkt wanneer er Python-code wordt uitgevoerd (om de GUI actief te houden). Zet op 0 om uit te schakelen. @@ -4446,27 +4461,27 @@ Larger value eases to pick things, but can make small features impossible to sel Color Bar - Color Bar + Kleuren balk Label text color - Label text color + Kleur van de label tekst Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Kleurenbalk (gebruikt in Mesh en FEM werkbanken) Label tekstkleur Label text size - Label text size + Label lettergrootte Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Kleurenbalk (gebruikt in Mesh en FEM werkbanken) Label tekstgrootte @@ -4635,7 +4650,7 @@ Het voorkeurssysteem is het systeem dat in de algemene voorkeuren is ingesteld.< Close - Sluiten + Afsluiten @@ -5278,7 +5293,7 @@ The 'Status' column shows whether the document could be recovered. Command - Commando + Opdracht @@ -5818,13 +5833,13 @@ Wilt u uw wijzigingen opslaan? Gui::FileChooser - - + + Select a file Selecteer een bestand - + Select a directory Kies een map @@ -5832,13 +5847,13 @@ Wilt u uw wijzigingen opslaan? Gui::FileDialog - + Save as Opslaan als - - + + Open Openen @@ -5846,12 +5861,12 @@ Wilt u uw wijzigingen opslaan? Gui::FileOptionsDialog - + Extended Uitgebreid - + All files (*.*) Alle bestanden (*.*) @@ -5979,7 +5994,7 @@ Wilt u uw wijzigingen opslaan? Graphviz format - Graphviz format + Graphviz format @@ -6798,20 +6813,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Module selecteren - + Open %1 as Open %1 als - - - Select - Selecteer - Gui::StdCmdDescription @@ -7390,7 +7400,7 @@ Wilt u een andere map opgeven? Group - Groep + Groeperen @@ -8214,7 +8224,7 @@ Do you want to continue? Te veel geopende achtergrond meldingen. Meldingen worden weggelaten! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8223,44 +8233,44 @@ Do you want to continue? - + Are you sure you want to continue? Weet u zeker dat u wilt doorgaan? - + Please check report view for more... Controleer de rapportweergave voor meer... - + Physical path: Fysiek pad: - - + + Document: Document: - - + + Path: PAD: - + Identical physical path Identische fysieke pad - + Could not save document Kan verzending niet opslaan - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8273,102 +8283,102 @@ Would you like to save the file with a different name? Wilt u het bestand met een andere naam opslaan? - - - + + + Saving aborted Opslaan afgebroken - + Save dependent files Bewaar afhankelijke bestanden - + The file contains external dependencies. Do you want to save the dependent files, too? Het bestand bevat externe afhankelijkheden. Wilt u ook de afhankelijke bestanden opslaan? - - + + Saving document failed Document opslaan is mislukt - + Save document under new filename... Document opslaan onder een nieuwe bestandsnaam... - - + + Save %1 Document Document %1 opslaan - + Document Document - - + + Failed to save document Opslaan document mislukt - + Documents contains cyclic dependencies. Do you still want to save them? Documenten bevatten cyclische afhankelijkheden. Wilt u ze nog opslaan? - + Save a copy of the document under new filename... Bewaar een copy van het actieve document onder een nieuwe naam... - + %1 document (*.FCStd) %1 document (*.FCStd) - + Document not closable Document niet te sluiten - + The document is not closable for the moment. Het document kan nu niet gesloten worden. - + Document not saved Document niet opgeslagen - + The document%1 could not be saved. Do you want to cancel closing it? Het document%1 kon niet worden opgeslagen. Wilt u het sluiten annuleren? - + Undo Ongedaan maken - + Redo Herstel ongedaan maken - + There are grouped transactions in the following documents with other preceding transactions Er zijn gegroepeerde transacties in de volgende documenten met andere voorgaande transacties - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8450,12 +8460,12 @@ Open een browservenster en typ: http://localhost:%1. Opties... - + Out of memory Onvoldoende geheugen - + Not enough memory available to display the data. Niet genoeg geheugen beschikbaar om de gegevens weer te geven. @@ -8481,7 +8491,7 @@ Open een browservenster en typ: http://localhost:%1. Verplaats annotatie - + Transform Transformeren @@ -8547,14 +8557,14 @@ Open een browservenster en typ: http://localhost:%1. De %1 is niet leeg. Mag de inhoud worden verwijderd? - + Translation: Verplaatsing: Translation XY: - Translation XY: + Verschuiving XY: @@ -8595,32 +8605,32 @@ Open een browservenster en typ: http://localhost:%1. Aanmaken linkgroep mislukt - + Create link failed Aanmaken link mislukt - + Failed to create relative link Aanmaken van relatieve link mislukt - + Unlink failed Ontkoppelen mislukt - + Replace link failed Linkvervanging mislukt - + Failed to import links Links importeren is mislukt - + Failed to import all links Alle links importeren is mislukt @@ -9328,14 +9338,14 @@ de huidige kopie verloren gaat. StdCmdGroup - + Create group Groep maken - - Create a new group for ordering objects - Maak een nieuwe groep voor het bestellen van objecten + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9393,13 +9403,13 @@ de huidige kopie verloren gaat. StdCmdLinkActions - + Link actions Linkacties - - + + Actions that apply to link objects Acties die van toepassing zijn om objecten te koppelen @@ -9407,12 +9417,12 @@ de huidige kopie verloren gaat. StdCmdLinkImport - + Import links Importeer links - + Import selected external link(s) Importeer geselecteerde externe link(s) @@ -9420,12 +9430,12 @@ de huidige kopie verloren gaat. StdCmdLinkImportAll - + Import all links Importeer alle links - + Import all links of the active document Importeer alle links van het actieve document @@ -9438,9 +9448,9 @@ de huidige kopie verloren gaat. Maak link - - Create a link to the selected object(s) - Maak een link naar elk geselecteerd object + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9459,12 +9469,12 @@ de huidige kopie verloren gaat. StdCmdLinkMakeRelative - + Make sub-link Maak sublink - + Create a sub-object or sub-element link Maak een subobject- of subelementlink aan @@ -9472,12 +9482,12 @@ de huidige kopie verloren gaat. StdCmdLinkReplace - + Replace with link Vervang door link - + Replace the selected object(s) with link Vervang elk geselecteerd object door een link @@ -9485,13 +9495,13 @@ de huidige kopie verloren gaat. StdCmdLinkSelectActions - + Link navigation Linknavigatie - - + + Link navigation actions Linknavigatieacties @@ -9499,12 +9509,12 @@ de huidige kopie verloren gaat. StdCmdLinkSelectAllLinks - + Select all links Selecteer alle links - + Select all links to the current selected object Selecteer alle links naar het huidige geselecteerde object @@ -9512,12 +9522,12 @@ de huidige kopie verloren gaat. StdCmdLinkSelectLinked - + Go to linked object Ga naar gekoppeld object - + Select the linked object and switch to its owner document Selecteer het gekoppelde object en schakel over naar het eigenaarsdocument @@ -9525,12 +9535,12 @@ de huidige kopie verloren gaat. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Ga naar het diepste gekoppelde object - + Select the deepest linked object and switch to its owner document Selecteer het diepst gekoppelde object en schakel over naar het eigenaarsdocument @@ -9538,12 +9548,12 @@ de huidige kopie verloren gaat. StdCmdLinkUnlink - + Unlink Ontkoppel - + Strip on level of link Snij op linkniveau @@ -9776,9 +9786,11 @@ de huidige kopie verloren gaat. Onderdeel maken - - Create a new part and make it active - Maak nieuw onderdeel en maak het actief + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10079,48 +10091,20 @@ de huidige kopie verloren gaat. Scènekeuring - - StdCmdSelBack - - - &Back - &Terug - - - - - Go back to previous selection - Ga terug naar vorige selectie - - StdCmdSelBoundingBox - + &Bounding box &Selectiekader - - + + Show selection bounding box Toon begrenzingsdoos van de selectie - - StdCmdSelForward - - - &Forward - &Vooruit - - - - - Repeat the backed selection - Repeat the backed selection - - StdCmdSelectAll @@ -10432,13 +10416,13 @@ de huidige kopie verloren gaat. StdCmdTreeViewActions - + TreeView actions StructuurWeergave acties - - + + TreeView behavior options and actions Gedragsopties en -acties van de StructuurWeergave @@ -10978,13 +10962,13 @@ de huidige kopie verloren gaat. StdRecallWorkingView - + Recall working view Schakel terug naar werkweergave - - + + Recall previously stored temporary working view Schakel terug naar eerder opgeslagen tijdelijke werkweergave @@ -10992,13 +10976,13 @@ de huidige kopie verloren gaat. StdStoreWorkingView - + Store working view Werkweergave opslaan - - + + Store a document-specific temporary working view Sla een document-specifieke tijdelijke werkweergave op @@ -11006,13 +10990,13 @@ de huidige kopie verloren gaat. StdTreeCollapseDocument - + Collapse/Expand In- / Uitvouwen - - + + Expand active document and collapse all others Actieve document uitvouwen en alle andere documenten invouwen @@ -11020,12 +11004,12 @@ de huidige kopie verloren gaat. StdTreeDrag - + Initiate dragging Begin slepen - + Initiate dragging of current selected tree items Begin met slepen van huidige geselecteerde boomstructuur @@ -11033,13 +11017,13 @@ de huidige kopie verloren gaat. StdTreeMultiDocument - + Multi document Multidocument - - + + Display all documents in the tree view Alle documenten in de structuurweergave weergeven @@ -11047,12 +11031,12 @@ de huidige kopie verloren gaat. StdTreePreSelection - + Pre-selection Voorselectie - + Preselect the object in 3D view when mouse over the tree item Selecteer het object in de 3D-weergave als u met de muis over het item in de boomstructuur gaat @@ -11060,12 +11044,12 @@ de huidige kopie verloren gaat. StdTreeRecordSelection - + Record selection Selectie opnemen - + Record selection in tree view in order to go back/forward using navigation button Neem de selectie op in de boomstructuur om terug/vooruit te gaan met behulp van de navigatieknop @@ -11087,13 +11071,13 @@ de huidige kopie verloren gaat. StdTreeSingleDocument - + Single document Enkel document - - + + Only display the active document in the tree view Geef alleen het actieve document weer in de boomstructuurweergave @@ -11101,12 +11085,12 @@ de huidige kopie verloren gaat. StdTreeSyncPlacement - + Sync placement Synchroniseer plaatsing - + Auto adjust placement on drag and drop objects across coordinate systems Plaatsing op versleepte objecten over de coördinatenstelsels automatisch aanpassen @@ -11114,12 +11098,12 @@ de huidige kopie verloren gaat. StdTreeSyncSelection - + Sync selection Synchroniseer selectie - + Auto expand tree item when the corresponding object is selected in 3D view Automatisch boomstructuur item uitbreiden wanneer het bijbehorende object is geselecteerd in 3D-weergave @@ -11127,12 +11111,12 @@ de huidige kopie verloren gaat. StdTreeSyncView - + Sync view Synchroniseer weergave - + Auto switch to the 3D view containing the selected item Automatisch overschakelen naar de 3D-weergave met het geselecteerde item @@ -11367,7 +11351,7 @@ Wilt u het document nu opslaan? Std_Group - + Group Groep @@ -11542,7 +11526,7 @@ Wilt u toch doorgaan? View - Weergave + Aanzicht @@ -12064,12 +12048,12 @@ nadat FreeCAD opgestart is NaviCubeDraggableCmd - + Movable navigation cube Verplaatsbare navigatie kubus - + Drag and place NaviCube Sleep en plaats NaviCube @@ -12919,13 +12903,39 @@ Je kunt nu Thema gebruiken om de interface volledig aan te passen. Export dependency graph... - Export dependency graph... + Exporteer afhankelijkheden grafiek... Export the dependency graph to a file - Export the dependency graph to a file + Exporteer de afhankelijkheden grafiek naar een bestand + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_pl.ts b/src/Gui/Language/FreeCAD_pl.ts index 63b838a077..36e1892667 100644 --- a/src/Gui/Language/FreeCAD_pl.ts +++ b/src/Gui/Language/FreeCAD_pl.ts @@ -137,22 +137,22 @@ Stwórz grupę łączy - + Make link Utwórz łącze - + Make sub-link Utwórz łącze względne - + Import links Importuj łącza - + Import all links Importuj wszystkie łącza @@ -167,12 +167,12 @@ Wstaw dokument tekstowy - + Add a part Dodaj część - + Add a group Dodaj grupę @@ -413,7 +413,7 @@ Default - Domyślny + Domyślnie @@ -448,7 +448,7 @@ The object will have the color of its individual faces editable with the Part FaceColors command - Obiekt będzie miał kolor poszczególnych ścianek edytowalny za pomocą polecenia Part FaceColors + Kolor poszczególnych ścian obiektu będzie można edytować za pomocą polecenia Kolor powierzchni @@ -582,7 +582,7 @@ Press left mouse button - Wciśnij lewy przycisk myszki + Naciśnij lewy przycisk myszki @@ -778,37 +778,37 @@ podczas kliknięcia lewym lub prawym przyciskiem myszki i przesuwaj kursor w gó Gui::Dialog::CameraDialog - + Camera settings Ustawienia ujęcia widoku - + Orientation Orientacja - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Bieżący widok @@ -1114,7 +1114,7 @@ Jeśli ta opcja nie jest zaznaczona, właściwość musi być jednoznacznie nazw Macros - Makrodefinicje + Makropolecenie @@ -1384,7 +1384,7 @@ wyzwolone zostanie to, które ma najwyższy priorytet. none - brak + żaden @@ -1819,22 +1819,22 @@ wyzwolone zostanie to, które ma najwyższy priorytet. Find file: - Find file: + Znajdź plik: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Wyszukiwanie nazw plików bez uwzględniania wielkości liter, obsługa wyrażeń regularnych Find in files: - Find in files: + Znajdź w plikach: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Filtrowanie zawartości plików bez uwzględniania wielkości liter, obsługiwane wyrażenia regularne @@ -2679,7 +2679,7 @@ Proszę podać inny katalog. Reset - Resetuj + Reset @@ -3841,7 +3841,7 @@ Możesz również skorzystać z formatki: John Doe <john@doe.com> Macro - Makrodefinicje + Makropolecenia @@ -3963,7 +3963,7 @@ Możesz również skorzystać z formatki: John Doe <john@doe.com>Gui::Dialog::DlgSettingsNavigation - + Navigation Nawigacja @@ -4035,7 +4035,7 @@ Możesz również skorzystać z formatki: John Doe <john@doe.com> Default - Domyślnie + Domyślny @@ -4057,35 +4057,60 @@ Możesz również skorzystać z formatki: John Doe <john@doe.com>Base color for all elements Podstawowy kolor dla wszystkich elementów + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Styl nawigacji w przestrzeni 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Lista konfiguracji przycisku myszki dla każdego wybranego ustawienia nawigacji. Wybierz zestaw, a następnie naciśnij przycisk, w celu wyświetlenia konfiguracji. - + Mouse... Myszka ... - + Navigation settings set Zestaw ustawień nawigacyjnych - + Orbit style Technika orbitalna - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4096,116 +4121,116 @@ Turntable: część zostanie obrócona wokół osi z (z powiązanymi osiami). Free Turntable: część będzie obracana wokół osi z. - + Turntable Turntable - + Trackball Trackball - + Free Turntable Free Turntable - + Rotation mode Tryb obrotu - + Rotations in 3D will use current cursor position as center for rotation Do obrótu w przestrzeni 3D będzie użyta pozycja kursora jako środek obrotu - + Window center Środek okna - + Drag at cursor Przeciągnij kursorem - + Object center Środek obiektu - + Default camera orientation Domyślna orientacja ujęcia widoku - + Default camera orientation when creating a new document or selecting the home view Domyślna orientacja ujęcia widoku podczas tworzenia nowego dokumentu lub wybierania widoku głównego - + Camera zoom Przybliż ujęcie widoku - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Ustawia przybliżenie ujęcia widoku z kamery dla nowych dokumentów. Wartością jest średnica kuli, która ma zmieścić się na ekranie. - + mm mm - + Enable animated rotations Włącz animowane obracanie - + Enable animation Włącz animację - + Zoom operations will be performed at position of mouse pointer Operacje powiększenia będą wykonywane w odniesieniu dla pozycji kursora myszki - + Zoom at cursor Powiększ przy kursorze - + Zoom step Krok powiększenia - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Określa krok powiększenia Stopień powiększenia "1" oznacza współczynnik 7,5 dla każdego kolejnego kroku powiększenia. - + Direction of zoom operations will be inverted Kierunek wykonania operacji przybliż / oddal zostanie odwrócony - + Invert zoom Odwrócenie operacji przybliż / oddal - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4214,67 +4239,57 @@ Dotyczy tylko nawigacji gestami. Obracanie przy pomocy myszki nie jest blokowane. - + Disable touchscreen tilt gesture Wyłącz gest obrotu na ekranie dotykowym - - Show the rotation center when dragging. - Pokaż środek obrotu podczas przeciągania. - - - - Enable rotation center indication - Włącz wskaźnik środka obrotu - - - + Isometric Izometryczny - + Dimetric Dimetryczny - + Trimetric Trimetryczny - + Top Od góry - + Front Od przodu - + Left Od lewej - + Right Od prawej - + Rear Od tył - + Bottom Od dołu - + Custom Niestandardowy @@ -4326,12 +4341,12 @@ długość wiersza w konsoli Python Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Interwał profilera Python (milisekundy): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + Interwał, w którym profiler działa, gdy uruchomiony jest kod Python (aby interfejs graficzny odpowiadał). Ustaw na 0, aby wyłączyć. @@ -4460,27 +4475,27 @@ Większa wartość ułatwia wybieranie, ale może uniemożliwić wybór małych Color Bar - Color Bar + Pasek kolorów Label text color - Label text color + Kolor tekstu etykiety Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Kolor tekstu etykiety paska kolorów (używany w środowiskach Siatka i MES) Label text size - Label text size + Rozmiar czcionki na etykiecie Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Rozmiar tekstu etykiety paska kolorów (używany w środowiskach Siatka i MES) @@ -5252,7 +5267,7 @@ Kolumna "Aktualny status" pokazuje, czy dokument może być odzyskany. Reset - Reset + Resetuj @@ -5836,13 +5851,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Wybierz plik - + Select a directory Wybierz katalog @@ -5850,13 +5865,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Zapisz jako - - + + Open Otwórz @@ -5864,12 +5879,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Rozszerz - + All files (*.*) Wszystkie pliki (*.*) @@ -5997,7 +6012,7 @@ Do you want to save your changes? Graphviz format - Graphviz format + Format Graphviz @@ -6030,7 +6045,7 @@ Do you want to save your changes? Press middle mouse button - Wciśnij środkowy przycisk myszki + Naciśnij środkowy przycisk myszki @@ -6146,7 +6161,7 @@ Do you want to save your changes? Macros - Makropolecenie + Makrodefinicje @@ -6197,14 +6212,14 @@ Do you want to save your changes? Toggles this toolbar - Włącza/wyłącza ten pasek narzędzi + Włącza / wyłącza ten pasek narzędzi Toggles this dockable window - Włącza/wyłącza to okno dokujące + Włącza / wyłącza to okno dokujące @@ -6750,7 +6765,7 @@ Do you want to exit without saving your data? none - żaden + brak @@ -6817,20 +6832,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Wybierz moduł importera - + Open %1 as Otwórz %1 za pomocą: - - - Select - Wybierz - Gui::StdCmdDescription @@ -7097,7 +7107,7 @@ Do you want to specify another directory? Press middle mouse button - Naciśnij środkowy przycisk myszki + Wciśnij środkowy przycisk myszki @@ -7115,7 +7125,7 @@ Do you want to specify another directory? Press left mouse button - Naciśnij lewy przycisk myszki + Wciśnij lewy przycisk myszki @@ -8231,7 +8241,7 @@ Do you want to continue? Zbyt wiele otwartych powiadomień. Powiadomienia są pomijane! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8240,44 +8250,44 @@ Do you want to continue? - + Are you sure you want to continue? Czy na pewno chcesz kontynuować? - + Please check report view for more... Proszę, sprawdź widok raportu, aby uzyskać więcej informacji ... - + Physical path: Ścieżka fizyczna: - - + + Document: Dokument: - - + + Path: Ścieżka: - + Identical physical path Identyczna fizyczna ścieżka - + Could not save document Nie udało się zapisać dokumentu - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8290,102 +8300,102 @@ Would you like to save the file with a different name? Czy chcesz zapisać plik pod inną nazwą? - - - + + + Saving aborted Zapisywanie przerwane - + Save dependent files Zapisz zależne pliki - + The file contains external dependencies. Do you want to save the dependent files, too? Plik zawiera zewnętrzne zależności. Czy chcesz zapisać również zależne pliki? - - + + Saving document failed Zapisywanie dokumentu nie powiodło się - + Save document under new filename... Zapisz dokument pod nową nazwą pliku ... - - + + Save %1 Document Zapis dokumentu %1 - + Document Dokument - - + + Failed to save document Nie udało się zapisać dokumentu - + Documents contains cyclic dependencies. Do you still want to save them? Dokumenty zawierają zależności kołowe. Czy nadal chcesz je zapisać? - + Save a copy of the document under new filename... Zapisz kopię dokumentu pod nową nazwą pliku... - + %1 document (*.FCStd) Dokument %1 (*.FCStd) - + Document not closable Dokument nie może zostać zamknięty - + The document is not closable for the moment. Nie można zamknąć dokumentu w tym momencie. - + Document not saved Dokument nie zapisany - + The document%1 could not be saved. Do you want to cancel closing it? Nie można zapisać dokumentu %1. Czy chcesz przerwać zamykanie dokumentu? - + Undo Cofnij - + Redo Ponów - + There are grouped transactions in the following documents with other preceding transactions W następujących dokumentach zgrupowane są operacje z innymi poprzedzającymi je operacjami - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8468,12 +8478,12 @@ Proszę otworzyć okno przeglądarki i wpisać: http://localhost:%1.Opcje ... - + Out of memory Przekroczono limit pamięci - + Not enough memory available to display the data. Za mało dostępnej pamięci, aby wyświetlić dane. @@ -8499,7 +8509,7 @@ Proszę otworzyć okno przeglądarki i wpisać: http://localhost:%1.Przenieść adnotację - + Transform Przemieszczenie @@ -8565,14 +8575,14 @@ Proszę otworzyć okno przeglądarki i wpisać: http://localhost:%1.%1 nie jest pusty, czy usunąć również jego zawartość? - + Translation: Przesunięcie: Translation XY: - Translation XY: + Przesunięcie XY: @@ -8613,32 +8623,32 @@ Proszę otworzyć okno przeglądarki i wpisać: http://localhost:%1.Tworzenie grupy łaczy nie powiodło się - + Create link failed Tworzenie odnośnika nie powiodło się - + Failed to create relative link Nie udało się utworzyć odnośnika względnego - + Unlink failed Nie udało się usunąć powiązania - + Replace link failed Zastąpienie łącza nie powiodło się - + Failed to import links Nie udało się zaimportować powiązań - + Failed to import all links Nie udało się zaimportować wszystkich powiązań @@ -9350,14 +9360,14 @@ bieżącej kopii zostaną utracone. StdCmdGroup - + Create group Utwórz grupę - - Create a new group for ordering objects - Utwórz nową grupę aby uporządkować obiekty + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9415,13 +9425,13 @@ bieżącej kopii zostaną utracone. StdCmdLinkActions - + Link actions Akcje z łączami - - + + Actions that apply to link objects Akcje mające zastosowanie do obiektów odnośników @@ -9429,12 +9439,12 @@ bieżącej kopii zostaną utracone. StdCmdLinkImport - + Import links Importuj łącza - + Import selected external link(s) Importuj wybrane łącza zewnętrzne @@ -9442,12 +9452,12 @@ bieżącej kopii zostaną utracone. StdCmdLinkImportAll - + Import all links Importuj wszystkie łącza - + Import all links of the active document Importuj wszystkie łącza aktywnego dokumentu @@ -9460,9 +9470,9 @@ bieżącej kopii zostaną utracone. Utwórz łącze - - Create a link to the selected object(s) - Utwórz łącze do zaznaczonych obiektów + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9481,12 +9491,12 @@ bieżącej kopii zostaną utracone. StdCmdLinkMakeRelative - + Make sub-link Utwórz łącze względne - + Create a sub-object or sub-element link Utwórz obiekt zależny lub łącze do elementu podrzędnego @@ -9494,12 +9504,12 @@ bieżącej kopii zostaną utracone. StdCmdLinkReplace - + Replace with link Zastąp przez łącze - + Replace the selected object(s) with link Zastąp zaznaczone obiekty łączem @@ -9507,13 +9517,13 @@ bieżącej kopii zostaną utracone. StdCmdLinkSelectActions - + Link navigation Nawigacja przy użyciu odnośników - - + + Link navigation actions Działania związane z nawigacją przy użyciu odnośników @@ -9521,12 +9531,12 @@ bieżącej kopii zostaną utracone. StdCmdLinkSelectAllLinks - + Select all links Zaznacz wszystkie łącza - + Select all links to the current selected object Zaznacz wszystkie łącza dla aktualnie wybranego obiektu @@ -9534,12 +9544,12 @@ bieżącej kopii zostaną utracone. StdCmdLinkSelectLinked - + Go to linked object Przejdź do połączonego obiektu - + Select the linked object and switch to its owner document Wybierz połączony obiekt i przełącz się na dokument źródłowy @@ -9547,12 +9557,12 @@ bieżącej kopii zostaną utracone. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Przejdź do najgłębiej połączonego obiektu - + Select the deepest linked object and switch to its owner document Wybierz najgłębiej powiązany obiekt i przejdź do dokumentu źródłowego @@ -9560,12 +9570,12 @@ bieżącej kopii zostaną utracone. StdCmdLinkUnlink - + Unlink Usuń powiązanie - + Strip on level of link Usuwa poziom powiązania @@ -9798,9 +9808,11 @@ bieżącej kopii zostaną utracone. Utwórz część - - Create a new part and make it active - Stwórz nową część i ustaw ją jako aktywną + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10101,48 +10113,20 @@ bieżącej kopii zostaną utracone. Inspektor sceny - - StdCmdSelBack - - - &Back - Przywróć wybór - - - - - Go back to previous selection - Przywróć poprzednie zaznaczenie - - StdCmdSelBoundingBox - + &Bounding box &Ramka otaczająca - - + + Show selection bounding box Pokaż ramkę otaczającą - - StdCmdSelForward - - - &Forward - Ponów wybór - - - - - Repeat the backed selection - Ponawia poprzednio cofnięte zaznaczenie - - StdCmdSelectAll @@ -10454,13 +10438,13 @@ bieżącej kopii zostaną utracone. StdCmdTreeViewActions - + TreeView actions Akcje widoku drzewa - - + + TreeView behavior options and actions Opcje i działania na Widoku drzewa @@ -10960,7 +10944,7 @@ bieżącej kopii zostaną utracone. Fullscreen - Pełny ekran + Cały ekran @@ -11000,13 +10984,13 @@ bieżącej kopii zostaną utracone. StdRecallWorkingView - + Recall working view Przywróć widok roboczy - - + + Recall previously stored temporary working view Przywróć wcześniej zapisany tymczasowy widok roboczy @@ -11014,13 +10998,13 @@ bieżącej kopii zostaną utracone. StdStoreWorkingView - + Store working view Przechowaj widok roboczy - - + + Store a document-specific temporary working view Przechowaj tymczasowy widok roboczy specyficzny dla dokumentacji @@ -11028,13 +11012,13 @@ bieżącej kopii zostaną utracone. StdTreeCollapseDocument - + Collapse/Expand Zwiń / Rozwiń - - + + Expand active document and collapse all others Wyświetl aktywny dokument i schowaj pozostałe @@ -11042,12 +11026,12 @@ bieżącej kopii zostaną utracone. StdTreeDrag - + Initiate dragging Rozpocznij przeciąganie - + Initiate dragging of current selected tree items Rozpocznij przeciąganie zaznaczonych elementów drzewa @@ -11055,13 +11039,13 @@ bieżącej kopii zostaną utracone. StdTreeMultiDocument - + Multi document Wiele dokumentów - - + + Display all documents in the tree view Wyświetl wszystkie dokumenty w widoku drzewa @@ -11069,12 +11053,12 @@ bieżącej kopii zostaną utracone. StdTreePreSelection - + Pre-selection Wybór wstępny - + Preselect the object in 3D view when mouse over the tree item Wyróżnij obiekt w oknie widoku 3D, gdy kursor myszki znajduje się nad pozycją drzewa @@ -11082,12 +11066,12 @@ bieżącej kopii zostaną utracone. StdTreeRecordSelection - + Record selection Zapisz zaznaczenie - + Record selection in tree view in order to go back/forward using navigation button Zapisuj zaznaczenie w widoku drzewa, aby cofnąć / ponowić za pomocą przycisku nawigacji @@ -11109,13 +11093,13 @@ bieżącej kopii zostaną utracone. StdTreeSingleDocument - + Single document Jeden dokument - - + + Only display the active document in the tree view Wyświetl tylko aktywne dokumenty w widoku drzewa @@ -11123,12 +11107,12 @@ bieżącej kopii zostaną utracone. StdTreeSyncPlacement - + Sync placement Synchronizuj położenie - + Auto adjust placement on drag and drop objects across coordinate systems Automatyczne dostosowywanie położenia obiektów w układach współrzędnych podczas przeciągania i upuszczania @@ -11136,12 +11120,12 @@ bieżącej kopii zostaną utracone. StdTreeSyncSelection - + Sync selection Synchronizuj wybrane - + Auto expand tree item when the corresponding object is selected in 3D view Automatycznie rozwiń drzewko gdy odpowiedni obiekt jest zaznaczony w oknie widoku 3D @@ -11149,12 +11133,12 @@ bieżącej kopii zostaną utracone. StdTreeSyncView - + Sync view Synchronizuj widok - + Auto switch to the 3D view containing the selected item Przełącz automatycznie do widoku 3D zawierającego wybrany element @@ -11206,7 +11190,7 @@ bieżącej kopii zostaną utracone. Fullscreen - Cały ekran + Pełny ekran @@ -11389,7 +11373,7 @@ Czy chcesz zapisać dokument teraz? Std_Group - + Group Grupa @@ -11436,7 +11420,7 @@ Czy nadal chcesz kontynuować? Tree view item background padding. - Wypełnienie tła pozycji Widoku drzewa. + Wypełnienie tła pozycji w Widoku drzewa. @@ -11559,7 +11543,7 @@ Czy nadal chcesz kontynuować? Macro - Makropolecenia + Makrodefinicje @@ -12087,12 +12071,12 @@ po uruchomieniu FreeCAD NaviCubeDraggableCmd - + Movable navigation cube Ruchoma kostka nawigacyjna - + Drag and place NaviCube Przeciągnij i umieść Kostkę nawigacyjną @@ -12945,13 +12929,39 @@ Teraz można użyć motywu, aby uzyskać pełną personalizację interfejsu. Export dependency graph... - Export dependency graph... + Eksportuj wykres zależności ... Export the dependency graph to a file - Export the dependency graph to a file + Eksportuj wykres zależności do pliku + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_pt-BR.ts b/src/Gui/Language/FreeCAD_pt-BR.ts index 8f7b005a31..b0777c24de 100644 --- a/src/Gui/Language/FreeCAD_pt-BR.ts +++ b/src/Gui/Language/FreeCAD_pt-BR.ts @@ -137,22 +137,22 @@ Criar grupo de links - + Make link Criar link - + Make sub-link Criar sub-link - + Import links Importar links - + Import all links Importar todos os links @@ -167,12 +167,12 @@ Inserir documento de texto - + Add a part Adicionar uma peça - + Add a group Adicionar um grupo @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Configurações da câmera - + Orientation Orientação - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vista atual @@ -1819,17 +1819,17 @@ simultaneamente. Aquele com a maior prioridade será acionado. Find file: - Find file: + Localizar arquivo: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Busca por nomes de arquivos, expressões regulares suportadas Find in files: - Find in files: + Localizar arquivo: @@ -3962,7 +3962,7 @@ Você também pode usar o formulário: João Silva <joao@silva.com>Gui::Dialog::DlgSettingsNavigation - + Navigation Navegação @@ -4056,35 +4056,60 @@ Você também pode usar o formulário: João Silva <joao@silva.com>Base color for all elements Cor base para todos os elementos + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navegação 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Mostra as configurações dos botões do mouse para cada configuração de navegação escolhida. Selecione um conjunto e, em seguida, pressione o botão para visualizar as referidas configurações. - + Mouse... Mouse... - + Navigation settings set Configurações de navegação definidas - + Orbit style Estilo de orbita - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4095,116 +4120,116 @@ Girarmesa a parte será girada em torno do eixo z (com eixos limitados). Girarmesa livre: a parte será girada em torno do eixo z. - + Turntable Plataforma - + Trackball Trackball - + Free Turntable Girarmesa Livre - + Rotation mode Modo de rotação - + Rotations in 3D will use current cursor position as center for rotation Rotações de câmera usarão a posição atual do cursor como centro de rotação - + Window center Centro da janela - + Drag at cursor Arraste no cursor - + Object center Centro do objeto - + Default camera orientation Orientação padrão da câmera - + Default camera orientation when creating a new document or selecting the home view Orientação padrão da câmera ao criar um novo documento ou selecionar a vista inicial - + Camera zoom Zoom da Câmera - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Define o zoom da câmera para novos documentos. O valor é o diâmetro de uma esfera que caberia na tela. - + mm mm - + Enable animated rotations Habilitar rotações animadas - + Enable animation Habilitar animação - + Zoom operations will be performed at position of mouse pointer Operações de zoom serão realizadas a partir da posição do cursor do mouse - + Zoom at cursor Zoom no cursor - + Zoom step Aumento do zoom - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Quanto será ampliado. O intervalo de ampliação '1' significa um fator de 7,5 para cada intervalo. - + Direction of zoom operations will be inverted A direção das operações de zoom será invertida - + Invert zoom Inverter o zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4213,67 +4238,57 @@ Afeta somente o estilo de navegação por gesto. A inclinação do mouse não está afetada por esta configuração. - + Disable touchscreen tilt gesture Desativar o gesto de inclinação da tela sensível ao toque - - Show the rotation center when dragging. - Mostrar o centro de rotação quando arrastar. - - - - Enable rotation center indication - Ativar indicação do centro de rotação - - - + Isometric Isométrico - + Dimetric Diamétrico - + Trimetric Trimétrico - + Top Topo - + Front Frente - + Left Esquerda - + Right Direito - + Rear Traseira - + Bottom De baixo - + Custom Personalizado @@ -4457,7 +4472,7 @@ Valores maiores facilitam a seleção, mas podem impedir a seleção de objetos Color Bar - Color Bar + Barra de cores @@ -5831,13 +5846,13 @@ Deseja salvar as alterações? Gui::FileChooser - - + + Select a file Selecione um arquivo - + Select a directory Selecione um diretório @@ -5845,13 +5860,13 @@ Deseja salvar as alterações? Gui::FileDialog - + Save as Salvar como - - + + Open Abrir @@ -5859,12 +5874,12 @@ Deseja salvar as alterações? Gui::FileOptionsDialog - + Extended Extendido - + All files (*.*) Todos os arquivos (*.*) @@ -6812,20 +6827,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Selecione o módulo - + Open %1 as Abrir %1 como - - - Select - Selecionar - Gui::StdCmdDescription @@ -7865,7 +7875,7 @@ Do you want to specify another directory? This system is running OpenGL %1.%2. FreeCAD requires OpenGL 2.0 or above. Please upgrade your graphics driver and/or card as required. - This system is running OpenGL %1.%2. FreeCAD requires OpenGL 2.0 or above. Please upgrade your graphics driver and/or card as required. + Este sistema está rodando OpenGL %1.%2. FreeCAD requer OpenGL 2.0 ou superior. Por favor, atualize seu driver gráfico e/ou sua placa de vídeo conforme necessário. @@ -8224,7 +8234,7 @@ Do you want to continue? Muitas notificações não intrusivas abertas. Notificações estão sendo omitidas! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8233,44 +8243,44 @@ Do you want to continue? - + Are you sure you want to continue? Tem certeza que deseja continuar? - + Please check report view for more... Por favor, verifique o relatório de visualização para mais... - + Physical path: Caminho físico: - - + + Document: Documento: - - + + Path: Caminho: - + Identical physical path Caminho físico idêntico - + Could not save document Não foi possível salvar o documento - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8283,102 +8293,102 @@ Would you like to save the file with a different name? Salvar o arquivo com um nome diferente? - - - + + + Saving aborted Salvamento abortado - + Save dependent files Salvar arquivos dependentes - + The file contains external dependencies. Do you want to save the dependent files, too? O arquivo contém dependências externas. Deseja também salvar os arquivos dependentes? - - + + Saving document failed Falha ao salvar documento - + Save document under new filename... Salvar documento sob novo nome ... - - + + Save %1 Document Salvar documento %1 - + Document Documento - - + + Failed to save document Falha ao salvar o documento - + Documents contains cyclic dependencies. Do you still want to save them? Os documentos contêm dependências cíclicas. Deseja salvá-los mesmo assim? - + Save a copy of the document under new filename... Salve uma cópia do documento com um novo nome de arquivo... - + %1 document (*.FCStd) documento %1 (*.FCStd) - + Document not closable O documento não pode ser fechado - + The document is not closable for the moment. O documento não pode ser fechado neste momento. - + Document not saved Documento não salvo - + The document%1 could not be saved. Do you want to cancel closing it? O documento%1 não pode ser salvo. Cancelar o fechamento? - + Undo Desfazer - + Redo Refazer - + There are grouped transactions in the following documents with other preceding transactions Existem transações agrupadas com outras transações anteriores nos seguintes documentos - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8459,12 +8469,12 @@ Please open a browser window and type in: http://localhost:%1. Opções... - + Out of memory Memória insuficiente - + Not enough memory available to display the data. Não há memória suficiente para exibir os dados. @@ -8490,7 +8500,7 @@ Please open a browser window and type in: http://localhost:%1. Mover a anotação - + Transform Transformar @@ -8556,14 +8566,14 @@ Please open a browser window and type in: http://localhost:%1. %1 não está vazio. Excluir seu conteúdo também? - + Translation: Translação: Translation XY: - Translation XY: + Translação XY: @@ -8604,32 +8614,32 @@ Please open a browser window and type in: http://localhost:%1. Falha ao criar um grupo de vínculos - + Create link failed Falha ao criar um vínculo - + Failed to create relative link Falha ao criar um vínculo relativo - + Unlink failed Falha ao desvincular - + Replace link failed A substituição de vínculo falhou - + Failed to import links Falha ao importar links - + Failed to import all links Falha ao importar todos os vínculos @@ -9341,14 +9351,14 @@ cópia atual será perdida. StdCmdGroup - + Create group Criar grupo - - Create a new group for ordering objects - Criar um grupo novo para ordenar objetos + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9406,13 +9416,13 @@ cópia atual será perdida. StdCmdLinkActions - + Link actions Ações de vínculos - - + + Actions that apply to link objects Ações que se aplicam a objetos vinculados @@ -9420,12 +9430,12 @@ cópia atual será perdida. StdCmdLinkImport - + Import links Importar links - + Import selected external link(s) Importar vínculos externos selecionados @@ -9433,12 +9443,12 @@ cópia atual será perdida. StdCmdLinkImportAll - + Import all links Importar todos os links - + Import all links of the active document Importar todos os vínculos do documento ativo @@ -9451,9 +9461,9 @@ cópia atual será perdida. Criar link - - Create a link to the selected object(s) - Criar um vínculo para o(s) objeto(s) selecionado(s) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9472,12 +9482,12 @@ cópia atual será perdida. StdCmdLinkMakeRelative - + Make sub-link Criar sub-link - + Create a sub-object or sub-element link Criar um vínculo para sub-objeto ou sub-elemento @@ -9485,12 +9495,12 @@ cópia atual será perdida. StdCmdLinkReplace - + Replace with link Substituir por vínculo - + Replace the selected object(s) with link Substituir o(s) objeto(s) selecionado(s) por um vínculo @@ -9498,13 +9508,13 @@ cópia atual será perdida. StdCmdLinkSelectActions - + Link navigation Navegação em vínculos - - + + Link navigation actions Ações de navegação em vínculos @@ -9512,12 +9522,12 @@ cópia atual será perdida. StdCmdLinkSelectAllLinks - + Select all links Selecionar todos os links - + Select all links to the current selected object Selecionar todos os vínculos para o objeto selecionado @@ -9525,12 +9535,12 @@ cópia atual será perdida. StdCmdLinkSelectLinked - + Go to linked object Ir para o objeto vinculado - + Select the linked object and switch to its owner document Seleciona o objeto vinculado e muda para o documento onde ele está inserido @@ -9538,12 +9548,12 @@ cópia atual será perdida. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Ir para o mais profundo objeto vinculado - + Select the deepest linked object and switch to its owner document Seleciona o objeto mais profundo vinculado e muda para o documento onde está inserido @@ -9551,12 +9561,12 @@ cópia atual será perdida. StdCmdLinkUnlink - + Unlink Desvincular - + Strip on level of link Retirar um nível do vínculo @@ -9789,9 +9799,11 @@ cópia atual será perdida. Criar peça - - Create a new part and make it active - Criar uma nova peça e torná-la ativa + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10092,48 +10104,20 @@ cópia atual será perdida. Inspetor de cena - - StdCmdSelBack - - - &Back - &Voltar - - - - - Go back to previous selection - Voltar para a seleção anterior - - StdCmdSelBoundingBox - + &Bounding box &Caixa delimitadora - - + + Show selection bounding box Mostrar caixa delimitadora da seleção - - StdCmdSelForward - - - &Forward - &Avançar - - - - - Repeat the backed selection - Repetir a seleção salva - - StdCmdSelectAll @@ -10445,13 +10429,13 @@ cópia atual será perdida. StdCmdTreeViewActions - + TreeView actions Ações de Exibição em Árvore - - + + TreeView behavior options and actions Opções e ações da exibição em árvore @@ -10991,13 +10975,13 @@ cópia atual será perdida. StdRecallWorkingView - + Recall working view Revocar vista de trabalho - - + + Recall previously stored temporary working view Revocar vista de trabalho temporária previamente armazenada @@ -11005,13 +10989,13 @@ cópia atual será perdida. StdStoreWorkingView - + Store working view Guardar vista de trabalho - - + + Store a document-specific temporary working view Guardar uma vista de trabalho temporária específica do documento @@ -11019,13 +11003,13 @@ cópia atual será perdida. StdTreeCollapseDocument - + Collapse/Expand Recolher/Expandir - - + + Expand active document and collapse all others Expandir documento ativo e recolher todos os outros @@ -11033,12 +11017,12 @@ cópia atual será perdida. StdTreeDrag - + Initiate dragging Iniciar arrastamento - + Initiate dragging of current selected tree items Iniciar arrastamento dos itens selecionados da árvore @@ -11046,13 +11030,13 @@ cópia atual será perdida. StdTreeMultiDocument - + Multi document Multi-documento - - + + Display all documents in the tree view Exibir todos os documentos na exibição em árvore @@ -11060,12 +11044,12 @@ cópia atual será perdida. StdTreePreSelection - + Pre-selection Pré-seleção - + Preselect the object in 3D view when mouse over the tree item Pré-selecionar o objeto na vista 3D quando o mouse passa sobre o item na árvore @@ -11073,12 +11057,12 @@ cópia atual será perdida. StdTreeRecordSelection - + Record selection Gravar seleção - + Record selection in tree view in order to go back/forward using navigation button Lembrar a seleção na árvore para voltar/avançar usando os botões de navegação @@ -11100,13 +11084,13 @@ cópia atual será perdida. StdTreeSingleDocument - + Single document Documento único - - + + Only display the active document in the tree view Exibir apenas o documento ativo na exibição em árvore @@ -11114,12 +11098,12 @@ cópia atual será perdida. StdTreeSyncPlacement - + Sync placement Sincronizar posição - + Auto adjust placement on drag and drop objects across coordinate systems Ajustar posicionamento automaticamente ao arrastar e soltar objetos entre sistemas de coordenadas @@ -11127,12 +11111,12 @@ cópia atual será perdida. StdTreeSyncSelection - + Sync selection Sincronizar seleção - + Auto expand tree item when the corresponding object is selected in 3D view Expande automaticamente o item na árvore quando o objeto correspondente for selecionado na vista 3D @@ -11140,12 +11124,12 @@ cópia atual será perdida. StdTreeSyncView - + Sync view Sincronizar vista - + Auto switch to the 3D view containing the selected item Ir automaticamente para a vista 3D que contém o item selecionado @@ -11380,7 +11364,7 @@ Deseja salvar o documento agora? Std_Group - + Group Grupo @@ -12077,12 +12061,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Cubo de navegação móvel - + Drag and place NaviCube Arraste e posicione o NaviCube @@ -12941,4 +12925,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_pt-PT.ts b/src/Gui/Language/FreeCAD_pt-PT.ts index 116e667838..3ba26214a6 100644 --- a/src/Gui/Language/FreeCAD_pt-PT.ts +++ b/src/Gui/Language/FreeCAD_pt-PT.ts @@ -137,22 +137,22 @@ Criar grupo de ligações - + Make link Criar ligação - + Make sub-link Make sub-link - + Import links Importar ligações - + Import all links Importar todas as ligações @@ -167,12 +167,12 @@ Inserir documento de texto - + Add a part Adicionar parte - + Add a group Adicionar grupo @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Definições da câmara - + Orientation Orientação - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vista atual @@ -1819,7 +1819,7 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Localizar ficheiro: @@ -1829,7 +1829,7 @@ same time. The one with the highest priority will be triggered. Find in files: - Find in files: + Procurar em arquivos: @@ -3963,7 +3963,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navegação @@ -4057,35 +4057,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navegação 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. - + Mouse... Rato ... - + Navigation settings set Navigation settings set - + Orbit style Estilo da Órbita - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4096,116 +4121,116 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable Plataforma giratória - + Trackball Trackball - + Free Turntable Free Turntable - + Rotation mode Modo de Rotação - + Rotations in 3D will use current cursor position as center for rotation Rotations in 3D will use current cursor position as center for rotation - + Window center Window center - + Drag at cursor Drag at cursor - + Object center Centro do objeto - + Default camera orientation Default camera orientation - + Default camera orientation when creating a new document or selecting the home view Default camera orientation when creating a new document or selecting the home view - + Camera zoom Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. - + mm mm - + Enable animated rotations Enable animated rotations - + Enable animation Ativar animação - + Zoom operations will be performed at position of mouse pointer Zoom operations will be performed at position of mouse pointer - + Zoom at cursor Zoom no cursor - + Zoom step Zoom step - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. - + Direction of zoom operations will be inverted Direction of zoom operations will be inverted - + Invert zoom Inverter Zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4214,67 +4239,57 @@ Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - + Disable touchscreen tilt gesture Desativar o gesto de inclinação da tela sensível ao toque - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Isométrica - + Dimetric Dimetrica - + Trimetric Trimétrica - + Top Topo - + Front Frente - + Left Esquerda - + Right Direita - + Rear Traseira - + Bottom De baixo - + Custom Personalizado @@ -4460,22 +4475,22 @@ Larger value eases to pick things, but can make small features impossible to sel Color Bar - Color Bar + Barra de cores Label text color - Label text color + Cor do texto Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Cor da barra de cores (usada na cor do texto de malha e FEM Wbs) Label text size - Label text size + Tamanho do texto do rótulo @@ -5835,13 +5850,13 @@ Deseja guardar as suas alterações? Gui::FileChooser - - + + Select a file Selecionar um Ficheiro - + Select a directory Selecionar uma Pasta @@ -5849,13 +5864,13 @@ Deseja guardar as suas alterações? Gui::FileDialog - + Save as Guardar Como - - + + Open Abrir @@ -5863,12 +5878,12 @@ Deseja guardar as suas alterações? Gui::FileOptionsDialog - + Extended Estendido - + All files (*.*) Todos os Ficheiros (*.*) @@ -5996,7 +6011,7 @@ Deseja guardar as suas alterações? Graphviz format - Graphviz format + Formato do Gráfico @@ -6817,20 +6832,15 @@ Deseja sair sem guardar os seus dados? Gui::SelectModule - + Select module Selecionar Módulo - + Open %1 as Abrir %1 Como - - - Select - Selecionar - Gui::StdCmdDescription @@ -8231,7 +8241,7 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8240,44 +8250,44 @@ Do you want to continue? - + Are you sure you want to continue? Tem certeza que deseja continuar? - + Please check report view for more... Please check report view for more... - + Physical path: Physical path: - - + + Document: Document: - - + + Path: Caminho: - + Identical physical path Identical physical path - + Could not save document Could not save document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8290,102 +8300,102 @@ Would you like to save the file with a different name? Would you like to save the file with a different name? - - - + + + Saving aborted Guardar interrompido - + Save dependent files Guardar ficheiros dependentes - + The file contains external dependencies. Do you want to save the dependent files, too? O ficheiro contém dependências externas. Você também deseja guardar os ficheiros dependentes? - - + + Saving document failed Salvar o documento falhou - + Save document under new filename... Guardar o documento sob um novo nome de ficheiro... - - + + Save %1 Document Guardar Documento %1 - + Document Documento - - + + Failed to save document Falha ao guardar documento - + Documents contains cyclic dependencies. Do you still want to save them? Documentos contém dependências cíclicas. Você ainda deseja salvá-los? - + Save a copy of the document under new filename... Guardar uma cópia do documento com um novo nome... - + %1 document (*.FCStd) documento %1 (*.FCStd) - + Document not closable O documento não pode ser fechado - + The document is not closable for the moment. O documento não pode ser fechado neste momento. - + Document not saved Document not saved - + The document%1 could not be saved. Do you want to cancel closing it? The document%1 could not be saved. Do you want to cancel closing it? - + Undo Desfazer - + Redo Refazer - + There are grouped transactions in the following documents with other preceding transactions There are grouped transactions in the following documents with other preceding transactions - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8468,12 +8478,12 @@ Por favor, abra um navegador e digite: http://localhost:%1. Opções ... - + Out of memory Sem Memória - + Not enough memory available to display the data. Não há memória disponível para visualizar os dados. @@ -8499,7 +8509,7 @@ Por favor, abra um navegador e digite: http://localhost:%1. Mover a anotação - + Transform Transformar @@ -8565,14 +8575,14 @@ Por favor, abra um navegador e digite: http://localhost:%1. O %1 não está vazio, Apagar o seu conteúdo também? - + Translation: Tradução: Translation XY: - Translation XY: + Deslocamento XY: @@ -8613,32 +8623,32 @@ Por favor, abra um navegador e digite: http://localhost:%1. Create link group failed - + Create link failed Falha ao criar ligação - + Failed to create relative link Failed to create relative link - + Unlink failed Unlink failed - + Replace link failed Falha ao substituir ligação - + Failed to import links Falha ao importar ligações - + Failed to import all links Falha ao importar todas as ligações @@ -9350,14 +9360,14 @@ the current copy will be lost. StdCmdGroup - + Create group Criar grupo - - Create a new group for ordering objects - Criar um grupo novo para ordenar objetos + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9415,13 +9425,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Link actions - - + + Actions that apply to link objects Actions that apply to link objects @@ -9429,12 +9439,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Importar ligações - + Import selected external link(s) Import selected external link(s) @@ -9442,12 +9452,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Importar todas as ligações - + Import all links of the active document Import all links of the active document @@ -9460,9 +9470,9 @@ the current copy will be lost. Criar ligação - - Create a link to the selected object(s) - Create a link to the selected object(s) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9481,12 +9491,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Make sub-link - + Create a sub-object or sub-element link Create a sub-object or sub-element link @@ -9494,12 +9504,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Replace with link - + Replace the selected object(s) with link Replace the selected object(s) with link @@ -9507,13 +9517,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Link navigation - - + + Link navigation actions Link navigation actions @@ -9521,12 +9531,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Select all links - + Select all links to the current selected object Select all links to the current selected object @@ -9534,12 +9544,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Go to linked object - + Select the linked object and switch to its owner document Select the linked object and switch to its owner document @@ -9547,12 +9557,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Go to the deepest linked object - + Select the deepest linked object and switch to its owner document Select the deepest linked object and switch to its owner document @@ -9560,12 +9570,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Unlink - + Strip on level of link Strip on level of link @@ -9798,9 +9808,11 @@ the current copy will be lost. Criar peça - - Create a new part and make it active - Criar uma nova peça e torná-la ativa + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10101,48 +10113,20 @@ the current copy will be lost. Inspetor de cena - - StdCmdSelBack - - - &Back - &Voltar - - - - - Go back to previous selection - Voltar para a seleção anterior - - StdCmdSelBoundingBox - + &Bounding box &Bounding box - - + + Show selection bounding box Show selection bounding box - - StdCmdSelForward - - - &Forward - &Avançar - - - - - Repeat the backed selection - Repeat the backed selection - - StdCmdSelectAll @@ -10454,13 +10438,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions TreeView actions - - + + TreeView behavior options and actions TreeView behavior options and actions @@ -11000,13 +10984,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11014,13 +10998,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11028,13 +11012,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Colapsar/Expandir - - + + Expand active document and collapse all others Expandir o documento ativo e colapsar todos os outros @@ -11042,12 +11026,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Iniciar arrastar - + Initiate dragging of current selected tree items Initiate dragging of current selected tree items @@ -11055,13 +11039,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Multi document - - + + Display all documents in the tree view Mostrar todos os documentos na vista em árvore @@ -11069,12 +11053,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Pré-seleção - + Preselect the object in 3D view when mouse over the tree item Preselect the object in 3D view when mouse over the tree item @@ -11082,12 +11066,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Record selection - + Record selection in tree view in order to go back/forward using navigation button Record selection in tree view in order to go back/forward using navigation button @@ -11109,13 +11093,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Documento único - - + + Only display the active document in the tree view Mostrar somente o documento ativo na vista em árvore @@ -11123,12 +11107,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Sync placement - + Auto adjust placement on drag and drop objects across coordinate systems Auto adjust placement on drag and drop objects across coordinate systems @@ -11136,12 +11120,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Seleção de sincronização - + Auto expand tree item when the corresponding object is selected in 3D view Auto expand tree item when the corresponding object is selected in 3D view @@ -11149,12 +11133,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Visualização de sincronização - + Auto switch to the 3D view containing the selected item Auto switch to the 3D view containing the selected item @@ -11389,7 +11373,7 @@ Do you want to save the document now? Std_Group - + Group Grupo @@ -12087,12 +12071,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12953,4 +12937,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_ro.ts b/src/Gui/Language/FreeCAD_ro.ts index eb7918820b..7146fc32fb 100644 --- a/src/Gui/Language/FreeCAD_ro.ts +++ b/src/Gui/Language/FreeCAD_ro.ts @@ -137,22 +137,22 @@ Creează un grup cu legătură - + Make link Creează o legătură - + Make sub-link Creează o sub-legătură - + Import links Importă legături - + Import all links Importă toate legăturile @@ -167,12 +167,12 @@ Inserează un document text - + Add a part Adaugă o componentă - + Add a group Adaugă un grup @@ -778,37 +778,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Setari camera - + Orientation Orientarea - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vedere curentă @@ -3963,7 +3963,7 @@ Puteți folosi și formatul: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navigare @@ -4057,35 +4057,60 @@ Puteți folosi și formatul: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navigare 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Listează configurările butonului mouse-ului pentru fiecare setare de navigare aleasă. Selectează un set și apoi apasă butonul pentru a vedea configurația menționată. - + Mouse... Mouse... - + Navigation settings set Set de setări de navigație - + Orbit style Stil de rotație - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4096,116 +4121,116 @@ Turntable: partea va fi rotită în jurul axei z (cu axe constrânse). Gratuit de întoarcere: partea va fi rotită în jurul axei z. - + Turntable Placa turnantă - + Trackball Trackball - + Free Turntable Gratuit de Turntable - + Rotation mode Modul de rotație - + Rotations in 3D will use current cursor position as center for rotation Rotațiile în 3D vor utiliza poziția curentă a cursorului ca centru de rotație - + Window center Centrul ferestrei - + Drag at cursor Trageți la cursor - + Object center Centrul obiectului - + Default camera orientation Orientarea implicită a camerei - + Default camera orientation when creating a new document or selecting the home view Orientarea implicită a camerei la crearea unui nou document sau la selectarea vizualizării de bază - + Camera zoom Zoom cameră - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Setează zoom-ul camerei pentru documentele noi. Valoarea este diametrul sferei pentru a o potrivi pe ecran. - + mm mm - + Enable animated rotations Activează rotaţiile animate - + Enable animation Activează animaţia - + Zoom operations will be performed at position of mouse pointer Operațiunile de zoom vor fi efectuate la poziția indicatorului mouse-ului - + Zoom at cursor Mareste la pozitia cursorului - + Zoom step Pas de mărire - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Cât de mult va fi mărit. Pasul de mărire de '1' înseamnă un factor de 7,5 pentru fiecare pas de mărire. - + Direction of zoom operations will be inverted Direcția operațiunilor de zoom va fi inversată - + Invert zoom Inverseaza zoom-ul - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4214,67 +4239,57 @@ Afectează numai stilul de navigare prin gesturi. Înclinarea cu mouse-ul nu este dezactivată de această setare. - + Disable touchscreen tilt gesture Dezactivaţi inclinarea prin gest a ecranului tactil - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Izometrică - + Dimetric Dimetric - + Trimetric Trimetric - + Top Partea de sus - + Front Din față - + Left Stanga - + Right Dreapta - + Rear Din spate - + Bottom Partea de jos - + Custom Personalizat @@ -5834,13 +5849,13 @@ Doriți să salvați modificările? Gui::FileChooser - - + + Select a file Selectaţi un fişier - + Select a directory Selectaţi un director @@ -5848,13 +5863,13 @@ Doriți să salvați modificările? Gui::FileDialog - + Save as Salvare ca - - + + Open Deschide @@ -5862,12 +5877,12 @@ Doriți să salvați modificările? Gui::FileOptionsDialog - + Extended Extins - + All files (*.*) Toate fişierele (*.*) @@ -6816,20 +6831,15 @@ Doriți să ieşiți fără a salva datele dumneavoastră? Gui::SelectModule - + Select module Selectaţi modulul - + Open %1 as Deschide '%1' ca - - - Select - Selectaţi - Gui::StdCmdDescription @@ -8232,7 +8242,7 @@ Doriţi să continuaţi? Prea multe notificări neintruzive deschise. Notificările sunt omise! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8241,44 +8251,44 @@ Doriţi să continuaţi? - + Are you sure you want to continue? Are you sure you want to continue? - + Please check report view for more... Vă rugăm să verificați vizualizarea raportului pentru mai multe... - + Physical path: Calea fizică: - - + + Document: Documentul: - - + + Path: Cale: - + Identical physical path Cale fizică identică - + Could not save document Documentul nu a putut fi salvat - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8291,102 +8301,102 @@ Would you like to save the file with a different name? Doriți să salvați fișierul cu alt nume? - - - + + + Saving aborted Salvarea a fost anulată - + Save dependent files Salvează fișierele dependente - + The file contains external dependencies. Do you want to save the dependent files, too? Fișierul conține dependențe externe. Doriți să salvați și fișierele dependente? - - + + Saving document failed Salvarea documentului a eșuat - + Save document under new filename... Salvaţi documentul sub un nume nou... - - + + Save %1 Document Salvaţi documentul %1 - + Document Documentul - - + + Failed to save document Salvarea documentului nu a reușit - + Documents contains cyclic dependencies. Do you still want to save them? Documentele conţin dependenţe ciclice. Mai doriţi să le salvaţi? - + Save a copy of the document under new filename... Salvați o copie a documentului sub un nou nume de fişier... - + %1 document (*.FCStd) Documentul %1 (*.FCStd) - + Document not closable Documentul nu se poate închide - + The document is not closable for the moment. Documentul nu se poate închide momentan. - + Document not saved Document nesalvat - + The document%1 could not be saved. Do you want to cancel closing it? Documentul%1 nu a putut fi salvat. Doriți să renunțați la închiderea acestuia? - + Undo Undo - + Redo Redo - + There are grouped transactions in the following documents with other preceding transactions Există tranzacții grupate cu alte tranzacții anterioare în următoarele documente - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8467,12 +8477,12 @@ Please open a browser window and type in: http://localhost:%1. Opţiuni... - + Out of memory Memorie insuficientă - + Not enough memory available to display the data. Insuficientă memorie disponibilă pentru a afişa datele. @@ -8498,7 +8508,7 @@ Please open a browser window and type in: http://localhost:%1. Muta adnotarea - + Transform Transformare @@ -8564,7 +8574,7 @@ Please open a browser window and type in: http://localhost:%1. %1 nu este vid, suprimați totuși conținutul ? - + Translation: Traducere: @@ -8612,32 +8622,32 @@ Please open a browser window and type in: http://localhost:%1. Crearea grupului cu legături a eșuat - + Create link failed Crearea legăturii a eșuat - + Failed to create relative link Crearea legăturii relative a eșuat - + Unlink failed Ruperea legăturii a eșuat - + Replace link failed Înlocuirea legăturii a eșuat - + Failed to import links Importul legăturilor a eșuat - + Failed to import all links Importul tuturor legăturilor a eșuat @@ -9349,14 +9359,14 @@ copia curentă va fi pierdută. StdCmdGroup - + Create group Creați grupul - - Create a new group for ordering objects - Créați un nou grup pentru ordonarea obiectelor + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9414,13 +9424,13 @@ copia curentă va fi pierdută. StdCmdLinkActions - + Link actions Legați acțiunile - - + + Actions that apply to link objects Acțiuni care se aplică obiectelor de legătură @@ -9428,12 +9438,12 @@ copia curentă va fi pierdută. StdCmdLinkImport - + Import links Importă legături - + Import selected external link(s) Importă legăturile externe selectate @@ -9441,12 +9451,12 @@ copia curentă va fi pierdută. StdCmdLinkImportAll - + Import all links Importă toate legăturile - + Import all links of the active document Importă toate Legăturile documentului activ @@ -9459,9 +9469,9 @@ copia curentă va fi pierdută. Creează o legătură - - Create a link to the selected object(s) - Creați o legătură către obiectul(ele) selectat(e) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9480,12 +9490,12 @@ copia curentă va fi pierdută. StdCmdLinkMakeRelative - + Make sub-link Creează o sub-legătură - + Create a sub-object or sub-element link Creaţi un sub-obiect sau un sub-element legătură @@ -9493,12 +9503,12 @@ copia curentă va fi pierdută. StdCmdLinkReplace - + Replace with link Înlocuiește cu o legătură - + Replace the selected object(s) with link Înlocuiți obiectul(ele) selectat(e) cu o legătură @@ -9506,13 +9516,13 @@ copia curentă va fi pierdută. StdCmdLinkSelectActions - + Link navigation Navigare la legătură - - + + Link navigation actions Acțiuni de navigare la legătură @@ -9520,12 +9530,12 @@ copia curentă va fi pierdută. StdCmdLinkSelectAllLinks - + Select all links Selectează toate legăturile - + Select all links to the current selected object Selectați toate legăturile către obiectul curent selectat @@ -9533,12 +9543,12 @@ copia curentă va fi pierdută. StdCmdLinkSelectLinked - + Go to linked object Mergi la obiectul legat - + Select the linked object and switch to its owner document Selectați obiectul legat și comutați la documentul proprietar @@ -9546,12 +9556,12 @@ copia curentă va fi pierdută. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Mergi la cel mai profund obiect legat - + Select the deepest linked object and switch to its owner document Selectați cel mai profund obiect legat și comutați la documentul proprietar @@ -9559,12 +9569,12 @@ copia curentă va fi pierdută. StdCmdLinkUnlink - + Unlink Anularea legăturii - + Strip on level of link Bandă la nivelul link-ului @@ -9797,9 +9807,11 @@ copia curentă va fi pierdută. Creaţi o piesă /Part - - Create a new part and make it active - Creaţi o nouă parte şi a-l face activ + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10100,48 +10112,20 @@ copia curentă va fi pierdută. Inspectorul de scena - - StdCmdSelBack - - - &Back - &Înapoi - - - - - Go back to previous selection - Înapoi la selecția anterioară - - StdCmdSelBoundingBox - + &Bounding box &Casetă de încadrare - - + + Show selection bounding box Arată caseta de încadrare a selecției - - StdCmdSelForward - - - &Forward - &Înainte - - - - - Repeat the backed selection - Repetă selecția suportată - - StdCmdSelectAll @@ -10453,13 +10437,13 @@ copia curentă va fi pierdută. StdCmdTreeViewActions - + TreeView actions Actiuni ale vizualizării arbore - - + + TreeView behavior options and actions Opțiuni de comportament TreeView și acțiuni @@ -10999,13 +10983,13 @@ copia curentă va fi pierdută. StdRecallWorkingView - + Recall working view Recuperare vizualizare lucru - - + + Recall previously stored temporary working view Rechemați modul de lucru temporar stocat anterior @@ -11013,13 +10997,13 @@ copia curentă va fi pierdută. StdStoreWorkingView - + Store working view Vedere de lucru magazin - - + + Store a document-specific temporary working view Salvați un modul de lucru temporar specific documentului @@ -11027,13 +11011,13 @@ copia curentă va fi pierdută. StdTreeCollapseDocument - + Collapse/Expand Restrânge/Extinde - - + + Expand active document and collapse all others Extinde documentul activ și restrângele pe toate celelalte @@ -11041,12 +11025,12 @@ copia curentă va fi pierdută. StdTreeDrag - + Initiate dragging Inițiază glisare - + Initiate dragging of current selected tree items Inițiază glisarea elementelor curent selectate din vederea arborescentă @@ -11054,13 +11038,13 @@ copia curentă va fi pierdută. StdTreeMultiDocument - + Multi document Document multiplu - - + + Display all documents in the tree view Afişează toate documentele în vizualizarea arborescentă @@ -11068,12 +11052,12 @@ copia curentă va fi pierdută. StdTreePreSelection - + Pre-selection Preselecție - + Preselect the object in 3D view when mouse over the tree item Preselectează obiectul în vizualizarea 3D când mouse-ul este deasupra elementului în vizualizarea arborescentă @@ -11081,12 +11065,12 @@ copia curentă va fi pierdută. StdTreeRecordSelection - + Record selection Înregistrare selecție - + Record selection in tree view in order to go back/forward using navigation button Înregistrați selecția în vizualizarea arborelui pentru a merge înapoi/înainte folosind butonul de navigare @@ -11108,13 +11092,13 @@ copia curentă va fi pierdută. StdTreeSingleDocument - + Single document Document unic - - + + Only display the active document in the tree view Afișează doar documentul activ în vizualizarea arborescentă @@ -11122,12 +11106,12 @@ copia curentă va fi pierdută. StdTreeSyncPlacement - + Sync placement Plasare sincronizare - + Auto adjust placement on drag and drop objects across coordinate systems Reglaţi automat plasarea pe tragere şi plasare obiecte între sistemele de coordonate @@ -11135,12 +11119,12 @@ copia curentă va fi pierdută. StdTreeSyncSelection - + Sync selection Sincronizează selecția - + Auto expand tree item when the corresponding object is selected in 3D view Extinde automat vederea arborescentă atunci când obiectul corespunzător este selectat în vizualizarea 3D @@ -11148,12 +11132,12 @@ copia curentă va fi pierdută. StdTreeSyncView - + Sync view Sincronizarea vizualizării - + Auto switch to the 3D view containing the selected item Comutare automată la vizualizarea 3D care conține elementul selectat @@ -11388,7 +11372,7 @@ Doriți să salvați documentul acum? Std_Group - + Group Grup @@ -12086,12 +12070,12 @@ după lansarea FreeCAD NaviCubeDraggableCmd - + Movable navigation cube Cub de navigare mobil - + Drag and place NaviCube Trage și plasează NaviCube @@ -12953,4 +12937,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_ru.ts b/src/Gui/Language/FreeCAD_ru.ts index 5aa8c21aa6..b004b20f14 100644 --- a/src/Gui/Language/FreeCAD_ru.ts +++ b/src/Gui/Language/FreeCAD_ru.ts @@ -137,22 +137,22 @@ Создать группу ссылок - + Make link Создать ссылку - + Make sub-link Сделать доп. ссылку - + Import links Импорт ссылок - + Import all links Импорт всех ссылок @@ -167,12 +167,12 @@ Вставить текстовый документ - + Add a part Добавить деталь - + Add a group Добавить группу @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Настройки камеры - + Orientation Ориентация - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Текущий вид @@ -1382,7 +1382,7 @@ same time. The one with the highest priority will be triggered. none - Отсутствует + отсутствует @@ -1817,22 +1817,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Найти файл: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Поиск по именам файлов без учета регистра, поддерживаются регулярные выражения Find in files: - Find in files: + Найти в файлах: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Фильтровать по содержимому файла без учета регистра, поддерживаются регулярные выражения @@ -2753,7 +2753,7 @@ Specify another directory, please. Help - Справка + Помощь @@ -3326,7 +3326,7 @@ besides the color bar General - Главный + Основные @@ -3834,7 +3834,7 @@ You can also use the form: John Doe <john@doe.com> Macro - Макрос + Макрокоманда @@ -3956,7 +3956,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Навигация @@ -4050,35 +4050,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Основной цвет для всех элементов + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Трёхмерная навигация - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Список настроек кнопки мыши для каждой выбранной настройки навигации. Выберите набор и затем нажмите кнопку, чтобы просмотреть указанные конфигурации. - + Mouse... Подробности стиля управления... - + Navigation settings set Набор настроек навигации - + Orbit style Вращение - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4089,116 +4114,116 @@ Free Turntable: the part will be rotated around the z-axis. Свободное вращение: деталь поворачивается относительно оси Z. - + Turntable Поворотный круг - + Trackball Trackball - + Free Turntable Свободное вращение - + Rotation mode Режим вращения - + Rotations in 3D will use current cursor position as center for rotation Вращение в 3D будет использовать текущую позицию курсора как центр вращения - + Window center Центр окна - + Drag at cursor Перенести к курсору - + Object center Центр объекта - + Default camera orientation Ориентация камеры по умолчанию - + Default camera orientation when creating a new document or selecting the home view Ориентация камеры по умолчанию при создании нового документа или выборе вида "Домой" - + Camera zoom Масштаб камеры - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Устанавливает масштаб камеры для новых документов. Значение - диаметр сферы, помещаемой на экран. - + mm мм - + Enable animated rotations Включить анимированные вращения - + Enable animation Включить анимацию - + Zoom operations will be performed at position of mouse pointer Операции масштабирования будут выполняться в позиции указателя мыши - + Zoom at cursor Зум туда, где мышь - + Zoom step Шаг масштабирования - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Насколько будет масштабировано. Шаг масштаба '1' означает коэффициент 7.5 для каждого шага масштаба. - + Direction of zoom operations will be inverted Направление масштабирования будет инвертировано - + Invert zoom Инвертировать зум - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4207,67 +4232,57 @@ Mouse tilting is not disabled by this setting. Наклон мыши этой настройкой не отключен. - + Disable touchscreen tilt gesture Отключить жест наклона для сенсорного экрана - - Show the rotation center when dragging. - Показывать центр вращения при перетаскивании. - - - - Enable rotation center indication - Включить отображение центра вращения - - - + Isometric Изометрическая - + Dimetric Диметрическая - + Trimetric Триметрическая - + Top Сверху - + Front Спереди - + Left Слева - + Right Справа - + Rear Сзади - + Bottom Снизу - + Custom Произвольный @@ -4319,12 +4334,12 @@ horizontal space in Python console Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Интервал профилировщика Python (миллисекунды): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + Интервал, с которым запускается профилировщик при выполнении кода Python (чтобы графический интерфейс продолжал отвечать). Установите значение 0, чтобы отключить. @@ -4453,27 +4468,27 @@ Larger value eases to pick things, but can make small features impossible to sel Color Bar - Color Bar + Цветовая панель Label text color - Label text color + Цвет текста метки Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + Цветовая полоса (используется в сетке и FEM Wbs) цвет текста метки Label text size - Label text size + Размер шрифта подписи Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + Цветовая полоса (используется в сетке и FEM Wbs) размер текста @@ -5829,13 +5844,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Выберите файл - + Select a directory Выберите папку @@ -5843,13 +5858,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Сохранить как - - + + Open Открыть @@ -5857,12 +5872,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Расширенный - + All files (*.*) Все файлы (*.*) @@ -5990,7 +6005,7 @@ Do you want to save your changes? Graphviz format - Graphviz format + Graphviz формат @@ -6742,7 +6757,7 @@ Do you want to exit without saving your data? none - отсутствует + Отсутствует @@ -6809,20 +6824,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Выбрать модуль - + Open %1 as Открыть %1 как - - - Select - Выбрать - Gui::StdCmdDescription @@ -8226,7 +8236,7 @@ Do you want to continue? Слишком много открытых ненавязчивых уведомлений. Уведомления пропускаются! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8235,44 +8245,44 @@ Do you want to continue? - + Are you sure you want to continue? Вы уверены, что хотите продолжить? - + Please check report view for more... Пожалуйста, проверьте Просмотр отчёта для более подробной информации... - + Physical path: Физический путь: - - + + Document: Документ: - - + + Path: Путь: - + Identical physical path Идентичная физическая траектория - + Could not save document Невозможно сохранить документ - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8285,102 +8295,102 @@ Would you like to save the file with a different name? Хотите сохранить файл под другим именем? - - - + + + Saving aborted Сохранение прервано - + Save dependent files Сохранить зависимые файлы - + The file contains external dependencies. Do you want to save the dependent files, too? Файл содержит внешние зависимости. Хотите ли вы также сохранить зависимые файлы? - - + + Saving document failed Не удалось сохранить документ - + Save document under new filename... Сохранить документ под новым именем... - - + + Save %1 Document Сохранение документа %1 - + Document Документ - - + + Failed to save document Не удалось сохранить документ - + Documents contains cyclic dependencies. Do you still want to save them? Документы содержат циклические зависимости. Вы уверены, что хотите сохранить их? - + Save a copy of the document under new filename... Сохранить копию документа под новым именем файла... - + %1 document (*.FCStd) документ %1 (*.FCStd) - + Document not closable Документ не закрываем - + The document is not closable for the moment. Этот документ не закрываемый на данный момент. - + Document not saved Документ не сохранен - + The document%1 could not be saved. Do you want to cancel closing it? Документ %1 не может быть сохранен. Вы хотите отменить его закрытие? - + Undo Отменить - + Redo Повторить - + There are grouped transactions in the following documents with other preceding transactions В следующих документах имеются группируются транзакции с другими предыдущими транзакциями - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8461,12 +8471,12 @@ Please open a browser window and type in: http://localhost:%1. Параметры... - + Out of memory Недостаточно памяти - + Not enough memory available to display the data. Недостаточно памяти для отображения данных. @@ -8492,7 +8502,7 @@ Please open a browser window and type in: http://localhost:%1. Переместить заметку - + Transform Преобразовать @@ -8558,14 +8568,14 @@ Please open a browser window and type in: http://localhost:%1. %1 не пуст, удалить его содержимое тоже? - + Translation: Перемещение: Translation XY: - Translation XY: + Перевод XY: @@ -8606,32 +8616,32 @@ Please open a browser window and type in: http://localhost:%1. Не удалось создать группу ссылок - + Create link failed Не удалось создать ссылку - + Failed to create relative link Не удалось создать относительную ссылку - + Unlink failed Разрыв связи не удался - + Replace link failed Не удалось заменить ссылку - + Failed to import links Не удалось импортировать ссылки - + Failed to import all links Не удалось импортировать все ссылки @@ -9343,14 +9353,14 @@ the current copy will be lost. StdCmdGroup - + Create group Создать группу - - Create a new group for ordering objects - Создать новую группу для упорядочивания объектов + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9408,13 +9418,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Ссылка - - + + Actions that apply to link objects Действия, применимые к связыванию объектов @@ -9422,12 +9432,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Импорт ссылок - + Import selected external link(s) Импорт выбранных внешних ссылок(ов) @@ -9435,12 +9445,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Импорт всех ссылок - + Import all links of the active document Импортировать все ссылки активного документа @@ -9453,9 +9463,9 @@ the current copy will be lost. Создать ссылку - - Create a link to the selected object(s) - Создать ссылку на выбранный объект(ы) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9474,12 +9484,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Сделать доп. ссылку - + Create a sub-object or sub-element link Создать ссылку на под-объект или под-элемент @@ -9487,12 +9497,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Заменить ссылкой - + Replace the selected object(s) with link Заменить выбранный объект(ы) ссылкой @@ -9500,13 +9510,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Навигация по ссылке - - + + Link navigation actions Действия при переходе по ссылке @@ -9514,12 +9524,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Выбрать все ссылки - + Select all links to the current selected object Выбрать все ссылки на текущий выбранный объект @@ -9527,12 +9537,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Перейти к связанному объекту - + Select the linked object and switch to its owner document Выберите связанный объект и переключитесь на документ владельца @@ -9540,12 +9550,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Перейти на самый глубокий связанный объект - + Select the deepest linked object and switch to its owner document Выберите самый глубокий связанный объект и переключитесь на документ владельца @@ -9553,12 +9563,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Отвязать - + Strip on level of link Выделить на уровне ссылки @@ -9791,9 +9801,11 @@ the current copy will be lost. Создать деталь - - Create a new part and make it active - Создать новую деталь и сделать ее активной + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10094,48 +10106,20 @@ the current copy will be lost. Инспектор сцены - - StdCmdSelBack - - - &Back - Назад - - - - - Go back to previous selection - Вернуться к предыдущему выбору - - StdCmdSelBoundingBox - + &Bounding box Габариты - - + + Show selection bounding box Показать границу выбора - - StdCmdSelForward - - - &Forward - Вперёд - - - - - Repeat the backed selection - Повторите выбор заднего плана - - StdCmdSelectAll @@ -10447,13 +10431,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Действия с деревом - - + + TreeView behavior options and actions Параметры поведения и действий TreeView @@ -10953,7 +10937,7 @@ the current copy will be lost. Fullscreen - Полноэкранный режим + На весь экран @@ -10993,13 +10977,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Вызвать рабочий вид - - + + Recall previously stored temporary working view Вызвать сохранённый ранее временный рабочий вид @@ -11007,13 +10991,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Сохранить рабочий вид - - + + Store a document-specific temporary working view Сохранить временный рабочий вид для документа @@ -11021,13 +11005,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Свернуть/Развернуть - - + + Expand active document and collapse all others Развернуть активный документ и свернуть все остальные @@ -11035,12 +11019,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Инициировать перетаскивание - + Initiate dragging of current selected tree items Инициировать перетаскивание выбранных элементов дерева @@ -11048,13 +11032,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Многокомпонентный документ - - + + Display all documents in the tree view Показать все документы в окне дерева документа @@ -11062,12 +11046,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Предвыборка - + Preselect the object in 3D view when mouse over the tree item Выделить объект в режиме 3D при наведении курсора на элемент дерева @@ -11075,12 +11059,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Записать выделение - + Record selection in tree view in order to go back/forward using navigation button Записывать выделение в дереве для перехода назад / вперед с помощью кнопки навигации @@ -11102,13 +11086,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Одиночный документ - - + + Only display the active document in the tree view Показывать только активный документ в окне дерева документа @@ -11116,12 +11100,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Синхронизировать размещение - + Auto adjust placement on drag and drop objects across coordinate systems Автоматическая настройка размещения при перетаскивании объектов между системами координат @@ -11129,12 +11113,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Синхронизировать выделение - + Auto expand tree item when the corresponding object is selected in 3D view Автоматически разворачивать элемент дерева при выделении соответствующего объекта в 3D виде @@ -11142,12 +11126,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Синхронизировать вид - + Auto switch to the 3D view containing the selected item Автопереключение в 3D вид, содержащий выбранный элемент @@ -11199,7 +11183,7 @@ the current copy will be lost. Fullscreen - На весь экран + Полноэкранный режим @@ -11382,7 +11366,7 @@ Do you want to save the document now? Std_Group - + Group Группа @@ -11542,7 +11526,7 @@ Do you still want to proceed? Help - Помощь + Справка @@ -11552,7 +11536,7 @@ Do you still want to proceed? Macro - Макрокоманда + Макрос @@ -12079,12 +12063,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Подвижный навигационный куб - + Drag and place NaviCube Перетащить и поместить в NaviCube @@ -12339,7 +12323,7 @@ after FreeCAD launches General - Основные + Главный @@ -12935,13 +12919,39 @@ You can now use Theme to get a full customization of the interface. Export dependency graph... - Export dependency graph... + Экспорт графика зависимостей... Export the dependency graph to a file - Export the dependency graph to a file + Экспорт графика зависимостей в файл + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_sl.ts b/src/Gui/Language/FreeCAD_sl.ts index 27630d2562..f8f11e1e47 100644 --- a/src/Gui/Language/FreeCAD_sl.ts +++ b/src/Gui/Language/FreeCAD_sl.ts @@ -137,22 +137,22 @@ Naredi skupino povezav - + Make link Naredi povezavo - + Make sub-link Naredi podpovezavo - + Import links Uvozi povezave - + Import all links Uvozi vse povezave @@ -167,12 +167,12 @@ Vstavi besedilni dokument - + Add a part Dodaj del - + Add a group Dodaj skupino @@ -413,7 +413,7 @@ Default - Privzeti + Privzeto @@ -582,7 +582,7 @@ Press left mouse button - Pritisnite levo miškino tipko + Pritisnite levi miškin gumb @@ -778,37 +778,37 @@ kliknete na levo oz. desno tipko in premikate miško gor oz. dol Gui::Dialog::CameraDialog - + Camera settings Nastavitve kamere - + Orientation Usmerjenost - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Trenutni pogled @@ -889,7 +889,7 @@ kliknete na levo oz. desno tipko in premikate miško gor oz. dol Angle - Kot + Kót @@ -1088,7 +1088,7 @@ Neglede na to ima lastnost v skriptih še vedno polni naziv, kot npr. "obj.Ime_S Name - Naziv + Ime @@ -1385,7 +1385,7 @@ tisti z višjo prednostjo. none - nobeden + brez @@ -3967,7 +3967,7 @@ Lahko uporabite tudi obliko: Neznanec <ne@znanec.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Krmarjenje @@ -4039,7 +4039,7 @@ Lahko uporabite tudi obliko: Neznanec <ne@znanec.com> Default - Privzeto + Privzeti @@ -4061,35 +4061,60 @@ Lahko uporabite tudi obliko: Neznanec <ne@znanec.com> Base color for all elements Osnovna barva vseh predmetov + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D krmarjenje - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Naštej nastavitve miškinih tipk za vsako izbrano nastavitev krmarjenja. Izberite nastavitev in nato pritisnite tipko za pregled navedenih nastavitev. - + Mouse... Miška … - + Navigation settings set Nabor nastavitev krmarjenja - + Orbit style Slog vrtenja - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4100,116 +4125,116 @@ Sukajoči pogled: del se bo sukal okrog osi z. (z omejitvami osi). Prostosukajoči pogled: del se bo sukal okoli osi z. - + Turntable Sukajoča pogled - + Trackball Vrtilna krogla - + Free Turntable Prostosukajoča plošča - + Rotation mode Sukalni način - + Rotations in 3D will use current cursor position as center for rotation Pri prostorskem sukanju bo za vrtišče izbran trenutni položaj kazalke - + Window center Sredina okna - + Drag at cursor Povleci h kazalki - + Object center Središče predmeta - + Default camera orientation Privzeta usmeritev kamere - + Default camera orientation when creating a new document or selecting the home view Privzeta usmeritev kamere pri ustvarjanju novega dokumenta ali izbiri domačega pogleda - + Camera zoom Preodmičenje - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Nastavi vidno polje kamere za nove dokumente. Vrednost predstavlja premer krogle, včrtane v zaslon. - + mm mm - + Enable animated rotations Omogoči potujoče zasuke - + Enable animation Omogoči potovanje - + Zoom operations will be performed at position of mouse pointer Preodmičenje se bo izvajalo okrog položaja kazalke - + Zoom at cursor Preodmičenje ob kazalki - + Zoom step Korak preodmičenja - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Za koliko se bo spremenila povečava. Korak preodmičenja "1" pomeni količnik velikost 7,5 za vsak korak. - + Direction of zoom operations will be inverted Smer preodmičenja bo obrnjena - + Invert zoom Obrni preodmičenje - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4218,67 +4243,57 @@ Vpliva le na slog krmarjenja s kretnjami. S to nastavitvijo nagibanje z miško ni onemogočeno. - + Disable touchscreen tilt gesture Onemogoči potezo nagibanja na zaslonu na dotik - - Show the rotation center when dragging. - Pri vlečenju prikaži središče sukanja. - - - - Enable rotation center indication - Omogoče nakazovanje središča sukanja - - - + Isometric Izometrično - + Dimetric Dvomeren - + Trimetric Trimetrično - + Top Zgoraj - + Front Spredaj - + Left Levo - + Right Desno - + Rear Zadaj - + Bottom Spodaj - + Custom Po meri @@ -5343,7 +5358,7 @@ The 'Status' column shows whether the document could be recovered. Dialog - Pogovorno okno + Pog. okno @@ -5509,7 +5524,7 @@ izbrani pred odprtjem tega pogovrnega okna Dialog - Pog. okno + Pogovorno okno @@ -5839,13 +5854,13 @@ Ali želite shraniti spremembe? Gui::FileChooser - - + + Select a file Izberite datoteko - + Select a directory Izberite mapo @@ -5853,13 +5868,13 @@ Ali želite shraniti spremembe? Gui::FileDialog - + Save as Shrani kot - - + + Open Odpri @@ -5867,12 +5882,12 @@ Ali želite shraniti spremembe? Gui::FileOptionsDialog - + Extended Razširi - + All files (*.*) Vse datoteke (*.*) @@ -6754,7 +6769,7 @@ Ali želite končati ne da bi shranili podatke? none - brez + nobeden @@ -6821,20 +6836,15 @@ Ali želite končati ne da bi shranili podatke? Gui::SelectModule - + Select module Izberite modul - + Open %1 as Odpri %1 kot - - - Select - Izberite - Gui::StdCmdDescription @@ -6916,7 +6926,7 @@ Ali želite navesti drugo mapo? Angle - Kót + Kot @@ -6924,7 +6934,7 @@ Ali želite navesti drugo mapo? Position - Položaj + Position @@ -7123,7 +7133,7 @@ Ali želite navesti drugo mapo? Press left mouse button - Pritisnite levi miškin gumb + Pritisnite levo miškino tipko @@ -7820,7 +7830,7 @@ Ali želite navesti drugo mapo? General - Splošno + Splošne nastavitve @@ -8240,7 +8250,7 @@ Ali želite nadaljevati? Preveč odprtih nevsivljivih obvestil. Obvestila so prezrta! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8249,44 +8259,44 @@ Ali želite nadaljevati? - + Are you sure you want to continue? Ali ste prepričani da želite nadaljevati? - + Please check report view for more... Za več informacij poglejte poročevalni pogled ... - + Physical path: Tvarna pot: - - + + Document: Dokument: - - + + Path: Pot: - + Identical physical path Enaka tvarna pot - + Could not save document Dokumenta ni bilo mogoče shraniti - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8299,102 +8309,102 @@ Would you like to save the file with a different name? Ali želite datoteko shraniti z drugačnim imenom? - - - + + + Saving aborted Shranjevanje prekinjeno - + Save dependent files Shrani odvisne datoteke - + The file contains external dependencies. Do you want to save the dependent files, too? Datoteka vsebuje zunanje odvisnosti. Ali želite shraniti tudi odvisne datoteke? - - + + Saving document failed Shranjevanje dokumenta spodletelo - + Save document under new filename... Shrani dokument z novim imenom datoteke … - - + + Save %1 Document Shrani dokument %1 - + Document Dokument - - + + Failed to save document Shranjevanje dokumenta spodletelo - + Documents contains cyclic dependencies. Do you still want to save them? Dokumenti vsebujejo krožne odvisnosti. Jih vseeno želite shraniti? - + Save a copy of the document under new filename... Shrani dvojnik dokumenta z novim imenom … - + %1 document (*.FCStd) Dokument %1 (*.FCStd) - + Document not closable Dokumenta ni mogoče zapreti - + The document is not closable for the moment. Dokumenta trenutno ni mogoče zapreti. - + Document not saved Dokument ni shranjen - + The document%1 could not be saved. Do you want to cancel closing it? Dokumenta%1 ni bilo mogoče shraniti. Ali želite preklicati zapiranje? - + Undo Razveljavi - + Redo Ponovno uveljavi - + There are grouped transactions in the following documents with other preceding transactions V sledečih dokumentih so skupinske izmenjava z drugimi predhodnimi izmenjavami - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8477,12 +8487,12 @@ Odprite brskalnik in vtipkajte: http://localhost:%1. Možnosti ... - + Out of memory Zmanjkalo je pomnilnika - + Not enough memory available to display the data. Ni dovolj pomnilnika za prikaz podatkov. @@ -8508,7 +8518,7 @@ Odprite brskalnik in vtipkajte: http://localhost:%1. Premakni opis - + Transform Preoblikuj @@ -8574,7 +8584,7 @@ Odprite brskalnik in vtipkajte: http://localhost:%1. %1 ni prazna, brisanje tudi njene vsebine? - + Translation: Vzporedni premik: @@ -8622,32 +8632,32 @@ Odprite brskalnik in vtipkajte: http://localhost:%1. Ustvarjanje skupine povezav je spodletelo - + Create link failed Ustvarjanje povezave spodletelo - + Failed to create relative link Ustvarjanje odvisne povezave je spodletelo - + Unlink failed Razvezovanje spodletelo - + Replace link failed Nadomeščanje povezave spodletelo - + Failed to import links Uvažanje povezav je spodletelo - + Failed to import all links Uvažanje vseh povezav je spodletelo @@ -9359,14 +9369,14 @@ bodo izgubljene. StdCmdGroup - + Create group Ustvari skupino - - Create a new group for ordering objects - Ustvari novo skupino za urejanje predmetov + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9424,13 +9434,13 @@ bodo izgubljene. StdCmdLinkActions - + Link actions Dejanja povezav - - + + Actions that apply to link objects Dejanja, ki veljajo za vezane predmete @@ -9438,12 +9448,12 @@ bodo izgubljene. StdCmdLinkImport - + Import links Uvozi povezave - + Import selected external link(s) Uvozi izbrano(e) zunanjo(e) povezavo(e) @@ -9451,12 +9461,12 @@ bodo izgubljene. StdCmdLinkImportAll - + Import all links Uvozi vse povezave - + Import all links of the active document Uvozi vse povezave dejavnega dokumenta @@ -9469,9 +9479,9 @@ bodo izgubljene. Naredi povezavo - - Create a link to the selected object(s) - Ustvari povezavo do izbranega predmeta(ov) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9490,12 +9500,12 @@ bodo izgubljene. StdCmdLinkMakeRelative - + Make sub-link Naredi podpovezavo - + Create a sub-object or sub-element link Ustvari povezavo podpredmeta ali podprvine @@ -9503,12 +9513,12 @@ bodo izgubljene. StdCmdLinkReplace - + Replace with link Zamenjaj s povezavo - + Replace the selected object(s) with link Zamenjaj izbrani(e) predmet(e) s povezavo @@ -9516,13 +9526,13 @@ bodo izgubljene. StdCmdLinkSelectActions - + Link navigation Krmarjenje po povezavah - - + + Link navigation actions Dejanja krmarjenja po povezavah @@ -9530,12 +9540,12 @@ bodo izgubljene. StdCmdLinkSelectAllLinks - + Select all links Izberi vse povezave - + Select all links to the current selected object Izberi vse povezave do trenutno izbranega predmeta @@ -9543,12 +9553,12 @@ bodo izgubljene. StdCmdLinkSelectLinked - + Go to linked object Pojdi na povezani predmet - + Select the linked object and switch to its owner document Izberi povezani predmet in preklopi na dokument njegovega lastnika @@ -9556,12 +9566,12 @@ bodo izgubljene. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Pojdi na najglobje povezan predmet - + Select the deepest linked object and switch to its owner document Izberi najglobje povezani predmet in preklopi na dokument njegovega lastnika @@ -9569,12 +9579,12 @@ bodo izgubljene. StdCmdLinkUnlink - + Unlink Razveži - + Strip on level of link Odreži na raven povezave @@ -9807,9 +9817,11 @@ bodo izgubljene. Ustvari del - - Create a new part and make it active - Ustvari nov del in ga naredi dejavnega + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10110,48 +10122,20 @@ bodo izgubljene. Preglednik torišč - - StdCmdSelBack - - - &Back - Naza&j - - - - - Go back to previous selection - Pojdi na prejšnji izbor - - StdCmdSelBoundingBox - + &Bounding box &Očrtni kvader - - + + Show selection bounding box Prikaži očrtni kvader izbora - - StdCmdSelForward - - - &Forward - &Naprej - - - - - Repeat the backed selection - Ponovi podprt izbor - - StdCmdSelectAll @@ -10463,13 +10447,13 @@ bodo izgubljene. StdCmdTreeViewActions - + TreeView actions Dejanja drevesnega prikaza - - + + TreeView behavior options and actions Možnost odzivanja in dejanj drevesnega prikaza @@ -10969,7 +10953,7 @@ bodo izgubljene. Fullscreen - Celozaslonsko + Celozaslonski način @@ -11009,13 +10993,13 @@ bodo izgubljene. StdRecallWorkingView - + Recall working view Priklic delovnega pogleda - - + + Recall previously stored temporary working view Prikliči predhodno shranjeno začasni delovni pogled @@ -11023,13 +11007,13 @@ bodo izgubljene. StdStoreWorkingView - + Store working view Shrani delovni pogled - - + + Store a document-specific temporary working view Shrani začasni delovni pogled v odvisnosti od dokumenta @@ -11037,13 +11021,13 @@ bodo izgubljene. StdTreeCollapseDocument - + Collapse/Expand Zloži/Razširi - - + + Expand active document and collapse all others Razširi dejavni dokument in zloži vse ostale @@ -11051,12 +11035,12 @@ bodo izgubljene. StdTreeDrag - + Initiate dragging Začni z vlečenjem - + Initiate dragging of current selected tree items Začni vlečenje trenutno izbranih predmetov v drevesu @@ -11064,13 +11048,13 @@ bodo izgubljene. StdTreeMultiDocument - + Multi document Večkraten dokument - - + + Display all documents in the tree view Prikaži vse dokumente v drevesnem prikazu @@ -11078,12 +11062,12 @@ bodo izgubljene. StdTreePreSelection - + Pre-selection Predizbor - + Preselect the object in 3D view when mouse over the tree item Predizberi predmete v prostorskem pogledu, preko katerih se gre v drevesu s kazalko @@ -11091,12 +11075,12 @@ bodo izgubljene. StdTreeRecordSelection - + Record selection Posnemi izbor - + Record selection in tree view in order to go back/forward using navigation button Posnemi izbor v drevesnem prikazu, da se je mogoče s krmilnim gumbom premikati nazaj in naprej @@ -11118,13 +11102,13 @@ bodo izgubljene. StdTreeSingleDocument - + Single document En dokument - - + + Only display the active document in the tree view V drevesnem prikazu kaži le dejavni dokument @@ -11132,12 +11116,12 @@ bodo izgubljene. StdTreeSyncPlacement - + Sync placement Uskladi postavitev - + Auto adjust placement on drag and drop objects across coordinate systems Samodejno prilagodi postavitev pri vlečenju-spuščanju predmetov po koordinatnih sistemih @@ -11145,12 +11129,12 @@ bodo izgubljene. StdTreeSyncSelection - + Sync selection Uskladi izbor - + Auto expand tree item when the corresponding object is selected in 3D view Samodejno razširi predmet v drevesu, ki odgovarja izbranemu predmetu v prostorskem pogledu @@ -11158,12 +11142,12 @@ bodo izgubljene. StdTreeSyncView - + Sync view Uskladi pogled - + Auto switch to the 3D view containing the selected item Samodejno preklopi na prostorski pogled, ki vsebuje izbrani predmet @@ -11215,7 +11199,7 @@ bodo izgubljene. Fullscreen - Celozaslonski način + Celozaslonsko @@ -11398,7 +11382,7 @@ Ali želite shraniti dokument zdaj? Std_Group - + Group Skupina @@ -12096,12 +12080,12 @@ ob zagodu FreeCAD-a NaviCubeDraggableCmd - + Movable navigation cube Premična krmilna kocka - + Drag and place NaviCube Povleci in umesti krmilno kocko @@ -12356,7 +12340,7 @@ ob zagodu FreeCAD-a General - Splošne nastavitve + Splošno @@ -12538,7 +12522,7 @@ bo pozdravno okno prikazano Name - Ime + Naziv @@ -12963,4 +12947,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_sr-CS.ts b/src/Gui/Language/FreeCAD_sr-CS.ts index c772b5a63b..20e54a3f51 100644 --- a/src/Gui/Language/FreeCAD_sr-CS.ts +++ b/src/Gui/Language/FreeCAD_sr-CS.ts @@ -137,22 +137,22 @@ Napravi grupu spona - + Make link Napravi sponu - + Make sub-link Napravi sponu podelementa - + Import links Uvezi spone - + Import all links Uvezi sve spone @@ -167,12 +167,12 @@ Umetni tekstualni dokument - + Add a part Dodaj deo - + Add a group Dodaj grupu @@ -212,7 +212,7 @@ Toggle visibility - Uključi/isklljuči vidlljivost + Prikaži/sakrij izabrane objekte @@ -778,37 +778,37 @@ dok pritiskš levim ili desnim tasterom i pomeraš miša gore ili dole Gui::Dialog::CameraDialog - + Camera settings Podešavanja kamere - + Orientation Orijentacija - + Q0 Q1 - + Q1 Q2 - + Q2 Q2 - + Q3 Q3 - + Current view Trenutni pogled @@ -1820,22 +1820,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Pronađi datoteku: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Pretraga imena datoteka bez obzira na velika i mala slova, podržani su regularni izrazi Find in files: - Find in files: + Pronađi u datotekama: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Filtrira sadržaj datoteke bez obzira na velika i mala slova, podržani su regularni izrazi @@ -2803,12 +2803,12 @@ u uglu -- u % visine/širine prozora prikaza Axis cross will be shown by default at file opening or creation - Podesi da se koordinatni sistem uvek prikazuje + Podesi da se glavni koordinatni sistem uvek prikazuje u 3D pogledu Show axis cross by default - Prikaži koordinatni sistem + Prikaži glavni koordinatni sistem @@ -3965,7 +3965,7 @@ Takođe možete koristiti obrazac: Pera Perić <pera@peric.com>Gui::Dialog::DlgSettingsNavigation - + Navigation Navigacija @@ -4059,35 +4059,60 @@ Takođe možete koristiti obrazac: Pera Perić <pera@peric.com>Base color for all elements Osnovna boja za sve elemente + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D Navigacija - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Funkcije tastera miša za izabrani stil 3D navigacije. Izaberi stil 3D navigacije, a zatim pritisni dugme da vidiš funkcije tastera. - + Mouse... Miš... - + Navigation settings set Stil 3D navigacije miša - + Orbit style Način okretanja orbit - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4098,116 +4123,116 @@ Gramofon: deo će biti rotiran oko z-ose (sa zadanim ograničenjima na osama). Obični gramofon: deo će biti rotiran oko z-ose. - + Turntable Gramofon - + Trackball Trackball - + Free Turntable Obični gramofon - + Rotation mode Režimi rotacije - + Rotations in 3D will use current cursor position as center for rotation 3D rotacija će koristiti trenutni položaj kursora miša kao centar za rotaciju - + Window center Centar prozora - + Drag at cursor Drag at cursor - + Object center Centar objekta - + Default camera orientation Podrazumevana orijentacija kamere - + Default camera orientation when creating a new document or selecting the home view Podrazumevana orijentacija kamere prilikom kreiranja novog dokumenta ili izbora početnog pogleda - + Camera zoom Zumiranje kamere - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Podešava zum kamere za nove dokumente. Vrednost je prečnik sfere koja staje na ekran. - + mm mm - + Enable animated rotations Omogući animirane rotacije - + Enable animation Omogući animaciju - + Zoom operations will be performed at position of mouse pointer Operacije zumiranja će se izvoditi na položaju pokazivača miša - + Zoom at cursor Zumiraj na kursoru - + Zoom step Korak zumiranja - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Koliko će biti zumirano. Korak zumiranja od '1' znači koeficijent od 7,5 za svaki korak zumiranja. - + Direction of zoom operations will be inverted Smer operacije zumiranja će biti obrnut - + Invert zoom Obrnite smer zumiranja - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4216,67 +4241,57 @@ Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - + Disable touchscreen tilt gesture Disable touchscreen tilt gesture - - Show the rotation center when dragging. - Prikaži centar rotacije prilikom prevlačenja. - - - - Enable rotation center indication - Omogući prikazivanje centra rotacije - - - + Isometric Izometrijski - + Dimetric Dimetrijski - + Trimetric Trimetrijski - + Top Odozgo - + Front Spreda - + Left Sleva - + Right Sdesna - + Rear Straga - + Bottom Odozdo - + Custom Sopstvena @@ -4328,12 +4343,12 @@ horizontalni prostor u Python konzoli Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Interval Python profajlera (u milisekundama): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + Interval u kome se profajler pokreće kada je pokrenut Pithon kod (da bi GUI nastavio da reaguje). Postavite na 0 da biste onemogućili. @@ -4462,12 +4477,12 @@ Veća vrednost olakšava odabir stvari, ali može onemogućiti odabir malih stva Color Bar - Color Bar + Panel boja Label text color - Label text color + Boja teksta Oznake @@ -4477,7 +4492,7 @@ Veća vrednost olakšava odabir stvari, ali može onemogućiti odabir malih stva Label text size - Label text size + Veličina slova na oznaci @@ -5839,13 +5854,13 @@ Da li želiš da sačuvaš promene? Gui::FileChooser - - + + Select a file Izaberi datoteku - + Select a directory Izaberi fasciklu @@ -5853,13 +5868,13 @@ Da li želiš da sačuvaš promene? Gui::FileDialog - + Save as Sačuvaj kao - - + + Open Otvori @@ -5867,12 +5882,12 @@ Da li želiš da sačuvaš promene? Gui::FileOptionsDialog - + Extended Prošireno - + All files (*.*) Sve datoteke (*.*) @@ -6000,7 +6015,7 @@ Da li želiš da sačuvaš promene? Graphviz format - Graphviz format + Graphviz format @@ -6821,20 +6836,15 @@ Da li želiš izaći bez čuvanja podataka? Gui::SelectModule - + Select module Izaberi modul - + Open %1 as Otvori %1 kao - - - Select - Izaberi - Gui::StdCmdDescription @@ -8240,7 +8250,7 @@ Da li želiš da nastaviš? Previše otvorenih nenametljivih obaveštenja. Obaveštenja se izostavljaju! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8249,44 +8259,44 @@ Da li želiš da nastaviš? - + Are you sure you want to continue? Da li si siguran da želiš da nastaviš? - + Please check report view for more... Pogledajte izveštaj za više... - + Physical path: Fizička putanja: - - + + Document: Dokument: - - + + Path: Putanja: - + Identical physical path Identična fizička putanja - + Could not save document Nije moguće sačuvati dokument - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8299,102 +8309,102 @@ Would you like to save the file with a different name? Da li želite da sačuvate datoteku pod drugim imenom? - - - + + + Saving aborted Snimanje obustavljeno - + Save dependent files Sačuvaj zavisne datoteke - + The file contains external dependencies. Do you want to save the dependent files, too? Datoteka sadrži spoljne zavisnosti. Da li želiš da sačuvaš i zavisne datoteke? - - + + Saving document failed Snimanje dokumenta nije uspelo - + Save document under new filename... Sačuvaj dokument pod novim imenom... - - + + Save %1 Document Sačuvaj %1 Dokument - + Document Dokument - - + + Failed to save document Nije uspelo snimanje dokumenta - + Documents contains cyclic dependencies. Do you still want to save them? Dokumenti sadrže ciklične zavisnosti. Da li i dalje želiš da ih spaseš? - + Save a copy of the document under new filename... Sačuvaj kopiju dokumenta pod novim imenom datoteke... - + %1 document (*.FCStd) %1 dokument (*.FCStd) - + Document not closable Dokument nije moguće zatvoriti - + The document is not closable for the moment. Trenutno nije moguće zatvoriti dokument. - + Document not saved Dokument nije snimnjen - + The document%1 could not be saved. Do you want to cancel closing it? Dokument%1 nije mogao biti snimljen. Da li želiš da otkažeš zatvaranje? - + Undo Poništi - + Redo Ponovi - + There are grouped transactions in the following documents with other preceding transactions There are grouped transactions in the following documents with other preceding transactions - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8477,12 +8487,12 @@ Otvori pregledač i ukucaj: http://localhost:%1. Opcije... - + Out of memory Nema dovoljno memorije - + Not enough memory available to display the data. Nema dovoljno memorije za prikazivanje podataka. @@ -8508,7 +8518,7 @@ Otvori pregledač i ukucaj: http://localhost:%1. Pomeri napomenu - + Transform Pomeri @@ -8574,14 +8584,14 @@ Otvori pregledač i ukucaj: http://localhost:%1. %1 nije prazan, želiš li izbrisati i njegov sadržaj? - + Translation: Translacija: Translation XY: - Translation XY: + Translacija XY: @@ -8622,32 +8632,32 @@ Otvori pregledač i ukucaj: http://localhost:%1. Pravljenje grupe sa sponama nije uspelo - + Create link failed Pravljenje veze nije uspelo - + Failed to create relative link Pravljenje relativne veze nije uspelo - + Unlink failed Prekid veze nije uspeo - + Replace link failed Zamena sa sponom nije uspela - + Failed to import links Uvoz spona nije uspeo - + Failed to import all links Uvoz svih spona nije uspeo @@ -8916,13 +8926,13 @@ the current copy will be lost. Toggle axis cross - Uključi/isključi ortogonalni triedar + Prikaži/sakrij koordinatni sistem Turns on or off the axis cross at the origin - Uključi/Isključi koordinatni sistem u koordinatnom početku + Prikaži/sakrij glavni koordinatni sistem u 3D pogledu @@ -9359,14 +9369,14 @@ the current copy will be lost. StdCmdGroup - + Create group Napravi grupu - - Create a new group for ordering objects - Create a new group for ordering objects + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9424,13 +9434,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Radnje sa sponama - - + + Actions that apply to link objects Radnje koje se primenjuju na spone @@ -9438,12 +9448,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Uvezi spone - + Import selected external link(s) Uvezi izabrane spoljne veze @@ -9451,12 +9461,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Uvezi sve spone - + Import all links of the active document Uvezi sve spone aktivnog dokumenta @@ -9469,9 +9479,9 @@ the current copy will be lost. Napravi sponu - - Create a link to the selected object(s) - Napravi sponu do izabranih objekata + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9490,12 +9500,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Napravi sponu podelementa - + Create a sub-object or sub-element link Napravi sponu podobjekta ili podelementa @@ -9503,12 +9513,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Zameni sa sponom - + Replace the selected object(s) with link Zameni izabrane objekte sa sponom @@ -9516,13 +9526,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Navigacija sponama - - + + Link navigation actions Radnje navigacije sponama @@ -9530,12 +9540,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Izaberi sve veze - + Select all links to the current selected object Izaberi sve veze do trenutno izabranog objekta @@ -9543,12 +9553,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Idi na povezani objekat - + Select the linked object and switch to its owner document Izaberi povezani objekat i prebacite se na dokument njegovog vlasnika @@ -9556,12 +9566,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Idi do najdublje povezanog objekta - + Select the deepest linked object and switch to its owner document Izaberi najdublje povezani objekat i prebacite se na dokument njegovog vlasnika @@ -9569,12 +9579,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Zameni sponu - + Strip on level of link Strip on level of link @@ -9807,9 +9817,11 @@ the current copy will be lost. Napravi deo - - Create a new part and make it active - Napravi novi deo i učini ga aktivnim + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10110,48 +10122,20 @@ the current copy will be lost. Pregled scene - - StdCmdSelBack - - - &Back - &Nazad - - - - - Go back to previous selection - Vrati se na prethodni izbor - - StdCmdSelBoundingBox - + &Bounding box &Granična kutija - - + + Show selection bounding box Prikaži graničnu kutiju - - StdCmdSelForward - - - &Forward - &Napred - - - - - Repeat the backed selection - Repeat the backed selection - - StdCmdSelectAll @@ -10339,7 +10323,7 @@ the current copy will be lost. Toggle all objects - Uključi/isklljuči sve objekte + Prikaži/Sakrij sve objekte @@ -10367,7 +10351,7 @@ the current copy will be lost. Toggle visibility - Uključi/isklljuči vidlljivost + Prikaži/sakrij izabrane objekte @@ -10463,13 +10447,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Radnje u stablu dokumenta - - + + TreeView behavior options and actions TreeView behavior options and actions @@ -10661,7 +10645,7 @@ the current copy will be lost. Home - Početna + Početni @@ -11009,13 +10993,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Opozovi radni pogled - - + + Recall previously stored temporary working view Opozovi prethodno sačuvan privremeni radni pogled @@ -11023,13 +11007,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Sačuvaj radni pogled - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11037,13 +11021,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Skupi/Proširi - - + + Expand active document and collapse all others Proširi u stablu dokumenta aktivni a skupi sve ostale dokumente @@ -11051,12 +11035,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Pokreni prevlačenje - + Initiate dragging of current selected tree items Pokreni prevlačenje trenutno izabranih stavki stabla dokumenta @@ -11064,13 +11048,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Višestruki dokumenat - - + + Display all documents in the tree view Prikazuj sve dokumente u stablu dokumenta @@ -11078,12 +11062,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Predizbor - + Preselect the object in 3D view when mouse over the tree item Unapred izaberi objekat u 3D pogledu samo prolaskom mišem preko stavke u stablu @@ -11091,12 +11075,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Snimi izbor - + Record selection in tree view in order to go back/forward using navigation button Snimi izbor u stablu dokumenta da bi se kretao napred/nazad koristeći dugme za navigaciju @@ -11118,13 +11102,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Jedan dokument - - + + Only display the active document in the tree view Prikazuj samo aktivni dokument u stablu dokumenta @@ -11132,12 +11116,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Sinhronizuj položaj - + Auto adjust placement on drag and drop objects across coordinate systems Automatsko prilagođavanje položaja prilikom prevlačenja objekata kroz koordinatne sisteme @@ -11145,12 +11129,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Sinhronizuj izbor - + Auto expand tree item when the corresponding object is selected in 3D view Automatsko proširivanje stavke u stablu kada je odgovarajući objekat izabran u 3D pogledu @@ -11158,12 +11142,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Sinhronizuj prikaz - + Auto switch to the 3D view containing the selected item Automatski pređi na 3D pogled koji sadrži izabranu stavku @@ -11398,7 +11382,7 @@ Da li želiš sada da sačuvaš dokument? Std_Group - + Group Grupa @@ -12096,12 +12080,12 @@ nakon pokretanja FreeCAD-a NaviCubeDraggableCmd - + Movable navigation cube Pokretna navigaciona kocka - + Drag and place NaviCube Prevuci i postavi navigacionu kocku @@ -12950,13 +12934,39 @@ Sada možete da koristite i Temu za potpuno prilagođavanje interfejsa. Export dependency graph... - Export dependency graph... + Izvezi grafikon zavisnosti... Export the dependency graph to a file - Export the dependency graph to a file + Izvezi grafikon zavisnosti kao datoteku + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_sr.ts b/src/Gui/Language/FreeCAD_sr.ts index b18438f5ce..d8fa2c09aa 100644 --- a/src/Gui/Language/FreeCAD_sr.ts +++ b/src/Gui/Language/FreeCAD_sr.ts @@ -137,22 +137,22 @@ Направи групу спона - + Make link Направи спону - + Make sub-link Направи спону поделемента - + Import links Увези споне - + Import all links Увези све споне @@ -167,12 +167,12 @@ Уметни текстуални документ - + Add a part Додај део - + Add a group Додај групу @@ -212,7 +212,7 @@ Toggle visibility - Укључи/искључи видлљивост + Прикажи/сакриј изабране објекте @@ -778,37 +778,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Подешавања камере - + Orientation Оријентација - + Q0 Q1 - + Q1 Q2 - + Q2 Q2 - + Q3 Q3 - + Current view Тренутни поглед @@ -1820,22 +1820,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Пронађи датотеку: Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + Претрага имена датотека без обзира на велика и мала слова, подржани су регуларни изрази Find in files: - Find in files: + Пронађи у датотекама: Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + Филтрирај садржај датотеке без обзира на велика и мала слова, подржани су регуларни изрази @@ -2803,12 +2803,12 @@ in the corner -- in % of height/width of viewport Axis cross will be shown by default at file opening or creation - Задај да се координатни систем увек приказује + Подеси да се главни координатни систем увек приказује у 3D погледу Show axis cross by default - Прикажи координатни систем + Прикажи главни координатни систем @@ -3965,7 +3965,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Навигација @@ -4059,35 +4059,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Основна боја за све елементе + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3Д Навигација - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Функције тастера миша за изабрани стил 3Д навигације. Изабери стил 3Д навигације, а затим притисни дугме да видиш функције тастера. - + Mouse... Миш... - + Navigation settings set Стил 3Д навигације миша - + Orbit style Начин окретања орбит - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4098,116 +4123,116 @@ Trackball: померање миша хоризонтално ће ротира Обични грамофон: део ће бити ротиран око z-осе. - + Turntable Грамофон - + Trackball Trackball - + Free Turntable Обични грамофон - + Rotation mode Режими ротације - + Rotations in 3D will use current cursor position as center for rotation 3Д ротација ће користити тренутну положај курсора миша као центар за ротацију - + Window center Центар прозора - + Drag at cursor Drag at cursor - + Object center Центар објекта - + Default camera orientation Подразумевана оријентација камере - + Default camera orientation when creating a new document or selecting the home view Подразумевана оријентација камере приликом креирања новог документа или избора почетног погледа - + Camera zoom Зумирање камере - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Подешава зум камере за нове документе. Вредност је пречник сфере која стаје на екран. - + mm мм - + Enable animated rotations Омогући анимиране ротације - + Enable animation Омогући анимацију - + Zoom operations will be performed at position of mouse pointer Операције зумирања ће се изводити на положају показивача миша - + Zoom at cursor Зумирај на курсору - + Zoom step Корак зумирања - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Колико ће бити зумирано. Корак зумирања од '1' значи коефицијент од 7,5 за сваки корак зумирања. - + Direction of zoom operations will be inverted Смер операције зумирања ће бити обрнут - + Invert zoom Обрни смер зумирања - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4216,67 +4241,57 @@ Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - + Disable touchscreen tilt gesture Disable touchscreen tilt gesture - - Show the rotation center when dragging. - Прикажи центар ротације приликом превлачења. - - - - Enable rotation center indication - Омогући приказивање центра ротације - - - + Isometric Изометријски - + Dimetric Диметријски - + Trimetric Триметријски - + Top Одозго - + Front Спреда - + Left Слева - + Right Сдесна - + Rear Страга - + Bottom Одоздо - + Custom Сопствена @@ -4328,12 +4343,12 @@ horizontal space in Python console Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Интервал Python профајлера (у милисекундама): The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + Интервал у коме се профајлер покрец́е када је покренут Python код (да би GUI наставио да реагује). Поставите на 0 да бисте онемогућили. @@ -4462,12 +4477,12 @@ Larger value eases to pick things, but can make small features impossible to sel Color Bar - Color Bar + Панел боја Label text color - Label text color + Боја текста ознаке @@ -4477,7 +4492,7 @@ Larger value eases to pick things, but can make small features impossible to sel Label text size - Label text size + Величина текста ознаке @@ -5839,13 +5854,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Изабери датотеку - + Select a directory Изабери фасциклу @@ -5853,13 +5868,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Сачувај као - - + + Open Отвори @@ -5867,12 +5882,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Проширено - + All files (*.*) Све датотеке (*.*) @@ -6000,7 +6015,7 @@ Do you want to save your changes? Graphviz format - Graphviz format + Graphviz формат @@ -6821,20 +6836,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Изабери модул - + Open %1 as Отвори %1 као - - - Select - Изабери - Gui::StdCmdDescription @@ -8240,7 +8250,7 @@ Do you want to continue? Превише отворених ненаметљивих обавештења. Обавештења се изостављају! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8249,44 +8259,44 @@ Do you want to continue? - + Are you sure you want to continue? Да ли си сигуран да желиш да наставиш? - + Please check report view for more... Погледајте извештај за више... - + Physical path: Физичка путања: - - + + Document: Документ: - - + + Path: Путања: - + Identical physical path Идентична физичка путања - + Could not save document Није могуће сачувати документ - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8299,102 +8309,102 @@ Would you like to save the file with a different name? Да ли желите да сачувате датотеку под другим именом? - - - + + + Saving aborted Снимање обуcтављено - + Save dependent files Сачувај зависне датотеке - + The file contains external dependencies. Do you want to save the dependent files, too? Датотека садржи спољне зависности. Да ли желиш да сачуваш и зависне датотеке? - - + + Saving document failed Снимање документа није успело - + Save document under new filename... Cачувај документ под новим именом... - - + + Save %1 Document Сачувај %1 Документ - + Document Документ - - + + Failed to save document Није успело снимање документа - + Documents contains cyclic dependencies. Do you still want to save them? Документи садрже цикличне зависности. Да ли и даље желиш да их спасеш? - + Save a copy of the document under new filename... Сачувај копију документа под новим именом датотеке... - + %1 document (*.FCStd) %1 документ (*.FCStd) - + Document not closable Документ није могуће затворити - + The document is not closable for the moment. Тренутно није могуће затворити документ. - + Document not saved Документ није снимњен - + The document%1 could not be saved. Do you want to cancel closing it? Документ%1 није могао бити снимљен. Да ли желиш да откажеш затварање? - + Undo Поништи - + Redo Понови - + There are grouped transactions in the following documents with other preceding transactions There are grouped transactions in the following documents with other preceding transactions - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8477,12 +8487,12 @@ Please open a browser window and type in: http://localhost:%1. Опције... - + Out of memory Нема довољно меморије - + Not enough memory available to display the data. Нема довољно меморије за приказивање података. @@ -8508,7 +8518,7 @@ Please open a browser window and type in: http://localhost:%1. Помери напомену - + Transform Помери @@ -8574,14 +8584,14 @@ Please open a browser window and type in: http://localhost:%1. %1 није празан, желиш ли избрисати и његов садржај? - + Translation: Транслација: Translation XY: - Translation XY: + Транслација XY: @@ -8622,32 +8632,32 @@ Please open a browser window and type in: http://localhost:%1. Прављење групе са спонама није успело - + Create link failed Креирање везе није успело - + Failed to create relative link Прављење релативне везе није успело - + Unlink failed Замена споне са објектом није успело - + Replace link failed Замена са споном није успела - + Failed to import links Увоз спона није успео - + Failed to import all links Увоз свих спона није успео @@ -8916,13 +8926,13 @@ the current copy will be lost. Toggle axis cross - Укључи/искључи ортогонални триедар + Прикажи/сакриј координатни систем Turns on or off the axis cross at the origin - Укључи/Искључи координатни систем у координатном почетку + Прикажи/сакриј главни координатни систем у 3D погледу @@ -9359,14 +9369,14 @@ the current copy will be lost. StdCmdGroup - + Create group Направи групу - - Create a new group for ordering objects - Create a new group for ordering objects + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9424,13 +9434,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Радње са спонама - - + + Actions that apply to link objects Радње које се примењују на споне @@ -9438,12 +9448,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Увези споне - + Import selected external link(s) Увези изабране спољне везе @@ -9451,12 +9461,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Увези све споне - + Import all links of the active document Увези све споне активног документа @@ -9469,9 +9479,9 @@ the current copy will be lost. Направи спону - - Create a link to the selected object(s) - Направи спону до изабраних објеката + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9490,12 +9500,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Направи спону поделемента - + Create a sub-object or sub-element link Направи везу подобјекта или поделемента @@ -9503,12 +9513,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Замени са споном - + Replace the selected object(s) with link Замени изабране објекте са споном @@ -9516,13 +9526,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Навигација спонама - - + + Link navigation actions Радње навигације спонама @@ -9530,12 +9540,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Изабери све везе - + Select all links to the current selected object Изабери све везе до тренутно изабраног објекта @@ -9543,12 +9553,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Иди на повезани објекат - + Select the linked object and switch to its owner document Изабери повезани објекат и пребаци се на документ његовог власника @@ -9556,12 +9566,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Иди до најдубље повезаног објекта - + Select the deepest linked object and switch to its owner document Изабери најдубље повезани објекат и пребаци се на документ његовог власника @@ -9569,12 +9579,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Замени спону - + Strip on level of link Strip on level of link @@ -9807,9 +9817,11 @@ the current copy will be lost. Направи део - - Create a new part and make it active - Направи нови део и учини га активним + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10110,48 +10122,20 @@ the current copy will be lost. Преглед сцене - - StdCmdSelBack - - - &Back - &Назад - - - - - Go back to previous selection - Врати се на претходни избор - - StdCmdSelBoundingBox - + &Bounding box &Гранична кутија - - + + Show selection bounding box Прикажи граничну кутију - - StdCmdSelForward - - - &Forward - &Напред - - - - - Repeat the backed selection - Repeat the backed selection - - StdCmdSelectAll @@ -10339,7 +10323,7 @@ the current copy will be lost. Toggle all objects - Укључи/исклључи све објекте + Прикажи/сакриј све објекте @@ -10367,7 +10351,7 @@ the current copy will be lost. Toggle visibility - Укључи/искључи видлљивост + Прикажи/сакриј изабране објекте @@ -10463,13 +10447,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Радње у стаблу документа - - + + TreeView behavior options and actions TreeView behavior options and actions @@ -10661,7 +10645,7 @@ the current copy will be lost. Home - Почетна + Почетни @@ -11009,13 +10993,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Опозови радни поглед - - + + Recall previously stored temporary working view Опозови претходно сачуван привремени радни поглед @@ -11023,13 +11007,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Сачувај радни поглед - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11037,13 +11021,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Скупи/Прошири - - + + Expand active document and collapse all others Прошири у стаблу документа активни а скупи све остале документе @@ -11051,12 +11035,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Покрени превлачење - + Initiate dragging of current selected tree items Покрени превлачење тренутно изабраних ставки стабла документа @@ -11064,13 +11048,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Вишеструки докуменат - - + + Display all documents in the tree view Прикажи све документе у стаблу документа @@ -11078,12 +11062,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Предизбор - + Preselect the object in 3D view when mouse over the tree item Унапред изабери објекат у 3Д погледу само проласком мишем преко ставке у стаблу @@ -11091,12 +11075,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Сними избор - + Record selection in tree view in order to go back/forward using navigation button Сними избор у стаблу документа да би се кретао напред/назад користећи дугме за навигацију @@ -11118,13 +11102,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Један документ - - + + Only display the active document in the tree view Приказуј само активни документ у стаблу документа @@ -11132,12 +11116,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Синхронизуј положај - + Auto adjust placement on drag and drop objects across coordinate systems Аутоматско прилагођавање положаја приликом превлачења објеката кроз координатне системе @@ -11145,12 +11129,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Синхронизуј избор - + Auto expand tree item when the corresponding object is selected in 3D view Аутоматско проширивање ставке у стаблу када је одговарајући објекат изабран у 3Д погледу @@ -11158,12 +11142,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Синхронизуј приказ - + Auto switch to the 3D view containing the selected item Аутоматски пређи на 3Д поглед који садржи изабрану ставку @@ -11398,7 +11382,7 @@ Do you want to save the document now? Std_Group - + Group Група @@ -12096,12 +12080,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Покретна навигациона коцка - + Drag and place NaviCube Превуци и постави навигациону коцку @@ -12950,13 +12934,39 @@ You can now use Theme to get a full customization of the interface. Export dependency graph... - Export dependency graph... + Извези графикон зависности... Export the dependency graph to a file - Export the dependency graph to a file + Извези графикон зависности као датотеку + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/Language/FreeCAD_sv-SE.ts b/src/Gui/Language/FreeCAD_sv-SE.ts index 238fff7e98..6b25faf2e8 100644 --- a/src/Gui/Language/FreeCAD_sv-SE.ts +++ b/src/Gui/Language/FreeCAD_sv-SE.ts @@ -137,22 +137,22 @@ Skapa länkgrupp - + Make link Skapa länk - + Make sub-link Skapa underlänk - + Import links Importera länkar - + Import all links Importera alla länkar @@ -167,12 +167,12 @@ Infoga textdokument - + Add a part Lägg till en del - + Add a group Lägg till en grupp @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Kamerainställningar - + Orientation Orientering - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Aktuell vy @@ -3967,7 +3967,7 @@ Du kan också använda formuläret: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navigering @@ -4061,35 +4061,60 @@ Du kan också använda formuläret: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D Navigering - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Lista musknappskonfigurationer för varje vald navigeringsinställning. Välj en uppsättning och tryck sedan på knappen för att visa nämnda konfigurationer. - + Mouse... Mus... - + Navigation settings set Navigeringsinställningar inställda - + Orbit style Orbit stil - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4100,183 +4125,173 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable Skivtallrik - + Trackball Trackball - + Free Turntable Free Turntable - + Rotation mode Rotationsläge - + Rotations in 3D will use current cursor position as center for rotation Rotationer i 3D kommer att använda aktuell markörposition som centrum för rotation - + Window center Fönster mitt - + Drag at cursor Drag vid muspekaren - + Object center Objekt centrum - + Default camera orientation Standard kamerainriktning - + Default camera orientation when creating a new document or selecting the home view Standard kamerainriktning när du skapar ett nytt dokument eller väljer hemvyn - + Camera zoom Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Ställer in kamerans zoom för nya dokument. Värdet är sfärens diameter som passar på skärmen. - + mm mm - + Enable animated rotations Aktivera animerade rotationer - + Enable animation Aktivera animering - + Zoom operations will be performed at position of mouse pointer Zoomoperationer kommer att utföras vid muspekarens position - + Zoom at cursor Zooma vid markören - + Zoom step Zoomsteg - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Hur mycket kommer att zoomas. Zoomsteg '1' betyder en faktor på 7,5 för varje zoomsteg. - + Direction of zoom operations will be inverted Zoomoperationernas riktning kommer att inverteras - + Invert zoom Invertera zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. Förhindrar lutning av vy vid två-fingers-zoomning. Påverkar endast gestnavigeringsstil, vylutning med musen avaktiveras inte av denna inställning. - + Disable touchscreen tilt gesture Avaktivera lutning med gester på pekskärm - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Aktivera indikering av rotationscentrum - - - + Isometric Isometrisk - + Dimetric Dimetrisk - + Trimetric Trimetrisk - + Top Topp - + Front Front - + Left Vänster - + Right Höger - + Rear Bak - + Bottom Botten - + Custom Anpassad @@ -5837,13 +5852,13 @@ Vill du spara ändringarna? Gui::FileChooser - - + + Select a file Välj en fil - + Select a directory Välj en katalog @@ -5851,13 +5866,13 @@ Vill du spara ändringarna? Gui::FileDialog - + Save as Spara som - - + + Open Öppna @@ -5865,12 +5880,12 @@ Vill du spara ändringarna? Gui::FileOptionsDialog - + Extended Utökad - + All files (*.*) Alla filer (*.*) @@ -6819,20 +6834,15 @@ Vill du avsluta utan att spara din data? Gui::SelectModule - + Select module Välj modul - + Open %1 as Öppna %1 som - - - Select - Markera - Gui::StdCmdDescription @@ -8238,7 +8248,7 @@ vill du fortsätta? För många öppnade icke-störande meddelanden. Meddelanden utelämnas! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8247,44 +8257,44 @@ vill du fortsätta? - + Are you sure you want to continue? Är du säker på att du vill fortsätta? - + Please check report view for more... Please check report view for more... - + Physical path: Physical path: - - + + Document: Document: - - + + Path: Sökväg: - + Identical physical path Identisk fysisk sökväg - + Could not save document Could not save document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8297,102 +8307,102 @@ Would you like to save the file with a different name? Would you like to save the file with a different name? - - - + + + Saving aborted Sparning avbruten - + Save dependent files Spara beroende filer - + The file contains external dependencies. Do you want to save the dependent files, too? Filen innehåller externa beroenden. Vill du spara de beroende filerna också? - - + + Saving document failed Sparning av dokument misslyckades - + Save document under new filename... Spara dokumentet med ett nytt filnamn... - - + + Save %1 Document Spara %1 dokument - + Document Dokument - - + + Failed to save document Det gick inte att spara dokumentet - + Documents contains cyclic dependencies. Do you still want to save them? Dokument innehåller cykliska beroenden. Vill du fortfarande spara dem? - + Save a copy of the document under new filename... Spara en kopia av dokumentet med nytt filnamn... - + %1 document (*.FCStd) %1 dokument (*.FCStd) - + Document not closable Dokumentet kan ej stängas - + The document is not closable for the moment. Dokumentet kan inte stängas för tillfället. - + Document not saved Document not saved - + The document%1 could not be saved. Do you want to cancel closing it? The document%1 could not be saved. Do you want to cancel closing it? - + Undo Ångra - + Redo Gör om - + There are grouped transactions in the following documents with other preceding transactions Det finns grupperade transaktioner i följande dokument med andra föregående transaktioner - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8475,12 +8485,12 @@ Please open a browser window and type in: http://localhost:%1. Alternativ... - + Out of memory Slut på minne - + Not enough memory available to display the data. Det finns inte tillräckligt med minne för att visa datan. @@ -8506,7 +8516,7 @@ Please open a browser window and type in: http://localhost:%1. Flytta annotering - + Transform Omvandla @@ -8572,7 +8582,7 @@ Please open a browser window and type in: http://localhost:%1. %1 är inte tom, vill du även ta bort innehållet? - + Translation: Förflyttning: @@ -8620,32 +8630,32 @@ Please open a browser window and type in: http://localhost:%1. Kunde inte skapa länkgrupp - + Create link failed Kunde inte skapa länk - + Failed to create relative link Kunde inte skapa relativ länk - + Unlink failed Avlänka misslyckades - + Replace link failed Det gick inte att ersätta länken - + Failed to import links Det gick inte att importera länkar - + Failed to import all links Det gick inte att importera alla länkar @@ -9357,14 +9367,14 @@ the current copy will be lost. StdCmdGroup - + Create group Skapa grupp - - Create a new group for ordering objects - Skapa en ny grupp för att ordna objekt + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9422,13 +9432,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Länka åtgärder - - + + Actions that apply to link objects Actions that apply to link objects @@ -9436,12 +9446,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Importera länkar - + Import selected external link(s) Importera en eller flera markerade externa länkar @@ -9449,12 +9459,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Importera alla länkar - + Import all links of the active document Importera alla länkar till det aktiva dokumentet @@ -9467,9 +9477,9 @@ the current copy will be lost. Skapa länk - - Create a link to the selected object(s) - Skapa en länk till en eller flera markerade objekt + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9488,12 +9498,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Skapa underlänk - + Create a sub-object or sub-element link Skapa ett underobjekt eller underelementslänk @@ -9501,12 +9511,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Ersätt med länk - + Replace the selected object(s) with link Ersätt en eller flera markerade objekt med länk @@ -9514,13 +9524,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Länk navigation - - + + Link navigation actions Länk navigering åtgärder @@ -9528,12 +9538,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Markera alla länkar - + Select all links to the current selected object Markera alla länkar till det aktuella markerade objektet @@ -9541,12 +9551,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Gå till länkat objekt - + Select the linked object and switch to its owner document Markera det länkade objektet och växla till dess ägardokument @@ -9554,12 +9564,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Gå till det djupast länkade objektet - + Select the deepest linked object and switch to its owner document Markera det djupaste länkade objektet och växla till dess ägardokument @@ -9567,12 +9577,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Ta bort länk - + Strip on level of link Ta bort på länkens nivå @@ -9805,9 +9815,11 @@ the current copy will be lost. Skapa del - - Create a new part and make it active - Skapa en ny del och gör den aktiv + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10108,48 +10120,20 @@ the current copy will be lost. Sceninspektör - - StdCmdSelBack - - - &Back - &Tillbaka - - - - - Go back to previous selection - Gå tillbaka till föregående markering - - StdCmdSelBoundingBox - + &Bounding box &Markeringsramen - - + + Show selection bounding box Visa markeringsruta - - StdCmdSelForward - - - &Forward - &Framåt - - - - - Repeat the backed selection - Repeat the backed selection - - StdCmdSelectAll @@ -10461,13 +10445,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions TreeView åtgärder - - + + TreeView behavior options and actions TreeView beteende alternativ och åtgärder @@ -11007,13 +10991,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11021,13 +11005,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11035,13 +11019,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Minimera/expandera - - + + Expand active document and collapse all others Expandera det aktiva dokumentet och minimera alla andra @@ -11049,12 +11033,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Initiera dragning - + Initiate dragging of current selected tree items Initiera dragning av aktuella valda trädobjekt @@ -11062,13 +11046,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Flerdokument - - + + Display all documents in the tree view Visa alla dokument i trädvyn @@ -11076,12 +11060,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Förval - + Preselect the object in 3D view when mouse over the tree item Förvälj objektet i 3D-vyn när musen går över trädobjektet @@ -11089,12 +11073,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Spela in markering - + Record selection in tree view in order to go back/forward using navigation button Spela in markering i trädvyn för att gå bakåt/framåt med navigeringsknappen @@ -11116,13 +11100,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Enskilt dokument - - + + Only display the active document in the tree view Visa endast det aktiva dokumentet i trädvyn @@ -11130,12 +11114,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Synkronisera placering - + Auto adjust placement on drag and drop objects across coordinate systems Justera automatiskt placering när du drar och släpper objekt över koordinatsystem @@ -11143,12 +11127,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Synkroniseringsval - + Auto expand tree item when the corresponding object is selected in 3D view Expandera trädobjektet automatiskt när motsvarande objekt väljs i 3D-vyn @@ -11156,12 +11140,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Synkronisera vy - + Auto switch to the 3D view containing the selected item Växla automatiskt till 3D-vyn som innehåller det valda objektet @@ -11394,7 +11378,7 @@ Vill du spara dokumentet nu? Std_Group - + Group Grupp @@ -12092,12 +12076,12 @@ vid start av FreeCAD NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12959,4 +12943,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_tr.ts b/src/Gui/Language/FreeCAD_tr.ts index 206888ac52..69c0c86b6f 100644 --- a/src/Gui/Language/FreeCAD_tr.ts +++ b/src/Gui/Language/FreeCAD_tr.ts @@ -137,22 +137,22 @@ Bağlantı grubu oluştur - + Make link Bağlantı oluştur - + Make sub-link Alt bağlantı oluştur - + Import links Bağlantıları içe aktar - + Import all links Tüm bağlantıları içe aktar @@ -167,12 +167,12 @@ Metin dökümanı ekle - + Add a part Bir parça ekle - + Add a group Bir grup ekle @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Kamera ayarları - + Orientation Yönlendirme - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Geçerli görünüm @@ -3966,7 +3966,7 @@ Ayrıca formu da kullanabilirsiniz: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Gezinme @@ -4060,35 +4060,60 @@ Ayrıca formu da kullanabilirsiniz: John Doe <john@doe.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D Gezinme - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Seçilen her gezinti ayarı için fare düğmesi yapılandırmalarını listele. Bahsedilen yapılandırmaları görmek için bir ayar seçin ve sonra düğmeye basın. - + Mouse... Fare... - + Navigation settings set Gezinti ayarları ayarı - + Orbit style Yörünge stili - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4099,116 +4124,116 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable Döner tabla - + Trackball Trackball - + Free Turntable Free Turntable - + Rotation mode Döndürme modu - + Rotations in 3D will use current cursor position as center for rotation 3B' daki dönüşler, dönüş merkezi olarak geçerli imleç konumunu kullanacak - + Window center Pencere merkezi - + Drag at cursor İmleç ile sürükle - + Object center Nesne merkezi - + Default camera orientation Varsayılan kamera yönü - + Default camera orientation when creating a new document or selecting the home view Yeni bir belge oluştururken veya ev görünümünü seçerkenki varsayılan kamera yönlendirmesi - + Camera zoom Kamera yakınlaştırma - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Yeni belgeler için kamera yakınlaştırılmasını ayarlar. Değeri, ekrana sığdırılacak kürenin çapıdır. - + mm mm - + Enable animated rotations Hareketli dönüşleri etkinleştir - + Enable animation Animasyonu etkinleştir - + Zoom operations will be performed at position of mouse pointer Yakınlaştırma işlemleri, fare işaretçisi konumunda yapılacak - + Zoom at cursor İmlece yaklaş - + Zoom step Yakınlaştırma adımı - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Yakınlaştırma miktarı. 1 yakınlaştırma adımı, adım başına 7.5 katsayı anlamına gelir. - + Direction of zoom operations will be inverted Yakınlaştırma işlemlerinin yönü ters çevrilecek - + Invert zoom Zoomu tersine çevir - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4217,67 +4242,57 @@ Yalnızca hareketle gezinme stilini etkiler. Bu ayarla fareyi eğme devre dışı bırakılmaz. - + Disable touchscreen tilt gesture DokunmatikEkran eğim hareketini devre dışı bırak - - Show the rotation center when dragging. - Sürüklerken döndürme eksenini göster. - - - - Enable rotation center indication - Dönüş eksenini göster - - - + Isometric İzometrik - + Dimetric Dimetrik - + Trimetric Trimetrik - + Top üst - + Front Ön - + Left Sol - + Right Sağ - + Rear Arka - + Bottom Alt - + Custom Özel @@ -5839,13 +5854,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Bir dosya seçin - + Select a directory Dizin Seç @@ -5853,13 +5868,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Farklı Kaydet - - + + Open Aç @@ -5867,12 +5882,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Genişletilmiş - + All files (*.*) Tüm dosyalar (*. *) @@ -6820,20 +6835,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Modül seçin - + Open %1 as %1 Olarak açın - - - Select - Seç - Gui::StdCmdDescription @@ -8236,7 +8246,7 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8245,44 +8255,44 @@ Do you want to continue? - + Are you sure you want to continue? Devam etmek istediğinizden emin misiniz? - + Please check report view for more... Please check report view for more... - + Physical path: Fiziksel yol: - - + + Document: Belge: - - + + Path: Yol: - + Identical physical path Özdeş fiziksel yol - + Could not save document Belge kaydedilemedi - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8295,102 +8305,102 @@ Would you like to save the file with a different name? Dosyayı farklı bir adla kaydetmek ister misiniz? - - - + + + Saving aborted Kaydetme iptal edildi - + Save dependent files Bağımlı dosyaları kaydet - + The file contains external dependencies. Do you want to save the dependent files, too? Dosya dış bağımlılıklar içeriyor. Bağımlı dosyaları da kaydetmek istiyor musunuz? - - + + Saving document failed Belge kaydetme başarısız oldu - + Save document under new filename... Belgeyi yeni bir dosya adı altında kaydedin... - - + + Save %1 Document %1 Belgeyi Kaydet - + Document Döküman - - + + Failed to save document Belgeyi kaydetme başarısız - + Documents contains cyclic dependencies. Do you still want to save them? Belgeler döngüsel bağımlılıklar içeriyor. Yine de bunları kaydetmek istiyor musunuz? - + Save a copy of the document under new filename... Dokümanın bir kopyasını yeni dosya adı altında kaydedin... - + %1 document (*.FCStd) %1 belgesi (*. FCStd) - + Document not closable Belge kapatılamıyor - + The document is not closable for the moment. Belge şu an için kapatılamıyor. - + Document not saved Belge kaydedilmedi - + The document%1 could not be saved. Do you want to cancel closing it? %1 belgesi kaydedilemedi. Kapatmayı iptal etmek istiyor musunuz? - + Undo Geri al - + Redo Yinele - + There are grouped transactions in the following documents with other preceding transactions Aşağıdaki belgelerde, diğer önceki işlemlerle gruplanmış işlemler var - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8471,12 +8481,12 @@ Please open a browser window and type in: http://localhost:%1. Seçenekler... - + Out of memory Yetersiz bellek - + Not enough memory available to display the data. Verileri görüntülemek için yetersiz bellek. @@ -8502,7 +8512,7 @@ Please open a browser window and type in: http://localhost:%1. Ek açıklamayı taşı - + Transform Dönüştür @@ -8568,7 +8578,7 @@ Please open a browser window and type in: http://localhost:%1. %1 boş değil, içerik de silinsin mi? - + Translation: Ötele: @@ -8616,32 +8626,32 @@ Please open a browser window and type in: http://localhost:%1. Başarısız bağlantı grubu oluşturma - + Create link failed Başarısız bağlantı oluşturma - + Failed to create relative link Bağıl bağlantı oluşturma başarısız - + Unlink failed Başarısız bağlantı çözme - + Replace link failed Başarısız bağlantı değiştirme - + Failed to import links Bağlantıları içe aktarma başarısız - + Failed to import all links Tüm bağlantıların içe aktarılması başarısız @@ -9353,14 +9363,14 @@ the current copy will be lost. StdCmdGroup - + Create group Grup oluştur - - Create a new group for ordering objects - Nesneleri sıralamak için yeni bir grup oluşturun + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9418,13 +9428,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Bağlantı eylemleri - - + + Actions that apply to link objects Actions that apply to link objects @@ -9432,12 +9442,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Bağlantıları içe aktar - + Import selected external link(s) Seçilen dış bağlantı(lar) ı içe aktar @@ -9445,12 +9455,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Tüm bağlantıları içe aktar - + Import all links of the active document Etkin belgenin tüm bağlantılarını içe aktar @@ -9463,9 +9473,9 @@ the current copy will be lost. Bağlantı oluştur - - Create a link to the selected object(s) - Seçilen nesne(ler) e bağlantı oluştur + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9484,12 +9494,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Alt bağlantı oluştur - + Create a sub-object or sub-element link Bir alt nesne veya alt öğe bağlantısı oluştur @@ -9497,12 +9507,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Bağlantıyla değiştir - + Replace the selected object(s) with link Seçilen nesne(ler) i bağlantıyla değiştir @@ -9510,13 +9520,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Bağlantı gezintisi - - + + Link navigation actions Bağlantı gezinti eylemleri @@ -9524,12 +9534,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Tüm bağlantıları seç - + Select all links to the current selected object Mevcut seçili nesneye olan tüm bağlantıları seç @@ -9537,12 +9547,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Bağlantılı nesneye git - + Select the linked object and switch to its owner document Bağlantılı nesneleri seç ve sahibini belge olarak değiştir @@ -9550,12 +9560,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object En derin bağlantılı nesneye git - + Select the deepest linked object and switch to its owner document Derin bağlantılı nesneleri seç ve sahibini belge olarak değiştir @@ -9563,12 +9573,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Bağlantıyı kaldır - + Strip on level of link Bağlantı düzeyinde çıkarın @@ -9801,9 +9811,11 @@ the current copy will be lost. Parça oluştur - - Create a new part and make it active - Yeni bir parça oluşturma ve aktif hale getirme + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10104,48 +10116,20 @@ the current copy will be lost. Sahne Denetmeni - - StdCmdSelBack - - - &Back - Geri - - - - - Go back to previous selection - Önceki seçime geri dön - - StdCmdSelBoundingBox - + &Bounding box Sınır kutusu - - + + Show selection bounding box Seçimin sınır kutusunu göster - - StdCmdSelForward - - - &Forward - &İleri - - - - - Repeat the backed selection - Desteklenen seçimi tekrarlayın - - StdCmdSelectAll @@ -10457,13 +10441,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions AğaçGörünümü eylemleri - - + + TreeView behavior options and actions AğaçGörünümü davranış seçenekleri ve eylemleri @@ -11003,13 +10987,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11017,13 +11001,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11031,13 +11015,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Daralt/Genişlet - - + + Expand active document and collapse all others Aktif belgeyi genişlet ve diğerlerini daralt @@ -11045,12 +11029,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Sürüklemeyi başlat - + Initiate dragging of current selected tree items Mevcut seçilen ağaç ögelerini sürüklemeyi başlat @@ -11058,13 +11042,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Çoklu belge - - + + Display all documents in the tree view Unsur ağacındaki tüm belgeleri görüntüle @@ -11072,12 +11056,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Ön seçim - + Preselect the object in 3D view when mouse over the tree item Fare ağaç ögesinin üzerine geldiğinde 3B görünümdeki nesneyi ön seç @@ -11085,12 +11069,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Seçimi kaydet - + Record selection in tree view in order to go back/forward using navigation button Gezinme düğmesini kullanarak geri/ileri gitmek için unsur ağacında seçimi kaydedin @@ -11112,13 +11096,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Tek belge - - + + Only display the active document in the tree view Unsur ağacında, yalnız aktif belgeyi görüntüle @@ -11126,12 +11110,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Yerleşimi eşzamanla - + Auto adjust placement on drag and drop objects across coordinate systems Koordinat sistemleri boyunca, sürükle ve bırak nesneleri üzerinde yerleşimi otomatik ayarla @@ -11139,12 +11123,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Seçimi eşzamanla - + Auto expand tree item when the corresponding object is selected in 3D view İlgili nesne 3B görünümünde seçildiğinde ağaç ögesini otomatik genişlet @@ -11152,12 +11136,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Görünümü eşzamanla - + Auto switch to the 3D view containing the selected item Seçili ögeyi içeren 3B görünümüne otomatik geçiş yap @@ -11391,7 +11375,7 @@ Do you want to save the document now? Std_Group - + Group Grup @@ -12089,12 +12073,12 @@ etkinleştirilip gösterileceğini seçin NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12952,4 +12936,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_uk.ts b/src/Gui/Language/FreeCAD_uk.ts index 7146601992..f117d3f1af 100644 --- a/src/Gui/Language/FreeCAD_uk.ts +++ b/src/Gui/Language/FreeCAD_uk.ts @@ -137,22 +137,22 @@ Створити групу посилань - + Make link Створити посилання - + Make sub-link Створити вкладене посилання - + Import links Імпортувати посилання - + Import all links Імпортувати всі посилання @@ -167,12 +167,12 @@ Вставити текстовий документ - + Add a part Додати деталь - + Add a group Додати групу @@ -778,37 +778,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Налаштування камери - + Orientation Орієнтація - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Поточний вид @@ -1817,7 +1817,7 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + Знайти файл: @@ -1827,7 +1827,7 @@ same time. The one with the highest priority will be triggered. Find in files: - Find in files: + Знайти у файлах: @@ -3961,7 +3961,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Навігація @@ -4055,35 +4055,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements Базовий колір для всіх елементів + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D Навігація - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Перелік налаштувань кнопок миші для кожного обраного параметра навігації. Виберіть набір, а потім натисніть кнопку для перегляду конфігурацій. - + Mouse... Мишка... - + Navigation settings set Набір налаштувань навігації - + Orbit style Стиль орбіти - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4094,116 +4119,116 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable Поворотна - + Trackball Трекбол - + Free Turntable Free Turntable - + Rotation mode Режим обертання - + Rotations in 3D will use current cursor position as center for rotation Обертання в 3D буде використовувати поточне положення курсору як центр обертання - + Window center Центр вікна - + Drag at cursor Перетягування під курсором - + Object center Центр обʼєкта - + Default camera orientation Типова орієнтація камери - + Default camera orientation when creating a new document or selecting the home view Визначає типову орієнтацію камери під час створення нового документа або вибору стандартного виду - + Camera zoom Масштабування камери - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Встановлює масштабування камери для нових документів. Значення це діаметр сфери, яка поміститься на екрані. - + mm мм - + Enable animated rotations Ввімкнути анімовані обертання - + Enable animation Ввімкнути анімацію - + Zoom operations will be performed at position of mouse pointer Операції масштабування буде виконано на позиції вказівника миші - + Zoom at cursor Масштабування над курсором - + Zoom step Крок масштабування - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. Визначає коефіцієнт збільшення. Крок масштабування '1' дорівнює коефіцієнту збільшення 7,5. - + Direction of zoom operations will be inverted Напрямок масштабування операцій буде інвертований - + Invert zoom Інвертувати масштабування - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4212,67 +4237,57 @@ Mouse tilting is not disabled by this setting. Нахил миші не вимикається цим параметром. - + Disable touchscreen tilt gesture Вимкнути реакцію на нахил екрану - - Show the rotation center when dragging. - Показувати центр обертання при перетягуванні. - - - - Enable rotation center indication - Увімкнути індикацію центру обертання - - - + Isometric Ізометричний - + Dimetric Диметрія - + Trimetric Триметрія - + Top Згори - + Front Фронтальний - + Left Ліворуч - + Right Направо - + Rear Ззаду - + Bottom Знизу - + Custom Підлаштувати @@ -5835,13 +5850,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Виберіть файл - + Select a directory Виберіть теку @@ -5849,13 +5864,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Зберегти як - - + + Open Відкрити @@ -5863,12 +5878,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Розширений - + All files (*.*) Усі файли (*.*) @@ -5996,7 +6011,7 @@ Do you want to save your changes? Graphviz format - Graphviz format + Формат Graphviz @@ -6814,20 +6829,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Виберіть модуль - + Open %1 as Відкрити %1 як - - - Select - Вибрати - Gui::StdCmdDescription @@ -8233,7 +8243,7 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8242,44 +8252,44 @@ Do you want to continue? - + Are you sure you want to continue? Ви впевнені, що бажаєте продовжити? - + Please check report view for more... Будь ласка, перегляньте Вид Звіту... - + Physical path: Фізичний шлях: - - + + Document: Документ: - - + + Path: Шлях: - + Identical physical path Ідентичний фізичний шлях - + Could not save document Не вдалося зберегти документ - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8292,102 +8302,102 @@ Would you like to save the file with a different name? Хочете зберегти файл з іншим імʼям? - - - + + + Saving aborted Збереження перервано - + Save dependent files Зберегти залежні файли - + The file contains external dependencies. Do you want to save the dependent files, too? Файл містить зовнішні залежності. Бажаєте також зберегти залежні файли? - - + + Saving document failed Не вдалося зберегти документ - + Save document under new filename... Зберегти документ під новим імʼям... - - + + Save %1 Document Зберегти %1 документ - + Document Документ - - + + Failed to save document Не вдалося зберегти документ - + Documents contains cyclic dependencies. Do you still want to save them? Документи містять циклічні залежності. Ви все ще хочете їх зберегти? - + Save a copy of the document under new filename... Зберегти копію документа під новим іменем файла... - + %1 document (*.FCStd) Документ %1 (*.FCStd) - + Document not closable Документ не закривається - + The document is not closable for the moment. Документ не може бути закритим в даний час. - + Document not saved Документ не збережено - + The document%1 could not be saved. Do you want to cancel closing it? Документ%1 не вдалося зберегти. Бажаєте скасувати закриття? - + Undo Undo - + Redo Redo - + There are grouped transactions in the following documents with other preceding transactions В наступних документах відбувається групування операцій з іншими попередніми операціями - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8470,12 +8480,12 @@ Please open a browser window and type in: http://localhost:%1. Параметри... - + Out of memory Не вистачає памʼяті - + Not enough memory available to display the data. Недостатньо памʼяті для показу даних. @@ -8501,7 +8511,7 @@ Please open a browser window and type in: http://localhost:%1. Переміщення анотації - + Transform Перетворити @@ -8567,7 +8577,7 @@ Please open a browser window and type in: http://localhost:%1. %1 не порожній, також видалити його вміст? - + Translation: Переміщення: @@ -8615,32 +8625,32 @@ Please open a browser window and type in: http://localhost:%1. Не вдалося створити групу посилань - + Create link failed Не вдалося створити посилання - + Failed to create relative link Не вдалося створити відносне посилання - + Unlink failed Не вдалося від’єднати - + Replace link failed Не вдалося замінити посилання - + Failed to import links Не вдалось імпортувати посилання - + Failed to import all links Не вдалось імпортувати всі посилання @@ -9353,14 +9363,14 @@ the current copy will be lost. StdCmdGroup - + Create group Створити групу - - Create a new group for ordering objects - Створює нову групу для впорядкування обʼєктів + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9418,13 +9428,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Дії з посиланням - - + + Actions that apply to link objects Actions that apply to link objects @@ -9432,12 +9442,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Імпортувати посилання - + Import selected external link(s) Імпортувати вибрані зовнішні посилання @@ -9445,12 +9455,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Імпортувати всі посилання - + Import all links of the active document Импортує всі посилання активного документа @@ -9463,9 +9473,9 @@ the current copy will be lost. Створити посилання - - Create a link to the selected object(s) - Створює посилання на виділений обʼєкт(и) + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9484,12 +9494,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Створити вкладене посилання - + Create a sub-object or sub-element link Створює посилання на підоб’єкт або піделемент @@ -9497,12 +9507,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Замінити посиланням - + Replace the selected object(s) with link Замінює посиланням виділений обʼєкт(и) @@ -9510,13 +9520,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Навігація за допомогою посилань - - + + Link navigation actions Дії, пов’язані з навігацією за допомогою посилань @@ -9524,12 +9534,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Вибрати всі посилання - + Select all links to the current selected object Вибрати всі посилання на поточний вибраний обʼєкт @@ -9537,12 +9547,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Перейти до звʼязаного обʼєкта - + Select the linked object and switch to its owner document Виберіть звʼязаний обʼєкт і перейдіть до документа власника @@ -9550,12 +9560,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Перейти до найглибшого звʼязаного обʼєкта - + Select the deepest linked object and switch to its owner document Оберіть найбільш звʼязаний обʼєкт та перемкніться до його власника документа @@ -9563,12 +9573,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Відв’язати - + Strip on level of link Поділ за рівнем звʼязку @@ -9801,9 +9811,11 @@ the current copy will be lost. Створення частини - - Create a new part and make it active - Створює нову деталь і робить її активною + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10104,48 +10116,20 @@ the current copy will be lost. Інспектор сцени - - StdCmdSelBack - - - &Back - &Назад - - - - - Go back to previous selection - Повернутися до попереднього вибору - - StdCmdSelBoundingBox - + &Bounding box &Обмежувальна рамка - - + + Show selection bounding box Показує обмежувальну рамку при виділенні - - StdCmdSelForward - - - &Forward - &Вперед - - - - - Repeat the backed selection - Повторіть вибір резервної копії - - StdCmdSelectAll @@ -10457,13 +10441,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Дії з Ієрархію Документа - - + + TreeView behavior options and actions Параметри та дії Ієрархії Документа @@ -11003,13 +10987,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11017,13 +11001,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11031,13 +11015,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Згорнути/Розгорнути - - + + Expand active document and collapse all others Розгортає активний документ та згортає усі інші @@ -11045,12 +11029,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Розпочати перетягування - + Initiate dragging of current selected tree items Починає перетягування виділених елементів ієрархії @@ -11058,13 +11042,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Мульти-документ - - + + Display all documents in the tree view Показує всі документи ієрархії документа @@ -11072,12 +11056,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Попередній вибір - + Preselect the object in 3D view when mouse over the tree item Підсвічує обʼєкт в 3D-виді при наведенні мишки на елемент в ієрархії @@ -11085,12 +11069,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Записати вибір - + Record selection in tree view in order to go back/forward using navigation button Записати виділення в ієрархії до історії команд для повернення назад/вперед за допомогою кнопки навігації @@ -11112,13 +11096,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Окремий документ - - + + Only display the active document in the tree view Показує тільки активний документ в ієрархії документа @@ -11126,12 +11110,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Синхронізувати розташування - + Auto adjust placement on drag and drop objects across coordinate systems Автоматичне налаштування розташування при перетягуванні об’єктів через системи координат @@ -11139,12 +11123,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Синхронізувати виділення - + Auto expand tree item when the corresponding object is selected in 3D view Автоматично відкриває елемент в ієрархії при виділенні відповідного обʼєкта в 3D-виді @@ -11152,12 +11136,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Синхронізувати вид - + Auto switch to the 3D view containing the selected item Автопереключення до 3D-виду, що містить виділений елемент @@ -11392,7 +11376,7 @@ Do you want to save the document now? Std_Group - + Group Група @@ -12090,12 +12074,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12956,4 +12940,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_val-ES.ts b/src/Gui/Language/FreeCAD_val-ES.ts index a480888da9..41dd2da7fc 100644 --- a/src/Gui/Language/FreeCAD_val-ES.ts +++ b/src/Gui/Language/FreeCAD_val-ES.ts @@ -137,22 +137,22 @@ Crea un grup d'enllaç - + Make link Crea un enllaç - + Make sub-link Crea un subenllaç - + Import links Importa enllaços - + Import all links Importa tots els enllaços @@ -167,12 +167,12 @@ Insert text document - + Add a part Add a part - + Add a group Add a group @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings Paràmetres de la càmera - + Orientation Orientació - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view Vista actual @@ -3961,7 +3961,7 @@ També podeu utilitzar la forma: Joan Peris <joan@peris.com> Gui::Dialog::DlgSettingsNavigation - + Navigation Navegació @@ -4055,35 +4055,60 @@ També podeu utilitzar la forma: Joan Peris <joan@peris.com> Base color for all elements Base color for all elements + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation Navegació 3D - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. Mostra les configuracions del botó del ratolí per a cada paràmetre de navegació escollit. Seleccioneu un paràmetre i, a continuació, premeu el botó per a veure aquestes configuracions. - + Mouse... Ratolí... - + Navigation settings set Un conjunt de configuracions de navegació - + Orbit style Estil d'òrbita - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4094,183 +4119,173 @@ Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - + Turntable En rotació - + Trackball Ratolí de bola - + Free Turntable Free Turntable - + Rotation mode Rotation mode - + Rotations in 3D will use current cursor position as center for rotation Les rotacions en 3D utilitzaran la posició actual del cursor com a centre de rotació - + Window center Window center - + Drag at cursor Drag at cursor - + Object center Object center - + Default camera orientation Default camera orientation - + Default camera orientation when creating a new document or selecting the home view Default camera orientation when creating a new document or selecting the home view - + Camera zoom Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. Configura el zoom de la càmera per als nous documents. El valor és el diàmetre de l’esfera per a ajustar-se a la pantalla. - + mm mm - + Enable animated rotations Habilita les rotacions animades - + Enable animation Habilita l'animació - + Zoom operations will be performed at position of mouse pointer Les operacions del zoom es realitzaran en la posició del punter del ratolí - + Zoom at cursor Zoom en el cursor - + Zoom step Zoom step - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. - + Direction of zoom operations will be inverted La direcció de les operacions de zoom s’invertirà - + Invert zoom Invertix el zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. Evita la inclinació de la vista quan s'està fent zoom amb els dits. Sols afecta l'estil de Navegació amb gestos. Aquesta opció no desactiva la inclinació del ratolí. - + Disable touchscreen tilt gesture Desactiva el gest d'inclinació de la pantalla tàctil - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric Isomètric - + Dimetric Dimètric - + Trimetric Trimètric - + Top Planta - + Front Alçat - + Left Esquerra - + Right Dreta - + Rear Posterior - + Bottom Inferior - + Custom Personalitzat @@ -5830,13 +5845,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file Seleccioneu un fitxer - + Select a directory Seleccioneu un directori @@ -5844,13 +5859,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as Anomena i guarda - - + + Open Obri @@ -5858,12 +5873,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended Expandit - + All files (*.*) Tots els fitxers (*.*) @@ -6808,20 +6823,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module Seleccioneu el mòdul - + Open %1 as Obri %1 com a - - - Select - Selecciona - Gui::StdCmdDescription @@ -8220,7 +8230,7 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8229,44 +8239,44 @@ Do you want to continue? - + Are you sure you want to continue? Are you sure you want to continue? - + Please check report view for more... Please check report view for more... - + Physical path: Physical path: - - + + Document: Document: - - + + Path: Camí: - + Identical physical path Identical physical path - + Could not save document Could not save document - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8279,102 +8289,102 @@ Would you like to save the file with a different name? Would you like to save the file with a different name? - - - + + + Saving aborted S'avorta el procés de guardar. - + Save dependent files Guarda els fitxers dependents - + The file contains external dependencies. Do you want to save the dependent files, too? El fitxer conté dependències externes. Voleu guardar també els fitxers dependents? - - + + Saving document failed No s'ha pogut guardar el document. - + Save document under new filename... Guarda el document amb un altre nom... - - + + Save %1 Document Guarda el document %1 - + Document Document - - + + Failed to save document No s'ha pogut guardar el document - + Documents contains cyclic dependencies. Do you still want to save them? Els documents contenen dependències cícliques. Encara voleu guardar-los? - + Save a copy of the document under new filename... Guarda una còpia del document amb un altre nom... - + %1 document (*.FCStd) Document %1 (*.FCStd) - + Document not closable No es pot tancar el document. - + The document is not closable for the moment. De moment el document no es pot tancar. - + Document not saved Document not saved - + The document%1 could not be saved. Do you want to cancel closing it? The document%1 could not be saved. Do you want to cancel closing it? - + Undo Desfés - + Redo Refés - + There are grouped transactions in the following documents with other preceding transactions Hi ha transaccions agrupades en els documents següents amb altres transaccions anteriors - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8455,12 +8465,12 @@ Please open a browser window and type in: http://localhost:%1. Opcions... - + Out of memory No hi ha prou memòria. - + Not enough memory available to display the data. No hi ha prou memòria disponible per a mostrar les dades. @@ -8486,7 +8496,7 @@ Please open a browser window and type in: http://localhost:%1. Mou l'anotació - + Transform Transforma @@ -8552,7 +8562,7 @@ Please open a browser window and type in: http://localhost:%1. L'%1 no és buit, voleu esborrar-ne le contingut? - + Translation: Translació: @@ -8600,32 +8610,32 @@ Please open a browser window and type in: http://localhost:%1. No s'ha pogut crear el grup d'enllaç - + Create link failed No s'ha pogut crear l'enllaç - + Failed to create relative link No s'ha pogut crear l'enllaç relatiu - + Unlink failed No s'ha pogut desenllaçar - + Replace link failed No s'ha pogut reemplaçar l'enllaç - + Failed to import links No s'han pogut importar els enllaços - + Failed to import all links No s'han pogut importar tots els enllaços @@ -9337,14 +9347,14 @@ the current copy will be lost. StdCmdGroup - + Create group Crea un grup - - Create a new group for ordering objects - Crear un nou grup per a ordenar els objectes + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9402,13 +9412,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions Enllaça accions - - + + Actions that apply to link objects Actions that apply to link objects @@ -9416,12 +9426,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links Importa enllaços - + Import selected external link(s) Importa els enllaços externs seleccionats @@ -9429,12 +9439,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links Importa tots els enllaços - + Import all links of the active document Importa tots els enllaços del document actiu @@ -9447,9 +9457,9 @@ the current copy will be lost. Crea un enllaç - - Create a link to the selected object(s) - Crea un enllaç a l'objectes o objectes seleccionats + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9468,12 +9478,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link Crea un subenllaç - + Create a sub-object or sub-element link Crea un enllaç d'un subobjecte o subelement @@ -9481,12 +9491,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link Substitueix per un enllaç - + Replace the selected object(s) with link Substitueix els objectes seleccionats per un enllaç @@ -9494,13 +9504,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation Navegació a través d'enllaços - - + + Link navigation actions Accions de navegació a través d'enllaços @@ -9508,12 +9518,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links Selecciona tots els enllaços - + Select all links to the current selected object Selecciona tots els enllaços a l'objecte seleccionat actualment @@ -9521,12 +9531,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object Ves a l'objecte enllaçat - + Select the linked object and switch to its owner document Seleccioneu objecte enllaçat i canvieu al document de propietari @@ -9534,12 +9544,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object Ves a l’objecte enllaçat més profund - + Select the deepest linked object and switch to its owner document Seleccioneu l'objecte enllaçat més profund i canvieu al document de propietari @@ -9547,12 +9557,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink Desenllaça - + Strip on level of link Elimina en el nivell d'enllaç @@ -9785,9 +9795,11 @@ the current copy will be lost. Crea una peça - - Create a new part and make it active - Crea una peça nova i fes-la activa + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10088,48 +10100,20 @@ the current copy will be lost. Inspector d'escena - - StdCmdSelBack - - - &Back - &Ves arrere - - - - - Go back to previous selection - Torna a la selecció anterior - - StdCmdSelBoundingBox - + &Bounding box &Caixa contenidora - - + + Show selection bounding box Mostra la caixa contenidora de la selecció - - StdCmdSelForward - - - &Forward - &Ves avant - - - - - Repeat the backed selection - Repeteix la selecció emmagatzemada - - StdCmdSelectAll @@ -10441,13 +10425,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions Accions de la vista d'arbre - - + + TreeView behavior options and actions Opcions i accions del comportament de la vista d'arbre @@ -10987,13 +10971,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view Recall working view - - + + Recall previously stored temporary working view Recall previously stored temporary working view @@ -11001,13 +10985,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view Store working view - - + + Store a document-specific temporary working view Store a document-specific temporary working view @@ -11015,13 +10999,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand Contrau/Expandeix - - + + Expand active document and collapse all others Expandeix el document actiu i contrau tota la resta @@ -11029,12 +11013,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging Inicia l'arrossegament - + Initiate dragging of current selected tree items Inicia l'arrossegament dels elements d'arbre seleccionats actualment @@ -11042,13 +11026,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document Document múltiple - - + + Display all documents in the tree view Mostra tots els documents en la vista d'arbre @@ -11056,12 +11040,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection Preselecció - + Preselect the object in 3D view when mouse over the tree item Selecciona l'objecte en vista 3D en fer clic amb el ratolí sobre l'element de l'arbre @@ -11069,12 +11053,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection Grava la selecció - + Record selection in tree view in order to go back/forward using navigation button Grava la selecció en la vista de l'arbre per a anar arrere/avant mitjançant el botó de navegació @@ -11096,13 +11080,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document Document únic - - + + Only display the active document in the tree view Mostra només el document actiu a la vista d'arbre @@ -11110,12 +11094,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement Sincronitza el posicionament - + Auto adjust placement on drag and drop objects across coordinate systems Ajusta automàticament el posicionament en arrossegar i deixar anar objectes en els sistemes de coordenades @@ -11123,12 +11107,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection Sincronitza la selecció - + Auto expand tree item when the corresponding object is selected in 3D view Expandeix automàticament l’element de l'arbre quan l’objecte corresponent està seleccionat en la vista 3D @@ -11136,12 +11120,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view Sincronitza la vista - + Auto switch to the 3D view containing the selected item Canvia automàticament a la vista 3D que conté l’element seleccionat @@ -11376,7 +11360,7 @@ Voleu guardar el document ara? Std_Group - + Group Grup @@ -12074,12 +12058,12 @@ després que s'execute FreeCAD NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12939,4 +12923,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_zh-CN.ts b/src/Gui/Language/FreeCAD_zh-CN.ts index 1328b87c01..945c4e7eeb 100644 --- a/src/Gui/Language/FreeCAD_zh-CN.ts +++ b/src/Gui/Language/FreeCAD_zh-CN.ts @@ -137,22 +137,22 @@ 创建链接组 - + Make link 创建链接 - + Make sub-link 创建子链接 - + Import links 导入链接 - + Import all links 导入所有链接 @@ -167,12 +167,12 @@ 插入文本文档 - + Add a part 添加一个零件 - + Add a group 添加一个群组 @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings 相机设置 - + Orientation 方向 - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view 当前视图 @@ -3950,7 +3950,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation 导航栏 @@ -4044,35 +4044,60 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements 所有元素的基本颜色 + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 三维导航 - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. 列出每个所选导航设置的鼠标按钮配置。 选择一组然后按下按钮查看所述配置。 - + Mouse... 鼠标... - + Navigation settings set 导航栏设置 - + Orbit style 环绕模式 - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4083,115 +4108,115 @@ Free Turntable: the part will be rotated around the z-axis. 自由转盘：部件将绕z轴旋转。 - + Turntable 转盘 - + Trackball 轨迹球 - + Free Turntable 自由转盘 - + Rotation mode 旋转模式 - + Rotations in 3D will use current cursor position as center for rotation 以当前光标位置为3D旋转中心 - + Window center 窗口中心 - + Drag at cursor 在光标处拖动 - + Object center 对象中心 - + Default camera orientation 默认相机方向 - + Default camera orientation when creating a new document or selecting the home view 创建新文档或选择主视图时的默认相机方向 - + Camera zoom 镜头缩放 - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. 设置新文档相机缩放。 该值是要适合屏幕的球体的直径。 - + mm mm - + Enable animated rotations 启用动画旋转 - + Enable animation 启用动画 - + Zoom operations will be performed at position of mouse pointer 缩放操作将在鼠标指针位置进行 - + Zoom at cursor 以光标为中心缩放 - + Zoom step 缩放步进 - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. 将缩放多少。缩放步长为“1”意味着每个缩放步长为 7.5 倍。 - + Direction of zoom operations will be inverted 缩放操作的方向将反转 - + Invert zoom 反向缩放 - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. @@ -4200,67 +4225,57 @@ Mouse tilting is not disabled by this setting. 此设置不会禁用鼠标倾斜。 - + Disable touchscreen tilt gesture 禁用触摸屏倾斜手势 - - Show the rotation center when dragging. - 拖动时显示旋转中心 - - - - Enable rotation center indication - 启用旋转中心指示 - - - + Isometric 等轴测 - + Dimetric 二轴测 - + Trimetric 三轴测 - + Top 俯视 - + Front 前视 - + Left 左视 - + Right 右视 - + Rear 后视 - + Bottom 底视 - + Custom 自定义 @@ -5820,13 +5835,13 @@ Do you want to save your changes? Gui::FileChooser - - + + Select a file 选择一个文件 - + Select a directory 选择一个目录 @@ -5834,13 +5849,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as 另存为 - - + + Open 打开 @@ -5848,12 +5863,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended 扩展 - + All files (*.*) 所有文件(*.*) @@ -6799,20 +6814,15 @@ Do you want to exit without saving your data? Gui::SelectModule - + Select module 选择模块 - + Open %1 as 打开 %1 作为 - - - Select - 选择 - Gui::StdCmdDescription @@ -8215,7 +8225,7 @@ Do you want to continue? Too many opened non-intrusive notifications. Notifications are being omitted! - + Identical physical path detected. It may cause unwanted overwrite of existing document! @@ -8224,44 +8234,44 @@ Do you want to continue? - + Are you sure you want to continue? 您确定要继续吗？ - + Please check report view for more... Please check report view for more... - + Physical path: 物理路径: - - + + Document: 文档: - - + + Path: 路径: - + Identical physical path 相同的物理路径 - + Could not save document 无法保存文档 - + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8274,102 +8284,102 @@ Would you like to save the file with a different name? Would you like to save the file with a different name? - - - + + + Saving aborted 保存中止 - + Save dependent files 保存依赖文件 - + The file contains external dependencies. Do you want to save the dependent files, too? The file contains external dependencies. Do you want to save the dependent files, too? - - + + Saving document failed 保存文档失败 - + Save document under new filename... 使用新的文件名保存文档... - - + + Save %1 Document 保存%1文件 - + Document 文档 - - + + Failed to save document 保存文档失败 - + Documents contains cyclic dependencies. Do you still want to save them? 文档包含循环依赖。您仍然想要保存它们吗？ - + Save a copy of the document under new filename... 以新的文件名称保存目前文档的副本... - + %1 document (*.FCStd) %1 文档(*.FCStd) - + Document not closable 文档不可关闭 - + The document is not closable for the moment. 文档当前无法关闭. - + Document not saved 文档未保存. - + The document%1 could not be saved. Do you want to cancel closing it? The document%1 could not be saved. Do you want to cancel closing it? - + Undo 撤销 - + Redo 重做 - + There are grouped transactions in the following documents with other preceding transactions There are grouped transactions in the following documents with other preceding transactions - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8450,12 +8460,12 @@ Please open a browser window and type in: http://localhost:%1. 选项... - + Out of memory 内存不足 - + Not enough memory available to display the data. 没有足够的可用内存来显示数据. @@ -8481,7 +8491,7 @@ Please open a browser window and type in: http://localhost:%1. 移动批注 - + Transform 变换 @@ -8547,7 +8557,7 @@ Please open a browser window and type in: http://localhost:%1. %1 不是空的，一并删除其相关内容吗？ - + Translation: 变换: @@ -8595,32 +8605,32 @@ Please open a browser window and type in: http://localhost:%1. 创建链接组失败 - + Create link failed Create link failed - + Failed to create relative link Failed to create relative link - + Unlink failed 撤消链接失败 - + Replace link failed 替换链接失败 - + Failed to import links 导入链接失败。 - + Failed to import all links 导入所有链接失败 @@ -9331,14 +9341,14 @@ the current copy will be lost. StdCmdGroup - + Create group 创建组 - - Create a new group for ordering objects - 创建用于排序对象的新组 + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9396,13 +9406,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions 链接操作 - - + + Actions that apply to link objects Actions that apply to link objects @@ -9410,12 +9420,12 @@ the current copy will be lost. StdCmdLinkImport - + Import links 导入链接 - + Import selected external link(s) 导入选中的外部链接 @@ -9423,12 +9433,12 @@ the current copy will be lost. StdCmdLinkImportAll - + Import all links 导入所有链接 - + Import all links of the active document 导入活动文档中的所有链接 @@ -9441,9 +9451,9 @@ the current copy will be lost. 创建链接 - - Create a link to the selected object(s) - 创建到选中对象的链接 + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9462,12 +9472,12 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link 创建子链接 - + Create a sub-object or sub-element link 创建子对象或子元素链接 @@ -9475,12 +9485,12 @@ the current copy will be lost. StdCmdLinkReplace - + Replace with link 用链接替换 - + Replace the selected object(s) with link 将选中对象替换为链接 @@ -9488,13 +9498,13 @@ the current copy will be lost. StdCmdLinkSelectActions - + Link navigation 链接导航 - - + + Link navigation actions 链接导航操作 @@ -9502,12 +9512,12 @@ the current copy will be lost. StdCmdLinkSelectAllLinks - + Select all links 选择全部链接 - + Select all links to the current selected object 选择当前选中对象的所有链接 @@ -9515,12 +9525,12 @@ the current copy will be lost. StdCmdLinkSelectLinked - + Go to linked object 转到链接的对象 - + Select the linked object and switch to its owner document 选择链接对象并切换到包含该对象的文档 @@ -9528,12 +9538,12 @@ the current copy will be lost. StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object 转到最深的链接对象 - + Select the deepest linked object and switch to its owner document 选择最深的链接对象并切换到包含该对象的文档 @@ -9541,12 +9551,12 @@ the current copy will be lost. StdCmdLinkUnlink - + Unlink 取消链接 - + Strip on level of link 在链接级别上剥离 @@ -9779,9 +9789,11 @@ the current copy will be lost. 创建零件 - - Create a new part and make it active - 创建新的可编辑零件并激活 + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -10082,48 +10094,20 @@ the current copy will be lost. 场景检索 - - StdCmdSelBack - - - &Back - 返回(&B) - - - - - Go back to previous selection - 返回上一个选择 - - StdCmdSelBoundingBox - + &Bounding box 边框(&B) - - + + Show selection bounding box 显示选择边框 - - StdCmdSelForward - - - &Forward - 向前(&F) - - - - - Repeat the backed selection - 重复支持的选择 - - StdCmdSelectAll @@ -10435,13 +10419,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions 树视图操作 - - + + TreeView behavior options and actions 树状视图行为选项和操作 @@ -10981,13 +10965,13 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view 回顾工作视图 - - + + Recall previously stored temporary working view 回顾以前存储的临时工作视图 @@ -10995,13 +10979,13 @@ the current copy will be lost. StdStoreWorkingView - + Store working view 保存工作视图 - - + + Store a document-specific temporary working view 保存一个文件 - 指明临时工作视图 @@ -11009,13 +10993,13 @@ the current copy will be lost. StdTreeCollapseDocument - + Collapse/Expand 折叠/展开 - - + + Expand active document and collapse all others 展开活动文档并折叠所有其他文档 @@ -11023,12 +11007,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging 启动拖动 - + Initiate dragging of current selected tree items 开始拖动当前所选树项 @@ -11036,13 +11020,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document 多文档 - - + + Display all documents in the tree view 在树状图中显示所有文档 @@ -11050,12 +11034,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection 预选 - + Preselect the object in 3D view when mouse over the tree item 当鼠标悬停在树项目上时，在 3D 视图中预选对象 @@ -11063,12 +11047,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection 录制选择 - + Record selection in tree view in order to go back/forward using navigation button 在树视图中记录选择，以便使用导航按钮后退/前进 @@ -11090,13 +11074,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document 单个文档 - - + + Only display the active document in the tree view 仅在树状图中显示活动文档 @@ -11104,12 +11088,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement 同步位置 - + Auto adjust placement on drag and drop objects across coordinate systems 自动调整跨坐标系拖放对象的位置 @@ -11117,12 +11101,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection 同步选择 - + Auto expand tree item when the corresponding object is selected in 3D view 在 3D 视图中选择相应对象时自动展开树项目 @@ -11130,12 +11114,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view 同步视图 - + Auto switch to the 3D view containing the selected item 自动切换到包含已选定项目的 3D 视图 @@ -11370,7 +11354,7 @@ Do you want to save the document now? Std_Group - + Group 组 @@ -12067,12 +12051,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube Movable navigation cube - + Drag and place NaviCube Drag and place NaviCube @@ -12923,4 +12907,30 @@ You can now use Theme to get a full customization of the interface.Export the dependency graph to a file + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + + diff --git a/src/Gui/Language/FreeCAD_zh-TW.ts b/src/Gui/Language/FreeCAD_zh-TW.ts index d1c741e564..cdcd3a85bd 100644 --- a/src/Gui/Language/FreeCAD_zh-TW.ts +++ b/src/Gui/Language/FreeCAD_zh-TW.ts @@ -61,7 +61,7 @@ Enum - Enum + 列舉 @@ -137,22 +137,22 @@ 建立鏈結群組 - + Make link 建立鏈結 - + Make sub-link 建立子鏈結 - + Import links 匯入鏈結 - + Import all links 匯入所有鏈結 @@ -167,19 +167,19 @@ 插入文字文件 - + Add a part 新增部件 - + Add a group 新增群組 Align - Align + 對齊 @@ -197,7 +197,7 @@ Toggle array elements - Toggle array elements + 切換陣列元件 @@ -246,7 +246,7 @@ Link - 連結 + 鏈結 @@ -777,37 +777,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings 相機視角設定 - + Orientation 定位 - + Q0 Q0 - + Q1 Q1 - + Q2 Q2 - + Q3 Q3 - + Current view 目前視角 @@ -883,7 +883,7 @@ while doing a left or right click and move the mouse up or down View Turntable - 視景轉台 + 視景旋轉台 @@ -1002,11 +1002,11 @@ In this case the prefix will be automatically trimmed when shown in the property However, the property is still used in a script with the full name, like 'obj.Group_Name'. If this is not ticked, then the property must be uniquely named, and it is accessed like 'obj.Name'. - Prefix the property name with the group name in the form 'Group_Name' to avoid conflicts with an existing property. -In this case the prefix will be automatically trimmed when shown in the property editor. -However, the property is still used in a script with the full name, like 'obj.Group_Name'. + 在組名中使用 'Group_Name' 形式的前綴來為屬性名添加前綴，以避免與現有屬性的衝突。 +在這種情況下，在屬性編輯器中顯示時，前綴將被自動修剪。 +但是，在腳本中，屬性仍然使用完整名稱，例如 'obj.Group_Name'。 -If this is not ticked, then the property must be uniquely named, and it is accessed like 'obj.Name'. +如果不選中此選項，則屬性必須具有唯一的名稱，並且可以像 'obj.Name' 一樣存取。 @@ -1092,7 +1092,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces Property group templates - Property group templates + 屬性群組模版 @@ -1253,7 +1253,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces To change a current shortcut enter the new shortcut in the field below and press 'Assign'. - To change a current shortcut enter the new shortcut in the field below and press 'Assign'. + 要更改目前的快捷鍵，請在下面的欄位中輸入新的快捷鍵，然後按 '指定'。 @@ -1263,16 +1263,15 @@ If this is not ticked, then the property must be uniquely named, and it is acces Multi-key sequence delay: - Multi-key sequence delay: + 多重按鍵順序延遲： Time in milliseconds to wait for the next key stroke of the current key sequence. For example, pressing 'F' twice in less than the time delay setting here will be be treated as shorctcut key sequence 'F, F'. - Time in milliseconds to wait for the next key stroke of the current key sequence. -For example, pressing 'F' twice in less than the time delay setting here will be -be treated as shorctcut key sequence 'F, F'. + 等待當前按鍵序列的下一個鍵盤按鍵的時間，以毫秒 (ms) 為單位。 +例如，在設定的時間延遲內快速按兩次 'F' 將被視為快捷鍵序列 'F, F'。 @@ -1343,7 +1342,7 @@ same time. The one with the highest priority will be triggered. Type to search... - Type to search... + 輸入以搜尋... @@ -1426,7 +1425,7 @@ same time. The one with the highest priority will be triggered. Category: - Category: + 類別： @@ -1466,7 +1465,7 @@ same time. The one with the highest priority will be triggered. <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Note:</span> The changes become active the next time you load the appropriate workbench</p></body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Note:</span> The changes become active the next time you load the appropriate workbench</p></body></html> + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">注意：</span> 此更改將在下次載入相對應的工作台時生效</p></body></html> @@ -1631,7 +1630,7 @@ same time. The one with the highest priority will be triggered. Point color: - Point color: + 點顏色： @@ -1819,22 +1818,22 @@ same time. The one with the highest priority will be triggered. Find file: - Find file: + 尋找檔案： Case-insensitive search for filenames, regular expressions supported - Case-insensitive search for filenames, regular expressions supported + 對檔案名稱進行不分大小寫的搜索，支持正規表示式 Find in files: - Find in files: + 在檔案中尋找： Filter by case-insensitive file content, regular expressions supported - Filter by case-insensitive file content, regular expressions supported + 對檔案內容進行不分大小寫的過濾，支持正規表示式 @@ -1884,7 +1883,7 @@ same time. The one with the highest priority will be triggered. Launch a guide on how to set up a macro in a custom global toolbar. - Launch a guide on how to set up a macro in a custom global toolbar. + 啟動一個指引介紹如何在自訂全局工具欄中設定巨集。 @@ -1894,7 +1893,7 @@ same time. The one with the highest priority will be triggered. Open Addon Manager where macros created by the community and other addons can be downloaded. - Open Addon Manager where macros created by the community and other addons can be downloaded. + 打開附加元件管理員，可以在其中下載由社群創建的巨集和其他附加元件。 @@ -2407,7 +2406,7 @@ Specify another directory, please. Toggle visibility of Addon preference pack '%1' (use Addon Manager to permanently remove) - Toggle visibility of Addon preference pack '%1' (use Addon Manager to permanently remove) + 切換附加元件偏好設定包 '%1' 之可視性 （使用附加組件管理員永久刪除） @@ -2462,17 +2461,17 @@ Specify another directory, please. You must restart FreeCAD for changes to take effect. - You must restart FreeCAD for changes to take effect. + 您必須重新啟動 FreeCAD 以使更改生效。 Restart now - Restart now + 現在重新啟動 Restart later - Restart later + 稍後重新啟動 @@ -2550,7 +2549,7 @@ Specify another directory, please. &Comment: - &Comment: + &註釋： @@ -2646,7 +2645,7 @@ Specify another directory, please. Link - 連結 + 鏈結 @@ -2656,12 +2655,12 @@ Specify another directory, please. If enabled, then 3D view selection will be synchronized with full object hierarchy. - If enabled, then 3D view selection will be synchronized with full object hierarchy. + 如果啟用，則3D視圖選擇將與完整物件階層結構同步。 Sync sub-object selection - Sync sub-object selection + 同步子物件選擇 @@ -2696,12 +2695,12 @@ Specify another directory, please. Revert to Backup Config - Revert to Backup Config + 恢復到備份配置 WARNING: this process will undo any preference changes made since the specified date, and will also reset your Recent files and Macros to their state on that date. - WARNING: this process will undo any preference changes made since the specified date, and will also reset your Recent files and Macros to their state on that date. + 警告：此過程將取消自指定日期以來所做的任何偏好設定更改，並將最近的檔案和巨集重置為該日期的狀態。 @@ -2714,7 +2713,7 @@ Specify another directory, please. No selection in dialog, cannot load backup file - No selection in dialog, cannot load backup file + 沒有在對話框中選擇，無法載入備份檔案。 @@ -2776,25 +2775,23 @@ Specify another directory, please. Main coordinate system will always be shown in lower right corner within opened files - Main coordinate system will always be shown in -lower right corner within opened files + 主座標系統將永遠顯示在打開檔案的右下角 Show coordinate system in the corner - 在角落顯示坐標系統 + 在角落顯示座標系統 Relative size : - Relative size : + 相對大小： Size of main coordinate system representation in the corner -- in % of height/width of viewport - Size of main coordinate system representation -in the corner -- in % of height/width of viewport + 在角落顯示的主座標系統大小 -- 以可視區域高度/寬度的百分比 % 表示 @@ -2812,8 +2809,7 @@ opening or creation Time needed for last operation and resulting frame rate will be shown at the lower left corner in opened files - Time needed for last operation and resulting frame rate -will be shown at the lower left corner in opened files + 在打開文件的左下角會顯示上次操作所需的時間和結果畫面更新率 @@ -2842,7 +2838,7 @@ Changing this option requires a restart of the application. Use OpenGL VBO (Vertex Buffer Object) - Use OpenGL VBO (Vertex Buffer Object) + 使用 OpenGL VBO (Vertex Buffer Object 頂點緩衝物件) @@ -2861,16 +2857,11 @@ can be rendered directly by GPU. Note: Sometimes this feature may lead to a host of different issues ranging from graphical anomalies to GPU crash bugs. Remember to report this setting as enabled when seeking support on the FreeCAD forums - If selected, Vertex Buffer Objects (VBO) will be used. -A VBO is an OpenGL feature that provides methods for uploading -vertex data (position, normal vector, color, etc.) to the graphics card. -VBOs offer substantial performance gains because the data resides -in the graphics memory rather than the system memory and so it -can be rendered directly by GPU. + 如果選擇，將使用頂點緩衝物件（Vertex Buffer Objects - VBO）。 +VBO 是一個 OpenGL 功能，它提供了將頂點數據（位置、法線向量、顏色等）上傳到顯示卡的方法。 +VBO 能夠提供顯著的性能提升，因為數據存儲在顯示卡記憶體中，而不是系統記憶體中，所以可以由GPU直接算繪。 -Note: Sometimes this feature may lead to a host of different -issues ranging from graphical anomalies to GPU crash bugs. Remember to -report this setting as enabled when seeking support on the FreeCAD forums +注意：有時，此功能可能會導致各種不同的問題，從圖形異常到GPU崩潰錯誤。在FreeCAD論壇尋求支援時，請記住報告此設置已啟用。 @@ -2881,13 +2872,13 @@ There are 3 options available to achieve this: 3) 'Centralized', manually turn off cache in all nodes of all view provider, and only cache at the scene graph root node. This offers the fastest rendering speed but slower response to any scene changes. - 'Render Caching' is another way to say 'Rendering Acceleration'. -There are 3 options available to achieve this: -1) 'Auto' (default), let Coin3D decide where to cache. -2) 'Distributed', manually turn on cache for all view provider root node. -3) 'Centralized', manually turn off cache in all nodes of all view provider, and -only cache at the scene graph root node. This offers the fastest rendering speed -but slower response to any scene changes. + +"算繪快取" 是表示 "算繪加速" 的另一種方式。 +有3種選項可實現這一目標： + +1) '自動'（默認值），讓Coin3D決定何處進行快取。 +2) '分佈式'，手動為所有視圖提供者根節點打開快取。 +3) '集中式'，手動在所有視圖提供者的所有節點中關閉快取，並且僅在場景圖的根節點進行快取。這提供了最快的算繪速度，但對場景的任何更改反應較慢。 @@ -2912,7 +2903,7 @@ but slower response to any scene changes. What kind of multisample anti-aliasing is used - What kind of multisample anti-aliasing is used + 使用了哪種多重採樣反鋸齒技術 @@ -2952,12 +2943,12 @@ but slower response to any scene changes. One pass - One pass + 單次通過 Backface pass - Backface pass + 背面通道 @@ -2967,21 +2958,21 @@ but slower response to any scene changes. Size of vertices in the Sketcher, TechDraw and other workbenches - Size of vertices in the Sketcher, TechDraw and other workbenches + 草圖工作台、工程製圖工作台和其他工作台中的頂點大小 Eye to eye distance for stereo modes - Eye to eye distance for stereo modes + 立體模式左右兩眼間的距離 Eye-to-eye distance used for stereo projections. The specified value is a factor that will be multiplied with the bounding box size of the 3D object that is currently displayed. - Eye-to-eye distance used for stereo projections. -The specified value is a factor that will be multiplied with the -bounding box size of the 3D object that is currently displayed. + 用於立體投影的視線間距。 + +指定的值是一個因子，將與當前顯示的3D物件的邊界框大小相乘。這個因子用於計算立體投影中的視線間距。 @@ -3107,12 +3098,12 @@ bounding box size of the 3D object that is currently displayed. Daily - Daily + 每日 Weekly - Weekly + 每週 @@ -3127,7 +3118,7 @@ bounding box size of the 3D object that is currently displayed. Never - Never + 決不 @@ -3200,7 +3191,7 @@ bounding box size of the 3D object that is currently displayed. Color gradient is used with its full color range - Color gradient is used with its full color range + 顏色漸層將使用其完整的色彩範圍 @@ -3215,7 +3206,7 @@ bounding box size of the 3D object that is currently displayed. Color gradient starts from the zero value - Color gradient starts from the zero value + 顏色漸層由零值開始 @@ -3236,8 +3227,8 @@ bounding box size of the 3D object that is currently displayed. Data outside the specified min-max range will be displayed in gray - Data outside the specified min-max range -will be displayed in gray + 超出指定最小-最大範圍的資料 +會以灰色顯示 @@ -3253,13 +3244,13 @@ will be displayed in gray Data outside the specified min-max range will be displayed with transparency - Data outside the specified min-max range -will be displayed with transparency + 超出指定最小-最大範圍的資料 +會以透明顯示 Out &transparent - Out &transparent + 輸出透明 (&t) @@ -3284,7 +3275,7 @@ will be displayed with transparency Number of labels besides the color bar - Number of labels besides the color bar + 色彩條旁的標籤數量 @@ -3300,8 +3291,7 @@ will be displayed with transparency Number of decimals for labels besides the color bar - Number of decimals for labels -besides the color bar + 色彩條旁的標籤小數位數 @@ -3318,7 +3308,7 @@ besides the color bar The maximum value must be higher than the minimum value. - 最高值必須高於最低值。 + 最大值需大於最小值 @@ -3336,7 +3326,7 @@ besides the color bar The application will create a new document when started - The application will create a new document when started + 此應用程式將在啟動時建立一個新文件 @@ -3352,12 +3342,12 @@ besides the color bar Compression level for FCStd files - Compression level for FCStd files + FCStd 檔案的壓縮級別 All changes in documents are stored so that they can be undone/redone - All changes in documents are stored so that they can be undone/redone + 所有文件中的更改都會被存儲，以便可以撤消/重做 @@ -3372,19 +3362,19 @@ besides the color bar How many Undo/Redo steps should be recorded - How many Undo/Redo steps should be recorded + 復原/重作步驟記錄的次數 Allow user aborting document recomputation by pressing ESC. This feature may slightly increase recomputation time. - Allow user aborting document recomputation by pressing ESC. -This feature may slightly increase recomputation time. + 允許使用者按 ESC 來中斷文件重新計算。 +此功能可能會稍微增加重新計算時間。 Allow aborting recomputation - Allow aborting recomputation + 允許中止重新計算 @@ -3405,8 +3395,7 @@ This feature may slightly increase recomputation time. If there is a recovery file available the application will automatically run a file recovery when it is started. - If there is a recovery file available the application will -automatically run a file recovery when it is started. + 如果有一個可修復檔案存在，應用程序在啟動時將自動執行檔案修復。 @@ -3416,7 +3405,7 @@ automatically run a file recovery when it is started. How often a recovery file is written - How often a recovery file is written + 一個可修復檔寫入的頻率 @@ -3426,7 +3415,7 @@ automatically run a file recovery when it is started. A thumbnail will be stored when document is saved - A thumbnail will be stored when document is saved + 當文件儲存時會存儲一個縮圖 @@ -3442,40 +3431,39 @@ automatically run a file recovery when it is started. Sets the size of the thumbnail that is stored in the document. Common sizes are 128, 256 and 512 - Sets the size of the thumbnail that is stored in the document. -Common sizes are 128, 256 and 512 + 設定存儲在文件中的縮圖的大小。 +常見的尺寸有128、256和512。 The program logo will be added to the thumbnail - The program logo will be added to the thumbnail + 程式標誌將會被加入縮圖中 Add the program logo to the generated thumbnail - Add the program logo to the generated thumbnail + 加入程式標誌到被生成之縮圖 How many backup files will be kept when saving document - How many backup files will be kept when saving document + 當儲存文件時有多少備份檔案要保留 Maximum number of backup files to keep when resaving document - Maximum number of backup files to keep when resaving document + 當重新儲存檔文件時最大備份檔案數目 Backup files will get extension '.FCbak' and file names get date suffix according to the specified format - Backup files will get extension '.FCbak' and file names -get date suffix according to the specified format + 備份檔案將獲得 '.FCbak' 的延伸檔名，而檔案名稱將根據指定的格式獲得日期後綴。 Use date and FCBak extension - Use date and FCBak extension + 使用日期與 FCBak 延伸 @@ -3511,7 +3499,7 @@ icon in the tree view to fully reload it. Disable partial loading of external linked objects - Disable partial loading of external linked objects + 停用對外部鏈接物件的部分載入 @@ -3528,14 +3516,14 @@ icon in the tree view to fully reload it. All documents that will be created will get the specified author name. Keep blank for anonymous. You can also use the form: John Doe <john@doe.com> - All documents that will be created will get the specified author name. -Keep blank for anonymous. -You can also use the form: John Doe <john@doe.com> + 所有建立的文件將使用指定的作者名稱。 +留空表示匿名。 +您也可以使用此形式：John Doe john@doe.com The field 'Last modified by' will be set to specified author when saving the file - The field 'Last modified by' will be set to specified author when saving the file + 在存檔時將欄位“最後修改者”設為指定作者 @@ -3550,7 +3538,7 @@ You can also use the form: John Doe <john@doe.com> Default company name to use for new files - Default company name to use for new files + 新檔案所使用之預設公司名稱 @@ -3560,7 +3548,7 @@ You can also use the form: John Doe <john@doe.com> Default license for new documents - Default license for new documents + 新文件的預設授權 @@ -3635,7 +3623,7 @@ You can also use the form: John Doe <john@doe.com> URL describing more about the license - URL describing more about the license + 有關許可證的更多資訊的網址 @@ -3643,7 +3631,7 @@ You can also use the form: John Doe <john@doe.com> The format of the date to use. - The format of the date to use. + 要使用的日期格式 @@ -3653,7 +3641,7 @@ You can also use the form: John Doe <john@doe.com> Format - Format + 格式 @@ -3782,12 +3770,12 @@ You can also use the form: John Doe <john@doe.com> Transparent - Transparent + 透明 Creation method: - Creation method: + 創建方式： @@ -3807,7 +3795,7 @@ You can also use the form: John Doe <john@doe.com> Add watermark - Add watermark + 加入浮水印 @@ -3815,22 +3803,22 @@ You can also use the form: John Doe <john@doe.com> Offscreen (New) - Offscreen (New) + 螢幕外 (新) Offscreen (Old) - Offscreen (Old) + 螢幕外 (舊) Framebuffer (custom) - Framebuffer (custom) + 影格緩衝區 (自定) Framebuffer (as is) - Framebuffer (as is) + 影格緩衝區 (如同) @@ -3848,7 +3836,7 @@ You can also use the form: John Doe <john@doe.com> Variables defined by macros are created as local variables - Variables defined by macros are created as local variables + 由巨集定義的變數將被建立為局部變數 @@ -3868,7 +3856,7 @@ You can also use the form: John Doe <john@doe.com> The directory in which the application will search for macros - The directory in which the application will search for macros + 應用程式將會搜尋巨集的目錄 @@ -3878,7 +3866,7 @@ You can also use the form: John Doe <john@doe.com> Recorded macros will also contain user interface commands - Recorded macros will also contain user interface commands + 錄製的巨集還將包含使用者界面指令 @@ -3888,7 +3876,7 @@ You can also use the form: John Doe <john@doe.com> Recorded macros will also contain user interface commands as comments - Recorded macros will also contain user interface commands as comments + 錄製的巨集還將包含使用者界面指令作為註釋 @@ -3933,7 +3921,7 @@ You can also use the form: John Doe <john@doe.com> How many macros should be listed in recent macros list - How many macros should be listed in recent macros list + 在最近的巨集清單中，有多少巨集要列出 @@ -3948,46 +3936,46 @@ You can also use the form: John Doe <john@doe.com> Keyboard Modifiers - Keyboard Modifiers + 鍵盤修飾鍵 Keyboard modifiers, default = Ctrl+Shift+ - Keyboard modifiers, default = Ctrl+Shift+ + 鍵盤修飾鍵，預設 = Ctrl+Shift+ Gui::Dialog::DlgSettingsNavigation - + Navigation 導覽 Navigation cube - Navigation cube + 導覽立方體 Steps by turn - Steps by turn + 每轉步數 Number of steps by turn when using arrows (default = 8 : step angle = 360/8 = 45 deg) - Number of steps by turn when using arrows (default = 8 : step angle = 360/8 = 45 deg) + 使用箭頭時之每轉步數（預設值 = 8：步進角 = 360/8 = 45度） Corner - Corner + 角落 Corner where navigation cube is shown - Corner where navigation cube is shown + 導覽立方體顯示的角落 @@ -4012,22 +4000,22 @@ You can also use the form: John Doe <john@doe.com> Rotates to nearest possible state when clicking a cube face - Rotates to nearest possible state when clicking a cube face + 當點擊立方體的一個面時，會旋轉到最接近的可能狀態 Rotate to nearest - Rotate to nearest + 旋轉到最近的 Font name: - Font name: + 字體名稱： Font name of the navigation cube - Font name of the navigation cube + 導覽立方體的字型名稱 @@ -4037,12 +4025,12 @@ You can also use the form: John Doe <john@doe.com> Cube size - Cube size + 立方體大小 Size of the navigation cube - Size of the navigation cube + 導覽立方體大小 @@ -4054,224 +4042,239 @@ You can also use the form: John Doe <john@doe.com> Base color for all elements 所有元件之基底顏色 + + + Rotation center indicator + Rotation center indicator + + Sphere size + Sphere size + + + + Color and transparency + Color and transparency + + + + The size of the rotation center indicator + The size of the rotation center indicator + + + + The color of the rotation center indicator + The color of the rotation center indicator + + + 3D Navigation 3D 導航 - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. - List the mouse button configs for each chosen navigation setting. -Select a set and then press the button to view said configurations. + 列出每個選定導覽設定的滑鼠按鈕配置。 +選擇一個設定，然後按按鈕查看相應的配置。 - + Mouse... 滑鼠... - + Navigation settings set - Navigation settings set + 已設置之導覽設定 - + Orbit style 環繞模式 - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). Free Turntable: the part will be rotated around the z-axis. - Rotation orbit style. -Trackball: moving the mouse horizontally will rotate the part around the y-axis -Turntable: the part will be rotated around the z-axis (with constrained axes). -Free Turntable: the part will be rotated around the z-axis. + 旋轉軌道樣式。 +軌跡球：將滑鼠水平移動將使零件繞y軸旋轉。 +旋轉台：零件將被繞z軸旋轉（具有約束軸）。 +自由旋轉台：零件將被繞z軸旋轉。 - + Turntable - 可旋轉 + 旋轉台 - + Trackball 軌跡球 - + Free Turntable - Free Turntable - - - - Rotation mode - Rotation mode - - - - Rotations in 3D will use current cursor position as center for rotation - Rotations in 3D will use current cursor position as center for rotation - - - - Window center - Window center - - - - Drag at cursor - Drag at cursor - - - - Object center - Object center - - - - Default camera orientation - Default camera orientation - - - - Default camera orientation when creating a new document or selecting the home view - Default camera orientation when creating a new document or selecting the home view - - - - Camera zoom - Camera zoom - - - - Sets camera zoom for new documents. -The value is the diameter of the sphere to fit on the screen. - Sets camera zoom for new documents. -The value is the diameter of the sphere to fit on the screen. + 自由旋轉台 + Rotation mode + 旋轉模式 + + + + Rotations in 3D will use current cursor position as center for rotation + 3D中的旋轉將以目前遊標位置作為旋轉的中心點 + + + + Window center + 視窗中心 + + + + Drag at cursor + 在遊標位置拖曳 + + + + Object center + 物件中心 + + + + Default camera orientation + 預設相機方向 + + + + Default camera orientation when creating a new document or selecting the home view + 在創建新文件或選擇主頁視圖時的預設相機方向 + + + + Camera zoom + 相機縮放 + + + + Sets camera zoom for new documents. +The value is the diameter of the sphere to fit on the screen. + 設定相機對新文件的縮放。 +其值是適合放在螢幕上球的直徑 + + + mm mm - + Enable animated rotations - Enable animated rotations + 啟用動畫旋轉 - + Enable animation 啟用動畫 - + Zoom operations will be performed at position of mouse pointer - Zoom operations will be performed at position of mouse pointer + 縮放操作將在滑鼠滑標位置執行 - + Zoom at cursor - 游標處放大 + 遊標處放大 - + Zoom step 放大步驟 - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. - How much will be zoomed. -Zoom step of '1' means a factor of 7.5 for every zoom step. + 將縮放多少。 +縮放步驟 '1' 表示每個縮放步驟的係數為7.5。 - + Direction of zoom operations will be inverted - Direction of zoom operations will be inverted + 縮放操作的方向將被反轉 - + Invert zoom 反相縮放 - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - Prevents view tilting when pinch-zooming. -Affects only gesture navigation style. -Mouse tilting is not disabled by this setting. + 防止在捏合縮放時視圖傾斜。 +僅影響手勢導航風格。 +此設置不會停用滑鼠傾斜。 - + Disable touchscreen tilt gesture - Disable touchscreen tilt gesture + 停用觸控屏傾斜手勢 - - Show the rotation center when dragging. - Show the rotation center when dragging. - - - - Enable rotation center indication - Enable rotation center indication - - - + Isometric 等角立體 - + Dimetric 二等角立體 - + Trimetric 不等角立體 - + Top 上視圖 - + Front 前視圖 - + Left 左視圖 - + Right 右視圖 - + Rear 後視圖 - + Bottom 底視圖 - + Custom 自訂 @@ -4302,17 +4305,17 @@ horizontal space in Python console The cursor shape will be a block - The cursor shape will be a block + 遊標外型將會是區塊 Enable block cursor - Enable block cursor + 啟用區塊遊標 Saves Python history across sessions - Saves Python history across sessions + 橫跨作業階段儲存 Python 歷史記錄 @@ -4322,12 +4325,12 @@ horizontal space in Python console Python profiler interval (milliseconds): - Python profiler interval (milliseconds): + Python性能分析器間隔（毫秒）： The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. - The interval at which the profiler runs when there's Python code running (to keep the GUI responding). Set to 0 to disable. + 當有Python程式運行時，性能分析器運行的間隔（以保持GUI的響應）。設置為0以停用。 @@ -4340,22 +4343,22 @@ horizontal space in Python console Enable preselection, highlighted with specified color - Enable preselection, highlighted with specified color + 啟用預選擇，並用指定的顏色突顯出來 Enable preselection - Enable preselection + 啟用預先選擇 Enable selection, highlighted with specified color - Enable selection, highlighted with specified color + 啟用選擇，並用指定的顏色突顯出來 Enable selection - Enable selection + 啟用選擇 @@ -4367,9 +4370,8 @@ horizontal space in Python console Area for picking elements in 3D view. Larger value eases to pick things, but can make small features impossible to select. - Area for picking elements in 3D view. -Larger value eases to pick things, but can make small features impossible to select. - + 在3D視圖中選擇元件的區域。 +較大的值有助於挑選事物，但可能會使小特徵變得不可能選擇。 @@ -4407,7 +4409,7 @@ Larger value eases to pick things, but can make small features impossible to sel Background color for the model view - Background color for the model view + 模型視圖的背景顏色 @@ -4418,7 +4420,7 @@ Larger value eases to pick things, but can make small features impossible to sel Background will have selected color - Background will have selected color + 背景將會有選定的顏色 @@ -4429,59 +4431,59 @@ Larger value eases to pick things, but can make small features impossible to sel Background will have selected color gradient - Background will have selected color gradient + 背景將會有選定的漸層顏色 Linear gradient - Linear gradient + 線性漸層 Radial gradient - Radial gradient + 放射漸層 Top: - Top: + 上視圖： Middle: - Middle: + 中間： Color Bar - Color Bar + 色彩條 Label text color - Label text color + 標籤文字顏色 Color Bar (used in Mesh and FEM Wbs) Label text color - Color Bar (used in Mesh and FEM Wbs) Label text color + 色彩條(用於網格和有限元法工作台) 標籤文字顏色 Label text size - Label text size + 標籤文字大小 Color Bar (used in Mesh and FEM Wbs) Label Text Size - Color Bar (used in Mesh and FEM Wbs) Label Text Size + 色彩條(用於網格和有限元法工作台) 標籤文字大小 Switches the colors of the gradient - Switches the colors of the gradient + 切換漸層的顏色 @@ -4491,7 +4493,7 @@ Larger value eases to pick things, but can make small features impossible to sel Color gradient will get selected color as middle color - Color gradient will get selected color as middle color + 顏色漸層將會把選定的顏色作為中間顏色 @@ -4502,7 +4504,7 @@ Larger value eases to pick things, but can make small features impossible to sel Bottom: - Bottom: + 底視圖： @@ -4522,7 +4524,7 @@ Larger value eases to pick things, but can make small features impossible to sel Active container - Active container + 活動容器 @@ -4562,7 +4564,7 @@ Larger value eases to pick things, but can make small features impossible to sel Input the source value and unit - Input the source value and unit + 輸入原始值與單位 @@ -4572,7 +4574,7 @@ Larger value eases to pick things, but can make small features impossible to sel Input here the unit for the result - Input here the unit for the result + 在此輸入結果單位 @@ -4582,19 +4584,19 @@ Larger value eases to pick things, but can make small features impossible to sel Result - Result + 結果 List of last used calculations. To add a calculation press Return in the value input field - List of last used calculations. -To add a calculation press Return in the value input field + 最近使用的計算列表。 +要添加一個計算，請在值輸入欄中按輸入鍵。 Quantity - Quantity + 數量 @@ -4604,39 +4606,39 @@ To add a calculation press Return in the value input field Unit system: - Unit system: + 單位系統： Unit system to be used for the Quantity The preference system is the one set in the general preferences. - Unit system to be used for the Quantity -The preference system is the one set in the general preferences. + 要用於數量的單位系統。 +首選系統是在一般偏好設定中設置的。 Decimals: - Decimals: + 小數位數： Decimals for the Quantity - Decimals for the Quantity + 數量的小數位數 Unit category: - Unit category: + 單位類別： Unit category for the Quantity - Unit category for the Quantity + 用於數量的單位類別 Copy the result into the clipboard - Copy the result into the clipboard + 將結果複製到剪貼簿中 @@ -4654,12 +4656,12 @@ The preference system is the one set in the general preferences. unknown unit: - unknown unit: + 未知單位： unit mismatch - unit mismatch + 單位錯誤 @@ -4675,26 +4677,25 @@ The preference system is the one set in the general preferences. Document Recovery - 檔案修復 + 文件修復 Press 'Start Recovery' to start the recovery process of the document listed below. The 'Status' column shows whether the document could be recovered. - Press 'Start Recovery' to start the recovery process of the document listed below. - -The 'Status' column shows whether the document could be recovered. + 按下「開始修復」來進行下列文件之修復動作。 +「狀態」欄將顯示哪些文件可被修復。 Status of recovered documents: - 已修復檔案狀態： + 已修復文件狀態： Document Name - 檔案名稱 + 文件名稱 @@ -4767,7 +4768,7 @@ The 'Status' column shows whether the document could be recovered. When deleting all transient directories you won't be able to recover any files afterwards. - When deleting all transient directories you won't be able to recover any files afterwards. + 當刪除所有暫存目錄後您將無法進行任何檔案之修復。 @@ -5026,7 +5027,7 @@ The 'Status' column shows whether the document could be recovered. Do you really want to remove this parameter group? - Do you really want to remove this parameter group? + 您真的想刪除此參數群組嗎？ @@ -5158,17 +5159,17 @@ The 'Status' column shows whether the document could be recovered. Axial: - Axial: + 軸向： Shift click for opposite direction - Shift click for opposite direction + 按住 SHIFT 再點擊滑鼠以進行反方向操作 Apply axial - Apply axial + 套用軸向操作 @@ -5178,12 +5179,12 @@ The 'Status' column shows whether the document could be recovered. Use center of mass - Use center of mass + 使用質心 Selected points - Selected points + 被選的點 @@ -5198,7 +5199,7 @@ The 'Status' column shows whether the document could be recovered. Euler angles (zy'x'') - Euler angles (zy'x'') + 尤拉角 (zy'x'') @@ -5213,37 +5214,37 @@ The 'Status' column shows whether the document could be recovered. Yaw (around z-axis): - Yaw (around z-axis): + 偏航角(圍繞 z-軸)： Yaw (around z-axis) - Yaw (around z-axis) + 偏航角(圍繞 z-軸)： Pitch (around y-axis): - Pitch (around y-axis): + 俯仰角 (圍繞 y-軸)： Pitch (around y-axis) - Pitch (around y-axis) + 俯仰角 (圍繞 y-軸)： Roll (around x-axis): - Roll (around x-axis): + 翻滾角 (圍繞 x-軸)： Roll (around the x-axis) - Roll (around the x-axis) + 翻滾角 (圍繞 x-軸)： Apply incremental changes - Apply incremental changes + 套用漸進改變 @@ -5268,7 +5269,7 @@ The 'Status' column shows whether the document could be recovered. Please select 1, 2, or 3 points before clicking this button. A point may be on a vertex, face, or edge. If on a face or edge the point used will be the point at the mouse position along face or edge. If 1 point is selected it will be used as the center of rotation. If 2 points are selected the midpoint between them will be the center of rotation and a new custom axis will be created, if needed. If 3 points are selected the first point becomes the center of rotation and lies on the vector that is normal to the plane defined by the 3 points. Some distance and angle information is provided in the report view, which can be useful when aligning objects. For your convenience when Shift + click is used the appropriate distance or angle is copied to the clipboard. - Please select 1, 2, or 3 points before clicking this button. A point may be on a vertex, face, or edge. If on a face or edge the point used will be the point at the mouse position along face or edge. If 1 point is selected it will be used as the center of rotation. If 2 points are selected the midpoint between them will be the center of rotation and a new custom axis will be created, if needed. If 3 points are selected the first point becomes the center of rotation and lies on the vector that is normal to the plane defined by the 3 points. Some distance and angle information is provided in the report view, which can be useful when aligning objects. For your convenience when Shift + click is used the appropriate distance or angle is copied to the clipboard. + 在單擊此按鈕之前，請選擇1、2或3個點。點可以位於頂點、面或邊上。如果位於面或邊上，則使用的點將是沿著面或邊的鼠標位置的點。如果選擇了1個點，則它將用作旋轉的中心。如果選擇了2個點，則它們之間的中點將成為旋轉的中心，如果需要，將創建一個新的自定義軸。如果選擇了3個點，則第一個點將成為旋轉的中心，並位於由3個點定義的平面的法線向量上。在報告視圖中提供了一些距離和角度訊息，這在對齊物件時可能很有用。為了您的方便，當使用Shift +點擊時，適當的距離或角度將被複製到剪貼板上。 @@ -5299,12 +5300,12 @@ The 'Status' column shows whether the document could be recovered. Attach to remote debugger - Attach to remote debugger + 附加到遠端偵錯程式 winpdb - winpdb + winpdb @@ -5314,22 +5315,22 @@ The 'Status' column shows whether the document could be recovered. VS Code - VS Code + VS 程式碼 Address: - Address: + 位址： Port: - Port: + 埠： Redirect output - Redirect output + 重新轉向輸出 @@ -5451,12 +5452,12 @@ The 'Status' column shows whether the document could be recovered. Show dependencies - Show dependencies + 顯示相依性 Depending on - Depending on + 相依 @@ -5473,7 +5474,7 @@ The 'Status' column shows whether the document could be recovered. Depended by - Depended by + 相依於 @@ -5488,7 +5489,7 @@ The 'Status' column shows whether the document could be recovered. &Use Original Selections - &Use Original Selections + 使用原始選擇(&U) @@ -5558,13 +5559,13 @@ originally selected prior to opening this dialog Warnings - Warnings + 警告 Errors - Errors + 錯誤 @@ -5575,7 +5576,7 @@ originally selected prior to opening this dialog Show Report view on - Show Report view on + 報告檢視顯示 @@ -5633,7 +5634,7 @@ originally selected prior to opening this dialog Selection View - Selection View + 選擇視圖 @@ -5653,12 +5654,12 @@ originally selected prior to opening this dialog The number of selected items - The number of selected items + 選擇項目的數量 Picked object list - Picked object list + 挑選物件清單 @@ -5723,12 +5724,12 @@ originally selected prior to opening this dialog Duplicate subshape - Duplicate subshape + 複製子形狀 Creates a standalone copy of this subshape in the document - Creates a standalone copy of this subshape in the document + 在文件中創建這個子形狀的獨立副本 @@ -5809,7 +5810,7 @@ Do you want to save your changes? Formatted - 格式化了的 + 已格式化的 @@ -5817,7 +5818,7 @@ Do you want to save your changes? Exact match - Exact match + 完全符合 @@ -5825,19 +5826,19 @@ Do you want to save your changes? Exact match - Exact match + 完全符合 Gui::FileChooser - - + + Select a file 選擇一個檔案 - + Select a directory 選擇一個目錄 @@ -5845,13 +5846,13 @@ Do you want to save your changes? Gui::FileDialog - + Save as 另存新檔 - - + + Open 開啟 @@ -5859,12 +5860,12 @@ Do you want to save your changes? Gui::FileOptionsDialog - + Extended 延伸的 - + All files (*.*) 所有檔案(*.*) @@ -5902,22 +5903,22 @@ Do you want to save your changes? Tap OR click left mouse button. - Tap OR click left mouse button. + 點擊或使用滑鼠左鍵 Drag screen with two fingers OR press right mouse button. - Drag screen with two fingers OR press right mouse button. + 以兩指或使用滑鼠右鍵拖曳螢幕。 Drag screen with one finger OR press left mouse button. In Sketcher && other edit modes, hold Alt in addition. - Drag screen with one finger OR press left mouse button. In Sketcher && other edit modes, hold Alt in addition. + 以一根手指拖曳螢幕或按滑鼠左鈕。在Sketcher和其他編輯模式中，請同時按住ALT鍵。 Pinch (place two fingers on the screen && drag them apart from || towards each other) OR scroll middle mouse button OR PgUp/PgDown on keyboard. - Pinch (place two fingers on the screen && drag them apart from || towards each other) OR scroll middle mouse button OR PgUp/PgDown on keyboard. + 捏(將兩指置於螢幕並分開或靠近)、轉動滑鼠中鍵或是鍵盤上的PgUp/PgDown。 @@ -5930,17 +5931,17 @@ Do you want to save your changes? Graphviz couldn't be found on your system. - Graphviz couldn't be found on your system. + 在您的系統中找不到 Graphviz。 Read more about it here. - Read more about it here. + 在此讀取更多關於它的資訊 Do you want to specify its installation path if it's already installed? - Do you want to specify its installation path if it's already installed? + 如果它已經安裝的話，您是否要指定其安裝路徑 ? @@ -5992,7 +5993,7 @@ Do you want to save your changes? Graphviz format - Graphviz format + Graphviz 格式 @@ -6170,17 +6171,17 @@ Do you want to save your changes? Help addon needed! - Help addon needed! + 需要幫助的附加元件! The Help system of %1 is now handled by the "Help" addon. It can easily be installed via the Addons Manager - The Help system of %1 is now handled by the "Help" addon. It can easily be installed via the Addons Manager + %1 的幫助系統現在由 "幫助" 附加元件管理。您可以通過附加元件管理器來輕鬆安裝它 Open Addon Manager - Open Addon Manager + 開啟附加元件管理員 @@ -6204,12 +6205,12 @@ Do you want to save your changes? WARNING: This is a development version. - WARNING: This is a development version. + 警告：這是開發版。 Please do not use it in a production environment. - Please do not use it in a production environment. + 請不要在生產環境中使用它。 @@ -6226,8 +6227,8 @@ Do you want to save your changes? To link to external objects, the document must be saved at least once. Do you want to save the document now? - To link to external objects, the document must be saved at least once. -Do you want to save the document now? + 要連結到外部物件，文件必須至少儲存一次。 +您現在要儲存文件嗎? @@ -6357,22 +6358,22 @@ How do you want to proceed? Tap OR click left mouse button. - Tap OR click left mouse button. + 點擊或使用滑鼠左鍵 Drag screen with two fingers OR press ALT + middle mouse button. - Drag screen with two fingers OR press ALT + middle mouse button. + 以兩指或按下ALT+滑鼠中鍵來拖曳螢幕 Drag screen with one finger OR press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition. - Drag screen with one finger OR press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition. + 以一根手指拖曳螢幕或按住ALT鍵加滑鼠左鈕。在Sketcher和其他編輯模式中，請同時按住ALT鍵。 Pinch (place two fingers on the screen and drag them apart from or towards each other) OR scroll middle mouse button OR press ALT + right mouse button OR PgUp/PgDown on keyboard. - Pinch (place two fingers on the screen and drag them apart from or towards each other) OR scroll middle mouse button OR press ALT + right mouse button OR PgUp/PgDown on keyboard. + 捏(將兩指置於螢幕並分開或靠近)、轉動滑鼠中鍵、按住ALT加上滑鼠右鍵或是鍵盤上的PgUp/PgDown。 @@ -6380,7 +6381,7 @@ How do you want to proceed? Press modifier keys - Press modifier keys + 按下修飾鍵 @@ -6424,17 +6425,17 @@ How do you want to proceed? Press right mouse button and move mouse - Press right mouse button and move mouse + 按下滑鼠右鍵並移動滑鼠 Press left mouse button and move mouse - Press left mouse button and move mouse + 按下滑鼠左鍵並移動滑鼠 Press middle mouse button or SHIFT and right mouse button - Press middle mouse button or SHIFT and right mouse button + 按下滑鼠中鍵或 SHIFT 加滑鼠右鍵 @@ -6496,7 +6497,7 @@ How do you want to proceed? Change the linked object - Change the linked object + 更改此鏈結物件 @@ -6522,17 +6523,17 @@ How do you want to proceed? property - property + 屬性 Auto expand - Auto expand + 自動展開 Show all - Show all + 顯示全部 @@ -6548,17 +6549,17 @@ How do you want to proceed? Rename property group - Rename property group + 重新命名屬性群組 Remove property - Remove property + 移除屬性 Group name: - Group name: + 群組名稱： @@ -6659,7 +6660,7 @@ Do you want to exit without saving your data? Saves Python history across %1 sessions - Saves Python history across %1 sessions + 橫跨 %1 作業階段儲存 Python 歷史記錄 @@ -6794,36 +6795,31 @@ Do you want to exit without saving your data? Next - Next + 下一步 Case sensitive - Case sensitive + 區分大小寫 Whole words - Whole words + 整個字 Gui::SelectModule - + Select module 選擇模組 - + Open %1 as 開啟%1為 - - - Select - 選擇 - Gui::StdCmdDescription @@ -6922,12 +6918,12 @@ Do you want to specify another directory? Translation Increment: - Translation Increment: + 平移變化量： Rotation Increment: - Rotation Increment: + 旋轉變化量： @@ -6935,7 +6931,7 @@ Do you want to specify another directory? Set element color - Set element color + 設定元件顏色 @@ -6975,7 +6971,7 @@ Do you want to specify another directory? On-top when selected - On-top when selected + 當選中時保持在最上層 @@ -7051,7 +7047,7 @@ Do you want to specify another directory? The text of the underlying object has changed. Discard changes and reload the text from the object? - The text of the underlying object has changed. Discard changes and reload the text from the object? + 底層物件的文字已更改。要放棄更改並自物件重新載入文字嗎？ @@ -7095,7 +7091,7 @@ Do you want to specify another directory? Press right mouse button - Press right mouse button + 按下滑鼠右鍵 @@ -7136,27 +7132,27 @@ Do you want to specify another directory? Arabic - Arabic + 阿拉伯語 Basque - Basque + 巴斯克語 Belarusian - Belarusian + 白俄羅斯語 Bulgarian - Bulgarian + 保加利亞語 Catalan - Catalan + 加泰隆尼亞語 @@ -7191,7 +7187,7 @@ Do you want to specify another directory? Filipino - Filipino + 菲律賓語 @@ -7206,7 +7202,7 @@ Do you want to specify another directory? Galician - Galician + 加利西亞語 @@ -7226,7 +7222,7 @@ Do you want to specify another directory? Indonesian - Indonesian + 印尼語 @@ -7241,17 +7237,17 @@ Do you want to specify another directory? Kabyle - Kabyle + 卡拜爾語 Korean - Korean + 韓語 Lithuanian - Lithuanian + 立陶宛語 @@ -7266,7 +7262,7 @@ Do you want to specify another directory? Portuguese, Brazilian - Portuguese, Brazilian + 葡萄牙語 (巴西) @@ -7291,7 +7287,7 @@ Do you want to specify another directory? Serbian, Latin - Serbian, Latin + 賽爾維亞拉丁語 @@ -7311,7 +7307,7 @@ Do you want to specify another directory? Spanish, Argentina - Spanish, Argentina + 西班牙語（阿根廷） @@ -7331,17 +7327,17 @@ Do you want to specify another directory? Valencian - Valencian + 瓦倫西亞語 Vietnamese - Vietnamese + 越南語 Georgian - Georgian + 喬治亞語 @@ -7365,7 +7361,7 @@ Do you want to specify another directory? Search... - Search... + 搜尋... @@ -7476,22 +7472,22 @@ Do you want to specify another directory? Close document - Close document + 關閉文件 Close the document - Close the document + 關閉此文件 Reload document - Reload document + 重新載入文件 Reload a partially loaded document - Reload a partially loaded document + 重新載入一部份載入之文件 @@ -7501,17 +7497,17 @@ Do you want to specify another directory? Enable or disable recomputations of document - 啟用或停用檔案重新運算之功能 + 啟用或停用文件重新運算之功能 Allow partial recomputes - Allow partial recomputes + 允許部份重新運算 Enable or disable recomputating editing object when 'skip recomputation' is enabled - 啟用'跳過重新計算'時啟用或禁用重新計算編輯物件 + 啟用'跳過重新計算'時啟用或停用重新計算編輯物件 @@ -7536,12 +7532,12 @@ Do you want to specify another directory? (but must be executed) - (but must be executed) + (但是必須被執行) %1, Internal name: %2 - %1, Internal name: %2 + %1，內部名稱：%2 @@ -7549,12 +7545,12 @@ Do you want to specify another directory? Vectors - Vectors + 向量 Table - Table + 表格 @@ -7631,7 +7627,7 @@ Do you want to specify another directory? <qt>Enter username and password for "%1" at %2</qt> - <qt>輸入使用者名稱及密碼給 "%1" at %2</qt> + <qt>輸入使用者名稱及密碼給 "%1" 在 %2</qt> @@ -7843,7 +7839,7 @@ Do you want to specify another directory? Export failed - Export failed + 匯出失敗 @@ -7863,12 +7859,12 @@ Do you want to specify another directory? This system is running OpenGL %1.%2. FreeCAD requires OpenGL 2.0 or above. Please upgrade your graphics driver and/or card as required. - This system is running OpenGL %1.%2. FreeCAD requires OpenGL 2.0 or above. Please upgrade your graphics driver and/or card as required. + 此系統正在運行 OpenGL %1.%2。FreeCAD 需要 OpenGL 2.0 或更高的版本。請依要求升級您的繪圖驅動程式與/或繪圖卡。 Invalid OpenGL Version - Invalid OpenGL Version + 無效的 OpenGL 版本 @@ -7894,7 +7890,7 @@ Do you want to specify another directory? There were serious errors while loading the file. Some data might have been modified or not recovered at all. Saving the project will most likely result in loss of data. - There were serious errors while loading the file. Some data might have been modified or not recovered at all. Saving the project will most likely result in loss of data. + 在載入檔案時出現嚴重錯誤。某些資料可能已被修改或未能完全恢復。儲存該專案將很可能導致資料損失。 @@ -7931,17 +7927,17 @@ Do you want to specify another directory? Delete failed - Delete failed + 刪除失敗 Dependency error - Dependency error + 相依性錯誤 Copy selected - Copy selected + 複製選擇的部分 @@ -7951,7 +7947,7 @@ Do you want to specify another directory? Copy all documents - Copy all documents + 複製所有文件 @@ -8222,51 +8218,51 @@ Do you want to continue? 太多已開啟之非侵入通知。通知已被忽略! - + Identical physical path detected. It may cause unwanted overwrite of existing document! 偵測到相同的實體路徑。這可能會導致現有文件被不必要地覆寫！ - + Are you sure you want to continue? 您確定要繼續嗎? - + Please check report view for more... 請檢視報告視窗以獲得更多... - + Physical path: - Physical path: + 實體路徑： - - + + Document: - Document: + 文件： - - + + Path: 路徑： - + Identical physical path - Identical physical path - - - - Could not save document - Could not save document + 相同實體路徑 + Could not save document + 無法儲存文件 + + + There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details: "%1" @@ -8277,102 +8273,102 @@ Would you like to save the file with a different name? "%1" - - - + + + Saving aborted 終止存檔 - + Save dependent files - Save dependent files + 儲存相依檔案 - + The file contains external dependencies. Do you want to save the dependent files, too? 該檔案包含外部相依性。您是否也要一併儲存相依的檔案？ - - + + Saving document failed - 儲存檔案失敗 + 儲存文件失敗 - + Save document under new filename... 以新檔名儲存文件 - - + + Save %1 Document 儲存文件 %1 - + Document 文件 - - + + Failed to save document 儲存檔案失敗。 - + Documents contains cyclic dependencies. Do you still want to save them? 文件包含循環相依性。您是否仍然要儲存它們？ - + Save a copy of the document under new filename... 以新的檔案名稱儲存目前檔案的副本 - + %1 document (*.FCStd) ％1文件（*.FCStd） - + Document not closable 文件無法關閉 - + The document is not closable for the moment. 目前文件無法關閉 - + Document not saved 檔案未儲存 - + The document%1 could not be saved. Do you want to cancel closing it? 文件%1無法被儲存。請問您是否要關閉它？ - + Undo 復原 - + Redo 重做 - + There are grouped transactions in the following documents with other preceding transactions 以下文件中存在與其他前置交易進行分組的交易。 - + Choose 'Yes' to roll back all preceding transactions. Choose 'No' to roll back in the active document only. Choose 'Abort' to abort @@ -8417,7 +8413,7 @@ Choose 'Abort' to abort Split - Split + 分割 @@ -8453,12 +8449,12 @@ Please open a browser window and type in: http://localhost:%1. 選項 ... - + Out of memory 記憶體不足 - + Not enough memory available to display the data. 沒有足夠的記憶體可用來顯示資料。 @@ -8484,7 +8480,7 @@ Please open a browser window and type in: http://localhost:%1. 移動標註 - + Transform 轉換 @@ -8512,12 +8508,12 @@ Please open a browser window and type in: http://localhost:%1. Apply answer to all - Apply answer to all + 套用答案到全部 %1 Document(s) not saved - %1 Document(s) not saved + %1 文件未儲存 @@ -8550,14 +8546,14 @@ Please open a browser window and type in: http://localhost:%1. %1內尚有內容，確定要刪除嗎？ - + Translation: 轉移： Translation XY: - Translation XY: + XY 平面轉移： @@ -8567,7 +8563,7 @@ Please open a browser window and type in: http://localhost:%1. Toggle active part - Toggle active part + 切換活動部份 @@ -8578,60 +8574,60 @@ Please open a browser window and type in: http://localhost:%1. Simple group - Simple group + 簡單群組 Group with links - Group with links + 有鏈接的群組 Group with transform links - 群組內有轉換連結 + 有轉換鏈結的群組 Create link group failed - 建立群組連結失敗 + 建立鏈結群組失敗 - + Create link failed 建立連結失敗 - + Failed to create relative link 無法建立相對連結 - + Unlink failed - Unlink failed + 斷開鏈結失敗 - + Replace link failed 取代連結失敗 - + Failed to import links - Failed to import links + 匯入鏈結失敗 - + Failed to import all links - Failed to import all links + 匯入所有鏈結失敗 Invalid name - Invalid name + 無效名稱 @@ -8642,7 +8638,7 @@ underscore, and must not start with a digit. The property '%1' already exists in '%2' - The property '%1' already exists in '%2' + 屬性 '%1' 已經在 '%2' 中存在 @@ -8652,13 +8648,13 @@ underscore, and must not start with a digit. Failed to add property to '%1': %2 - Failed to add property to '%1': %2 + 加入屬性至 '%1':%2 失敗 Drag & drop failed - Drag & drop failed + 拖放操作失敗 @@ -8678,7 +8674,7 @@ underscore, and must not start with a digit. Apply to all - Apply to all + 全部套用 @@ -8689,7 +8685,7 @@ option to apply only to this link. Copy on change - Copy on change + 變更時複製 @@ -8718,7 +8714,7 @@ Also auto redo the copy if the original linked object is changed. Disable copy on change - Disable copy on change + 停用變更時複製 @@ -8737,7 +8733,7 @@ the current copy will be lost. Toggle array elements - Toggle array elements + 切換陣列元件 @@ -8786,7 +8782,7 @@ the current copy will be lost. Selection not allowed by filter - 不允許透過篩選器選取 + 不允許使用過濾器選擇 @@ -9014,7 +9010,7 @@ the current copy will be lost. Dependency graph... - 關係圖... + 相依圖... @@ -9132,7 +9128,7 @@ the current copy will be lost. Change the draw style of the objects - Change the draw style of the objects + 改變物件的繪製風格 @@ -9164,7 +9160,7 @@ the current copy will be lost. Activates or Deactivates the selected object's edit mode - Activates or Deactivates the selected object's edit mode + 啟用或停用所選物件的編輯模式 @@ -9188,7 +9184,7 @@ the current copy will be lost. Select the objects to export before choosing Export. - Select the objects to export before choosing Export. + 在選擇“匯出”之前，選擇要匯出的物件 @@ -9331,14 +9327,14 @@ the current copy will be lost. StdCmdGroup - + Create group 建立群組 - - Create a new group for ordering objects - 建立用於排列物件的群組 + + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. + A Group is a general purpose container to group objects in the Tree view, regardless of their data type. It is a simple folder to organize the objects in a model. @@ -9396,13 +9392,13 @@ the current copy will be lost. StdCmdLinkActions - + Link actions - Link actions + 連結動作 - - + + Actions that apply to link objects 適用於鏈接物件的操作 @@ -9410,25 +9406,25 @@ the current copy will be lost. StdCmdLinkImport - + Import links 匯入鏈結 - + Import selected external link(s) - Import selected external link(s) + 匯入被擇擇之外部鏈結 StdCmdLinkImportAll - + Import all links 匯入所有鏈結 - + Import all links of the active document 匯入作業中文件的所有連結 @@ -9441,9 +9437,9 @@ the current copy will be lost. 建立鏈結 - - Create a link to the selected object(s) - 建立已選物件的連結 + + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. + A Link is an object that references or links to another object in the same document, or in another document.Unlike Clones, Links reference the original Shape directly, making them more memory efficient which helps with the creation of complex assemblies. @@ -9462,93 +9458,93 @@ the current copy will be lost. StdCmdLinkMakeRelative - + Make sub-link 建立子鏈結 - + Create a sub-object or sub-element link - Create a sub-object or sub-element link + 建立一個子物件或子元件鏈結 StdCmdLinkReplace - + Replace with link - 取代連結 + 以鏈結取代 - + Replace the selected object(s) with link - 使用連結取代選取的物件 + 使用鏈結取代選取的物件 StdCmdLinkSelectActions - + Link navigation - Link navigation + 鏈結導覽 - - + + Link navigation actions - Link navigation actions + 鏈結導覽動作 StdCmdLinkSelectAllLinks - + Select all links - Select all links + 選擇所有鏈結 - + Select all links to the current selected object - Select all links to the current selected object + 選擇到當前所選物件的所有鏈結 StdCmdLinkSelectLinked - + Go to linked object 轉到連結物件 - + Select the linked object and switch to its owner document - Select the linked object and switch to its owner document + 選擇鏈結物件並切換到其所有人文件 StdCmdLinkSelectLinkedFinal - + Go to the deepest linked object - Go to the deepest linked object + 前往最深層的鏈結物件 - + Select the deepest linked object and switch to its owner document - Select the deepest linked object and switch to its owner document + 選擇最深層的鏈結物件並切換到其所有人文件 StdCmdLinkUnlink - + Unlink - Unlink + 斷開鏈結 - + Strip on level of link - Strip on level of link + 在鏈結層剝除 @@ -9556,13 +9552,13 @@ the current copy will be lost. Attach to remote debugger... - Attach to remote debugger... + 附加到遠端偵錯程式... Attach to a remotely running debugger - Attach to a remotely running debugger + 附加到一遠端執行中偵錯程式 @@ -9779,9 +9775,11 @@ the current copy will be lost. 建立零件 - - Create a new part and make it active - 建立一個可編輯零件並啟用它 + + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. + A Part is is a general purpose container to keep together a group of objects so that they act as a unit in the 3D view. +It is meant to arrange objects that have a Part TopoShape, like Part Primitives, PartDesign Bodies, and other Parts. @@ -9933,7 +9931,7 @@ the current copy will be lost. Open Recent - Open Recent + 最近開啟的檔案 @@ -9967,7 +9965,7 @@ the current copy will be lost. Redoes a previously undone action - 重做上次撤銷的操作 + 重做上次復原的操作 @@ -9989,13 +9987,13 @@ the current copy will be lost. Report a bug - Report a bug + 回報錯誤 Report a bug or suggest a feature - Report a bug or suggest a feature + 回報錯誤或建議一個功能 @@ -10082,46 +10080,18 @@ the current copy will be lost. 場景檢查器 - - StdCmdSelBack - - - &Back - &Back - - - - - Go back to previous selection - Go back to previous selection - - StdCmdSelBoundingBox - + &Bounding box - &Bounding box + 邊界框(&B) - - + + Show selection bounding box - Show selection bounding box - - - - StdCmdSelForward - - - &Forward - &Forward - - - - - Repeat the backed selection - Repeat the backed selection + 顯示選擇範圍的邊界框 @@ -10395,7 +10365,7 @@ the current copy will be lost. Collapse selected item - Collapse selected item + 摺疊選擇項目 @@ -10409,7 +10379,7 @@ the current copy will be lost. Expand selected item - Expand selected item + 展開選擇項目 @@ -10423,7 +10393,7 @@ the current copy will be lost. Select all instances - Select all instances + 選擇所有實例 @@ -10435,13 +10405,13 @@ the current copy will be lost. StdCmdTreeViewActions - + TreeView actions 樹狀圖動作 - - + + TreeView behavior options and actions 樹狀檢視的行為及動作選項 @@ -10457,7 +10427,7 @@ the current copy will be lost. Undo exactly one action - 完全撤消一個動作 + 還原恰好一個動作 @@ -10479,13 +10449,13 @@ the current copy will be lost. Edit mode - Edit mode + 編輯模式 Defines behavior when editing an object from tree - Defines behavior when editing an object from tree + 定義在從樹狀結構中編輯物件時的行為 @@ -10541,7 +10511,7 @@ the current copy will be lost. Set to dimetric view - Set to dimetric view + 設定為二等角視圖 @@ -10633,13 +10603,13 @@ the current copy will be lost. Home - Home + 主頁 Set to default home view - Set to default home view + 設定為預設的主頁視圖 @@ -10773,13 +10743,13 @@ the current copy will be lost. Restore saved camera - Restore saved camera + 還原已儲存相機 Restore saved camera settings - Restore saved camera settings + 還原已儲存相機設定 @@ -10807,7 +10777,7 @@ the current copy will be lost. Rotate the view by 90° counter-clockwise - Rotate the view by 90° counter-clockwise + 逆時針90°旋轉視圖 @@ -10821,7 +10791,7 @@ the current copy will be lost. Rotate the view by 90° clockwise - Rotate the view by 90° clockwise + 順時針90°旋轉視圖 @@ -10829,13 +10799,13 @@ the current copy will be lost. Save current camera - Save current camera + 儲存目前相機 Save current camera settings - Save current camera settings + 儲存目前相機設定 @@ -10863,7 +10833,7 @@ the current copy will be lost. Set to trimetric view - Set to trimetric view + 設定為三等角視圖 @@ -10947,7 +10917,7 @@ the current copy will be lost. Display the main window in fullscreen mode - Display the main window in fullscreen mode + 在全螢幕模式下顯示主視窗 @@ -10981,41 +10951,41 @@ the current copy will be lost. StdRecallWorkingView - + Recall working view - Recall working view + 召回工作視圖 - - + + Recall previously stored temporary working view - Recall previously stored temporary working view + 召回之前存儲的臨時工作視圖 StdStoreWorkingView - + Store working view - Store working view + 存儲工作視圖 - - + + Store a document-specific temporary working view - Store a document-specific temporary working view + 存儲文件特定的臨時工作視圖 StdTreeCollapseDocument - + Collapse/Expand 折疊/展開 - - + + Expand active document and collapse all others 展開作業中文件並折疊所有其他文件 @@ -11023,12 +10993,12 @@ the current copy will be lost. StdTreeDrag - + Initiate dragging 開始拖曳 - + Initiate dragging of current selected tree items 開始拖動目前選定的樹狀圖項目 @@ -11036,13 +11006,13 @@ the current copy will be lost. StdTreeMultiDocument - + Multi document - Multi document + 多重文件 - - + + Display all documents in the tree view 在樹狀圖檢視中顯示所有檔案 @@ -11050,12 +11020,12 @@ the current copy will be lost. StdTreePreSelection - + Pre-selection - Pre-selection + 預選 - + Preselect the object in 3D view when mouse over the tree item 將滑鼠游標停在樹狀圖項目上時，在3D視窗中預選取該物件 @@ -11063,12 +11033,12 @@ the current copy will be lost. StdTreeRecordSelection - + Record selection 錄製選取項目 - + Record selection in tree view in order to go back/forward using navigation button 將樹狀圖中選取項目記錄下來，以便使用導航按鈕 返回/前進 @@ -11090,13 +11060,13 @@ the current copy will be lost. StdTreeSingleDocument - + Single document - Single document + 單一文件 - - + + Only display the active document in the tree view 在樹狀圖中僅顯示作業中文件 @@ -11104,12 +11074,12 @@ the current copy will be lost. StdTreeSyncPlacement - + Sync placement - Sync placement + 同步放置 - + Auto adjust placement on drag and drop objects across coordinate systems 在不同座標系統中拖放物件時自動調整位置 @@ -11117,12 +11087,12 @@ the current copy will be lost. StdTreeSyncSelection - + Sync selection - Sync selection + 同步選擇 - + Auto expand tree item when the corresponding object is selected in 3D view 在3D視圖中選擇物件時，自動展開樹狀圖中對應項目 @@ -11130,12 +11100,12 @@ the current copy will be lost. StdTreeSyncView - + Sync view 同步顯示 - + Auto switch to the 3D view containing the selected item 自動切換到包含選擇項目的3D視圖 @@ -11173,7 +11143,7 @@ the current copy will be lost. Document window - 檔案視窗 + 文件視窗 @@ -11260,9 +11230,9 @@ the current copy will be lost. Are you sure you want to continue? - The following referencing objects might break. + 下列參考物件可能已損毀。 -Are you sure you want to continue? +您確定要繼續嗎？ @@ -11276,7 +11246,7 @@ Are you sure you want to continue? Dependency graph - 關係圖 + 相依圖 @@ -11314,22 +11284,22 @@ Are you sure you want to continue? Hidden line - Hidden line + 隱藏線 Hidden line mode - Hidden line mode + 隱藏線模式 No shading - No shading + 無陰影 No shading mode - No shading mode + 無陰影模式 @@ -11363,14 +11333,14 @@ Are you sure you want to continue? To link to external objects, the document must be saved at least once. Do you want to save the document now? - To link to external objects, the document must be saved at least once. -Do you want to save the document now? + 要連結到外部物件，文件必須至少儲存一次。 +您現在要儲存文件嗎? Std_Group - + Group 群組 @@ -11383,10 +11353,10 @@ Do you want to save the document now? Please check the Report View for more details. Do you still want to proceed? - The document contains dependency cycles. -Please check the Report View for more details. + 該文件包含相依循環。 +請檢查報告視圖以獲取更多細節。 -Do you still want to proceed? +您仍然想繼續嗎？ @@ -11555,7 +11525,7 @@ Do you still want to proceed? Link actions - Link actions + 連結動作 @@ -11576,7 +11546,7 @@ Do you still want to proceed? Notification Area - Notification Area + 通知區域 @@ -11586,22 +11556,22 @@ Do you still want to proceed? The Notification area will appear in the status bar - The Notification area will appear in the status bar + 通知區域將會出現在狀態列 Enable Notification Area - Enable Notification Area + 啟用通知區域 Non-intrusive notifications will appear next to the notification area in the status bar - Non-intrusive notifications will appear next to the notification area in the status bar + 非侵入性通知將出現在狀態欄中通知區域的旁邊 Enable non-intrusive notifications - Enable non-intrusive notifications + 啟用非侵入式通知 @@ -11631,53 +11601,53 @@ Do you still want to proceed? Non-Intrusive Notifications - Non-Intrusive Notifications + 非侵入性通知 Minimum Duration: - Minimum Duration: + 最短持續時間： Maximum Duration: - Maximum Duration: + 最長持續時間： Duration during which the notification will be shown (unless mouse buttons are clicked) - Duration during which the notification will be shown (unless mouse buttons are clicked) + 通知將顯示的持續時間（除非按下滑鼠按鈕） s - s + 秒 Minimum duration during which the notification will be shown (unless notification clicked) - Minimum duration during which the notification will be shown (unless notification clicked) + 通知將顯示的最短持續時間（除非通知被點擊） Maximum Number of Notifications: - Maximum Number of Notifications: + 最大通知數量： Maximum number of notifications that will be simultaneously present on the screen - Maximum number of notifications that will be simultaneously present on the screen + 螢幕上同時存在的最大通知數量 Notification width: - Notification width: + 通知欄寬度： Width of the notification in pixels - Width of the notification in pixels + 通知的寬度（以像素為單位） @@ -11692,37 +11662,37 @@ Do you still want to proceed? Prevent non-intrusive notifications from appearing when the FreeCAD Window is not the active window - Prevent non-intrusive notifications from appearing when the FreeCAD Window is not the active window + 當 FreeCAD 視窗不是活動視窗時，防止非侵入式通知出现。 Do not show when inactive - Do not show when inactive + 在非活動時不顯示 Message List - Message List + 訊息列表 Limit the number of messages that will be kept in the list. If 0 there is no limit. - Limit the number of messages that will be kept in the list. If 0 there is no limit. + 限制將保留在列表中的訊息數量。如果設為 0，則表示無限制。 Maximum Messages (0 = no limit): - Maximum Messages (0 = no limit): + 最大訊息數 (0 表示無限)： Removes the user notifications from the message list after the non-intrusive maximum duration has lapsed. - Removes the user notifications from the message list after the non-intrusive maximum duration has lapsed. + 在非侵入性的最大持續時間過後，從訊息列表中移除使用者通知。 Auto-remove User Notifications - Auto-remove User Notifications + 自動移除使用者通知 @@ -11730,19 +11700,19 @@ Do you still want to proceed? Available Workbenches - Available Workbenches + 可用工作台 <html><head/><body><p>You can reorder workbenches by drag and drop. Additional workbenches can be installed through the addon manager.</p><p> Currently, your system has the following workbenches:</p></body></html> - <html><head/><body><p>You can reorder workbenches by drag and drop. Additional workbenches can be installed through the addon manager.</p><p> -Currently, your system has the following workbenches:</p></body></html> + <html><head/><body><p>您可以通過拖放來重新排列工作台。您還可以通過附加元件管理員安裝其他工作台。</p><p> +目前，您的系統有以下工作台：</p></body></html> Start up workbench: - Start up workbench: + 啟動工作台： @@ -11753,7 +11723,7 @@ after FreeCAD launches Workbench selector position : - Workbench selector position : + 工作台選擇器位置： @@ -11762,11 +11732,11 @@ after FreeCAD launches 'Toolbar': In the toolbars, as a movable toolbar. 'Left Corner': In the menu bar, on the left corner. 'Right Corner': In the menu bar, on the right corner. - Customize where the workbench selector appears (restart required). + 自定工作台選擇器顯示位置（需要重新啟動）。 -'Toolbar': In the toolbars, as a movable toolbar. -'Left Corner': In the menu bar, on the left corner. -'Right Corner': In the menu bar, on the right corner. +'工具欄'：顯示在工具欄中，作為一個可移動的工具欄。 +'左上角'：顯示在選單欄上，位於左上角。 +'右上角'：顯示在選單欄上，位於右上角。" @@ -11776,7 +11746,7 @@ after FreeCAD launches Remember active workbench by tab - Remember active workbench by tab + 按 TAB 鍵記住目前活動工作台 @@ -11784,27 +11754,27 @@ after FreeCAD launches Choose orientation - Choose orientation + 選擇方向 Planes - Planes + 平面 XY-Plane - XY-Plane + XY-平面 XZ-Plane - XZ-Plane + XZ-平面 YZ-Plane - YZ-Plane + YZ-平面 @@ -11814,7 +11784,7 @@ after FreeCAD launches Offset: - Offset: + 偏移： @@ -11827,22 +11797,22 @@ after FreeCAD launches Planes - Planes + 平面 XY-Plane - XY-Plane + XY-平面 XZ-Plane - XZ-Plane + XZ-平面 YZ-Plane - YZ-Plane + YZ-平面 @@ -11852,7 +11822,7 @@ after FreeCAD launches Offset: - Offset: + 偏移： @@ -11877,7 +11847,7 @@ after FreeCAD launches Image size - Image size + 影像大小 @@ -11892,7 +11862,7 @@ after FreeCAD launches Keep aspect ratio - Keep aspect ratio + 保持長寬比 @@ -11940,7 +11910,7 @@ after FreeCAD launches Auto-load - Auto-load + 自動載入 @@ -11950,12 +11920,12 @@ after FreeCAD launches This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change. - This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change. + 這是目前的啟動模組，且必須被自動載入。請參閱 偏好設定/一般/自動載入 以進行更改. Loaded - Loaded + 已載入 @@ -11973,7 +11943,7 @@ after FreeCAD launches Sort alphabetically - Sort alphabetically + 依照字母排序 @@ -11983,12 +11953,12 @@ after FreeCAD launches Left corner - Left corner + 左邊角落 Right corner - Right corner + 右邊角落 @@ -12067,12 +12037,12 @@ after FreeCAD launches NaviCubeDraggableCmd - + Movable navigation cube 可移動的導航方塊 - + Drag and place NaviCube 拖放導航方塊 @@ -12082,32 +12052,32 @@ after FreeCAD launches FRONT - FRONT + 前視圖 TOP - TOP + 上視圖 RIGHT - RIGHT + 右視圖 REAR - REAR + 後視圖 BOTTOM - BOTTOM + 底視圖 LEFT - LEFT + 左視圖 @@ -12144,12 +12114,12 @@ after FreeCAD launches The cursor shape will be a block - The cursor shape will be a block + 遊標外型將會是區塊 Enable block cursor - Enable block cursor + 啟用區塊遊標 @@ -12332,7 +12302,7 @@ after FreeCAD launches Language and number format - Language and number format + 語言與數字格式 @@ -12347,12 +12317,12 @@ after FreeCAD launches Unit system: - Unit system: + 單位系統： Unit system that should be used for all parts of the application - Unit system that should be used for all parts of the application + 應該用於應用程式的所有零件的單位系統 @@ -12367,12 +12337,12 @@ after FreeCAD launches Minimum fractional inch: - Minimum fractional inch: + 最小分數英吋： Minimum fractional inch to be displayed - Minimum fractional inch to be displayed + 所要顯示的最小分數英吋 @@ -12405,7 +12375,7 @@ dot/period will always be printed. Substitute decimal separator - Substitute decimal separator + 替換小數分隔符號 @@ -12415,12 +12385,12 @@ dot/period will always be printed. Theme: - Theme: + 主題： Customize how user interface will look like - Customize how user interface will look like + 客製化使用者界面的外觀 @@ -12465,8 +12435,8 @@ this according to your screen size or personal taste Background of the main window (when no document is opened) will consist of tiles of a special image. See the FreeCAD Wiki for details about the image. - Background of the main window (when no document is opened) will consist of tiles of a special image. -See the FreeCAD Wiki for details about the image. + 主視窗的背景(當沒有開啟文件時)將由特殊影像的圖塊組成. +有關此影像的詳細資訊，請參閱 FreeCAD 維基百科網頁。 @@ -12667,8 +12637,8 @@ display the splash screen When an error has occurred, the Report View dialog becomes visible on-screen while displaying the error - When an error has occurred, the Report View dialog becomes visible -on-screen while displaying the error + 出現錯誤訊息時，報告視窗對話框 +在顯示錯誤訊息的同時出現在螢幕上 @@ -12679,8 +12649,8 @@ on-screen while displaying the error When a warning has occurred, the Report View dialog becomes visible on-screen while displaying the warning - When a warning has occurred, the Report View dialog becomes visible -on-screen while displaying the warning + 出現警告訊息時，報告視窗對話框 +在顯示警告訊息的同時出現在螢幕上 @@ -12691,25 +12661,25 @@ on-screen while displaying the warning When a normal message has occurred, the Report View dialog becomes visible on-screen while displaying the message - When a normal message has occurred, the Report View dialog becomes visible -on-screen while displaying the message + 出現正常訊息時，報告視窗對話框 +在顯示正常訊息的同時出現在螢幕上 Show report view on normal message - Show report view on normal message + 報告檢視顯示正常訊息 When a log message has occurred, the Report View dialog becomes visible on-screen while displaying the log message - When a log message has occurred, the Report View dialog becomes visible -on-screen while displaying the log message + 出現日誌訊息時，報告視窗對話框 +在顯示日誌訊息的同時出現在螢幕上 Show report view on log message - Show report view on log message + 報告檢視顯示日誌訊息 @@ -12734,7 +12704,7 @@ on-screen while displaying the log message Font color for normal messages in Report view panel - Font color for normal messages in Report view panel + 報告檢視面板中正常訊息的字體顏色 @@ -12744,7 +12714,7 @@ on-screen while displaying the log message Font color for log messages in Report view panel - Font color for log messages in Report view panel + 報告檢視面板中日誌訊息的字體顏色 @@ -12754,7 +12724,7 @@ on-screen while displaying the log message Font color for warning messages in Report view panel - Font color for warning messages in Report view panel + 報告檢視面板中警告訊息的字體顏色 @@ -12764,7 +12734,7 @@ on-screen while displaying the log message Font color for error messages in Report view panel - Font color for error messages in Report view panel + 報告檢視面板中錯誤訊息的字體顏色 @@ -12801,46 +12771,46 @@ from Python console to Report view panel Theme - Theme + 主題 This page let you customize your current theme. The offered settings are optional for theme developers so they may or may not have an effect in your current theme. - This page let you customize your current theme. The offered settings are optional for theme developers so they may or may not have an effect in your current theme. + 此頁面允許您客製化目前主題。提供的設定對主題開發人員是可選的，因此它們可能對您目前的主題有或沒有影響。 Accent color 1 - Accent color 1 + 強調色1 Accent color 2 - Accent color 2 + 強調色2 Accent color 3 - Accent color 3 + 強調色3 Style sheet (advanced): - Style sheet (advanced): + 樣式表 (進階)： Apply manually .qss Qt Stylesheets. This is the legacy way that was used to customize the interface. You can now use Theme to get a full customization of the interface. - Apply manually .qss Qt Stylesheets. This is the legacy way that was used to customize the interface. -You can now use Theme to get a full customization of the interface. + 手動應用 .qss Qt 樣式表。這是以前用於客製化界面的傳統方式。 +您現在可以使用主題（Theme）來全面客製化界面。 This color might be used by your theme to let you customize it. - This color might be used by your theme to let you customize it. + 此顏色可能由您的主題使用以讓您客製化。 @@ -12853,13 +12823,13 @@ You can now use Theme to get a full customization of the interface. Selection filter - Selection filter + 選擇過濾器 Change the Selection filter - Change the Selection filter + 改變選擇過濾器 @@ -12867,13 +12837,13 @@ You can now use Theme to get a full customization of the interface. Vertex Selection - Vertex Selection + 選擇頂點 Select a Vertex/Vertices - Select a Vertex/Vertices + 選擇一個頂點/多個頂點 @@ -12881,13 +12851,13 @@ You can now use Theme to get a full customization of the interface. Edge Selection - Edge Selection + 選擇邊 Select Edge(s) - Select Edge(s) + 選擇邊(多邊) @@ -12895,13 +12865,13 @@ You can now use Theme to get a full customization of the interface. Face Selection - Face Selection + 選擇面 Select Face(s) - Select Face(s) + 選擇面(多面) @@ -12911,7 +12881,7 @@ You can now use Theme to get a full customization of the interface. All selection filters cleared - All selection filters cleared + 清除所有選擇過濾器 @@ -12919,13 +12889,39 @@ You can now use Theme to get a full customization of the interface. Export dependency graph... - Export dependency graph... + 匯出相依圖... Export the dependency graph to a file - Export the dependency graph to a file + 匯出相依圖至一檔案 + + + + StdCmdSelBack + + + Selection Back + Selection Back + + + + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on. + + + + StdCmdSelForward + + + Selection Forward + Selection Forward + + + + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. + Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on. diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index a162e7e645..a99dadab81 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -492,7 +492,7 @@ bool MainWindow::setupTreeView(const std::string& hiddenDockWindows) bool enabled = group->GetBool("Enabled", true); if (enabled != group->GetBool("Enabled", false)) { enabled = App::GetApplication().GetUserParameter().GetGroup("BaseApp") - ->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_TreeView", true); + ->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_TreeView", false); } group->SetBool("Enabled", enabled); //ensure entry exists. if (enabled) { @@ -537,7 +537,7 @@ bool MainWindow::setupPropertyView(const std::string& hiddenDockWindows) bool enabled = group->GetBool("Enabled", true); if (enabled != group->GetBool("Enabled", false)) { enabled = App::GetApplication().GetUserParameter().GetGroup("BaseApp") - ->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_PropertyView", true); + ->GetGroup("MainWindow")->GetGroup("DockWindows")->GetBool("Std_PropertyView", false); } group->SetBool("Enabled", enabled); //ensure entry exists. if (enabled) { @@ -578,7 +578,7 @@ bool MainWindow::setupComboView(const std::string& hiddenDockWindows) if (hiddenDockWindows.find("Std_ComboView") == std::string::npos) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("DockWindows")->GetGroup("ComboView"); - bool enable = group->GetBool("Enabled", false); + bool enable = group->GetBool("Enabled", true); if (enable) { auto pcComboView = new ComboView(nullptr, this); diff --git a/src/Gui/MetaTypes.h b/src/Gui/MetaTypes.h index 99b69ed431..bac3a6d42a 100644 --- a/src/Gui/MetaTypes.h +++ b/src/Gui/MetaTypes.h @@ -28,7 +28,10 @@ #include #include #include +#include +#include +// NOLINTBEGIN Q_DECLARE_METATYPE(Base::Vector3f) Q_DECLARE_METATYPE(Base::Vector3d) Q_DECLARE_METATYPE(QList) @@ -39,5 +42,6 @@ Q_DECLARE_METATYPE(Base::Quantity) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(App::SubObjectT) Q_DECLARE_METATYPE(QList) +// NOLINTEND #endif // GUI_METATYPES_H diff --git a/src/Gui/NavigationAnimation.cpp b/src/Gui/NavigationAnimation.cpp deleted file mode 100644 index 5f62366054..0000000000 --- a/src/Gui/NavigationAnimation.cpp +++ /dev/null @@ -1,145 +0,0 @@ -// SPDX-License-Identifier: LGPL-2.1-or-later -/**************************************************************************** - * * - * Copyright (c) 2023 Bas Ruigrok (Rexbas) * - * * - * This file is part of FreeCAD. * - * * - * FreeCAD is free software: you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation, either version 2.1 of the * - * License, or (at your option) any later version. * - * * - * FreeCAD is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with FreeCAD. If not, see * - * . * - * * - ***************************************************************************/ - -#include "PreCompiled.h" -#include "NavigationAnimation.h" -#include - -using namespace Gui; - -NavigationAnimation::NavigationAnimation(NavigationStyle* navigation) - : navigation(navigation), started(false) -{} - -void NavigationAnimation::startAnimation(QAbstractAnimation::DeletionPolicy policy) -{ - started = true; - QAbstractAnimation::start(policy); -} - -void NavigationAnimation::updateCurrentValue(const QVariant& value) -{ - if (!started) { - return; - } - update(value); -} - -void NavigationAnimation::stopAnimation() -{ - QAbstractAnimation::stop(); -} - -FixedTimeAnimation::FixedTimeAnimation(NavigationStyle* navigation, const SbRotation& orientation, - const SbVec3f& rotationCenter, const SbVec3f& translation, - int duration) - : NavigationAnimation(navigation) - , targetOrientation(orientation) - , targetTranslation(translation) - , rotationCenter(rotationCenter) -{ - setDuration(duration); - setStartValue(0.0); - setEndValue(duration * 1.0); -} - -void FixedTimeAnimation::initialize() -{ - prevAngle = 0; - prevTranslation = SbVec3f(0, 0, 0); - - // Find an axis and angle to rotate from the camera orientation to the target orientation using post-multiplication - SbVec3f rotationAxisPost; - float angle; - SbRotation(navigation->getCamera()->orientation.getValue().inverse() * targetOrientation).getValue(rotationAxisPost, angle); - if (angle > M_PI) { - angle -= 2 * M_PI; - } - - // Convert post-multiplication axis to a pre-multiplication axis - navigation->getCamera()->orientation.getValue().inverse().multVec(rotationAxisPost, rotationAxis); - - angularVelocity = angle / duration(); - linearVelocity = targetTranslation / duration(); -} - -/** - * @param value The elapsed time - */ -void FixedTimeAnimation::update(const QVariant& value) -{ - float angle = value.toFloat() * angularVelocity; - SbVec3f translation = value.toFloat() * linearVelocity; - - SbRotation rotation(rotationAxis, angle - prevAngle); - - navigation->reorientCamera(navigation->getCamera(), rotation, rotationCenter); - navigation->getCamera()->position = navigation->getCamera()->position.getValue() + translation - prevTranslation; - - prevAngle = angle; - prevTranslation = translation; -} - -/** - * @param navigation The navigation style - * @param axis The rotation axis in screen coordinates - * @param velocity The angular velocity in radians per second - */ -SpinningAnimation::SpinningAnimation(NavigationStyle* navigation, const SbVec3f& axis, - float velocity) - : NavigationAnimation(navigation) - , rotationAxis(axis) -{ - setDuration((2 * M_PI / velocity) * 1000.0); - setStartValue(0.0); - setEndValue(2 * M_PI); - setLoopCount(-1); -} - -void SpinningAnimation::initialize() -{ - prevAngle = 0; - - navigation->setViewing(true); - navigation->setViewingMode(NavigationStyle::SPINNING); -} - -/** - * @param value The angle in radians - */ -void SpinningAnimation::update(const QVariant& value) -{ - SbRotation deltaRotation = SbRotation(rotationAxis, value.toFloat() - prevAngle); - navigation->reorientCamera(navigation->getCamera(), deltaRotation); - - prevAngle = value.toFloat(); -} - -void SpinningAnimation::stopAnimation() -{ - NavigationAnimation::stopAnimation(); - if (navigation->getViewingMode() != NavigationStyle::SPINNING) { - return; - } - navigation->setViewingMode(navigation->isViewing() ? NavigationStyle::IDLE : NavigationStyle::INTERACT); -} diff --git a/src/Gui/NavigationAnimation.h b/src/Gui/NavigationAnimation.h deleted file mode 100644 index 0488db5ed6..0000000000 --- a/src/Gui/NavigationAnimation.h +++ /dev/null @@ -1,96 +0,0 @@ -// SPDX-License-Identifier: LGPL-2.1-or-later -/**************************************************************************** - * * - * Copyright (c) 2023 Bas Ruigrok (Rexbas) * - * * - * This file is part of FreeCAD. * - * * - * FreeCAD is free software: you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation, either version 2.1 of the * - * License, or (at your option) any later version. * - * * - * FreeCAD is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with FreeCAD. If not, see * - * . * - * * - ***************************************************************************/ - -#ifndef GUI_NAVIGATIONANIMATION_H -#define GUI_NAVIGATIONANIMATION_H - -#include "NavigationStyle.h" -#include -#include -#include - -namespace Gui -{ - -class GuiExport NavigationAnimation : protected QVariantAnimation -{ -public: - explicit NavigationAnimation(NavigationStyle* navigation); - -protected: - NavigationStyle* navigation; - - virtual void initialize() = 0; - virtual void update(const QVariant& value) = 0; - virtual void stopAnimation(); - -private: - bool started; - - void startAnimation(QAbstractAnimation::DeletionPolicy policy = KeepWhenStopped); - void updateCurrentValue(const QVariant& value) override; - - friend class NavigationAnimator; -}; - -class GuiExport FixedTimeAnimation : public NavigationAnimation -{ -public: - explicit FixedTimeAnimation(NavigationStyle* navigation, const SbRotation& orientation, - const SbVec3f& rotationCenter, const SbVec3f& translation, - int duration); - -private: - float angularVelocity; // [rad/ms] - SbVec3f linearVelocity; // [/ms] - - SbRotation targetOrientation; - SbVec3f targetTranslation; - - float prevAngle; - SbVec3f prevTranslation; - - SbVec3f rotationCenter; - SbVec3f rotationAxis; - - void initialize() override; - void update(const QVariant& value) override; -}; - -class GuiExport SpinningAnimation : public NavigationAnimation -{ -public: - explicit SpinningAnimation(NavigationStyle* navigation, const SbVec3f& axis, float velocity); - -private: - SbVec3f rotationAxis; - float prevAngle; - - void initialize() override; - void update(const QVariant& value) override; - void stopAnimation() override; -}; - -} // namespace Gui - -#endif // GUI_NAVIGATIONANIMATION_H diff --git a/src/Gui/NavigationAnimator.cpp b/src/Gui/NavigationAnimator.cpp deleted file mode 100644 index 0060952746..0000000000 --- a/src/Gui/NavigationAnimator.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// SPDX-License-Identifier: LGPL-2.1-or-later -/**************************************************************************** - * * - * Copyright (c) 2023 Bas Ruigrok (Rexbas) * - * * - * This file is part of FreeCAD. * - * * - * FreeCAD is free software: you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation, either version 2.1 of the * - * License, or (at your option) any later version. * - * * - * FreeCAD is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with FreeCAD. If not, see * - * . * - * * - ***************************************************************************/ - -#include "PreCompiled.h" -#include "NavigationAnimator.h" -#include "NavigationAnimation.h" -#include - -using namespace Gui; - -NavigationAnimator::NavigationAnimator() - : activeAnimation(nullptr) -{} - -NavigationAnimator::~NavigationAnimator() -{ - stop(); -} - -/** - * @brief Start an animation - * - * @param animation The animation to start - */ -void NavigationAnimator::start(const std::shared_ptr& animation) -{ - stop(); - activeAnimation = animation; - activeAnimation->initialize(); - - connect(activeAnimation.get(), &NavigationAnimation::finished, this, &NavigationAnimator::reset); - activeAnimation->startAnimation(); -} - -/** - * @brief Start an animation and wait for it to finish - * - * @param animation The animation to start - * @return True if the animation finished, false if interrupted - */ -bool NavigationAnimator::startAndWait(const std::shared_ptr& animation) -{ - stop(); - bool finished = true; - QEventLoop loop; - loop.connect(animation.get(), &NavigationAnimation::finished, - [&loop, &finished, &animation]() { // clazy:exclude=lambda-in-connect - if (animation->state() == QAbstractAnimation::State::Running) { - finished = false; - } - - loop.quit(); - }); - start(animation); - loop.exec(); - return finished; -} - -/** - * @brief Stops an active animation - */ -void NavigationAnimator::stop() -{ - if (activeAnimation != nullptr && activeAnimation->state() != QAbstractAnimation::State::Stopped) { - Q_EMIT activeAnimation->finished(); - } -} - -/** - * @brief Stops the animation and releases ownership of the animation - * - * Is called when the animation finished() signal is received which is triggered when the animation - * is finished or when the animation is interrupted by NavigationAnimator::stop() - */ -void NavigationAnimator::reset() { - activeAnimation->started = false; - activeAnimation->stopAnimation(); - activeAnimation.reset(); -} diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp index 54e799ae0b..e3490ead43 100644 --- a/src/Gui/NavigationStyle.cpp +++ b/src/Gui/NavigationStyle.cpp @@ -45,13 +45,40 @@ #include "Application.h" #include "MenuManager.h" #include "MouseSelection.h" -#include "NavigationAnimator.h" -#include "NavigationAnimation.h" #include "SoMouseWheelEvent.h" #include "View3DInventorViewer.h" + using namespace Gui; +namespace Gui { +struct NavigationStyleP { + int animationsteps; + int animationdelta; + SbVec3f focal1, focal2; + SbVec3f rotationCenter; + SbBool rotationCenterFound; + NavigationStyle::RotationCenterModes rotationCenterMode; + SbRotation endRotation; + SoTimerSensor * animsensor; + float sensitivity; + SbBool resetcursorpos; + + NavigationStyleP() + { + this->animationsteps = 0; + this->animationdelta = 0; + this->animsensor = nullptr; + this->sensitivity = 2.0f; + this->resetcursorpos = false; + this->rotationCenterFound = false; + this->rotationCenterMode = NavigationStyle::RotationCenterMode::ScenePointAtCursor | + NavigationStyle::RotationCenterMode::FocalPointAtCursor; + } + static void viewAnimationCB(void * data, SoSensor * sensor); +}; +} + class FCSphereSheetProjector : public SbSphereSheetProjector { using inherited = SbSphereSheetProjector; @@ -157,19 +184,25 @@ const Base::Type& NavigationStyleEvent::style() const return t; } +#define PRIVATE(ptr) (ptr->pimpl) +#define PUBLIC(ptr) (ptr->pub) + TYPESYSTEM_SOURCE_ABSTRACT(Gui::NavigationStyle,Base::BaseClass) NavigationStyle::NavigationStyle() : viewer(nullptr), mouseSelection(nullptr) { - this->rotationCenterMode = NavigationStyle::RotationCenterMode::ScenePointAtCursor - | NavigationStyle::RotationCenterMode::FocalPointAtCursor; + PRIVATE(this) = new NavigationStyleP(); + PRIVATE(this)->animsensor = new SoTimerSensor(NavigationStyleP::viewAnimationCB, this); initialize(); } NavigationStyle::~NavigationStyle() { finalize(); - delete this->animator; + if (PRIVATE(this)->animsensor->isScheduled()) + PRIVATE(this)->animsensor->unschedule(); + delete PRIVATE(this)->animsensor; + delete PRIVATE(this); } NavigationStyle& NavigationStyle::operator = (const NavigationStyle& ns) @@ -189,15 +222,12 @@ void NavigationStyle::setViewer(View3DInventorViewer* view) void NavigationStyle::initialize() { - this->animator = new NavigationAnimator(); - - this->sensitivity = 2.0f; - this->resetcursorpos = false; this->currentmode = NavigationStyle::IDLE; + this->prevRedrawTime = SbTime::getTimeOfDay(); this->spinanimatingallowed = true; this->spinsamplecounter = 0; this->spinincrement = SbRotation::identity(); - this->rotationCenterFound = false; + this->spinRotation.setValue(SbVec3f(0, 0, -1), 0); // FIXME: use a smaller sphere than the default one to have a larger // area close to the borders that gives us "z-axis rotation"? @@ -323,71 +353,171 @@ SbBool NavigationStyle::lookAtPoint(const SbVec2s screenpos) SbVec3f hitpoint; hitpoint = picked->getPoint(); - this->rotationCenterFound = false; - translateCamera(hitpoint - getFocalPoint()); + lookAtPoint(hitpoint); return true; } -SoCamera* NavigationStyle::getCamera() const +void NavigationStyle::lookAtPoint(const SbVec3f& pos) { - return this->viewer->getCamera(); + SoCamera* cam = viewer->getSoRenderManager()->getCamera(); + if (!cam) + return; + PRIVATE(this)->rotationCenterFound = false; + + // Find global coordinates of focal point. + SbVec3f direction; + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + PRIVATE(this)->focal1 = cam->position.getValue() + + cam->focalDistance.getValue() * direction; + PRIVATE(this)->focal2 = pos; + + // avoid to interfere with spinning (fixes #3101462) + if (this->isAnimating()) + this->stopAnimating(); + + if (PRIVATE(this)->animsensor->isScheduled()) { + PRIVATE(this)->animsensor->unschedule(); + this->interactiveCountDec(); + } + + if (isAnimationEnabled()) { + SbRotation cam_rot = cam->orientation.getValue(); + // get the amount of movement + SbVec3f dir1 = direction, dir2; + dir2 = pos - cam->position.getValue(); + dir2.normalize(); + SbRotation rot(dir1, dir2); + float val = 0.5f*(1.0f + dir1.dot(dir2)); // value in range [0,1] + int div = (int)(val * 20.0f); + int steps = 20-div; // do it with max. 20 steps + + // check whether a movement is required + if (steps > 0) { + PRIVATE(this)->endRotation = cam_rot; + this->spinRotation = cam_rot; + PRIVATE(this)->animationsteps = 5; + PRIVATE(this)->animationdelta = std::max(100/steps, 5); + PRIVATE(this)->animsensor->setBaseTime(SbTime::getTimeOfDay()); + PRIVATE(this)->animsensor->schedule(); + this->interactiveCountInc(); + } + else { + // set to the given position + SbVec3f direction; + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + cam->position = pos - cam->focalDistance.getValue() * direction; + } + } + else { + // set to the given position + SbVec3f direction; + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + cam->position = pos - cam->focalDistance.getValue() * direction; + } } -void NavigationStyle::setCameraOrientation(const SbRotation& orientation, SbBool moveToCenter) +void NavigationStyle::setCameraOrientation(const SbRotation& rot, SbBool moveToCenter) { - SoCamera* camera = getCamera(); - if (!camera) + SoCamera* cam = viewer->getSoRenderManager()->getCamera(); + if (!cam) return; - animator->stop(); - - SbVec3f focalPoint = getFocalPoint(); - SbVec3f translation(0, 0, 0); - + // Find global coordinates of focal point. + SbVec3f direction; + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + PRIVATE(this)->focal1 = cam->position.getValue() + + cam->focalDistance.getValue() * direction; + PRIVATE(this)->focal2 = PRIVATE(this)->focal1; if (moveToCenter) { SoGetBoundingBoxAction action(viewer->getSoRenderManager()->getViewportRegion()); action.apply(viewer->getSceneGraph()); SbBox3f box = action.getBoundingBox(); if (!box.isEmpty()) { - translation = box.getCenter() - focalPoint; + rot.multVec(SbVec3f(0, 0, -1), direction); + //float s = (this->focal1 - box.getCenter()).dot(direction); + //this->focal2 = box.getCenter() + s * direction; + // setting the center of the overall bounding box as the future focal point + // seems to be a satisfactory solution + PRIVATE(this)->focal2 = box.getCenter(); } } - // Start an animation or set the pose directly + // avoid to interfere with spinning (fixes #3101462) + if (this->isAnimating()) + this->stopAnimating(); + + if (PRIVATE(this)->animsensor->isScheduled()) { + PRIVATE(this)->animsensor->unschedule(); + this->interactiveCountDec(); + } + if (isAnimationEnabled()) { - viewer->startAnimation(orientation, focalPoint, translation); + // get the amount of movement + SbVec3f dir1, dir2; + SbRotation cam_rot = cam->orientation.getValue(); + cam_rot.multVec(SbVec3f(0, 0, -1), dir1); + rot.multVec(SbVec3f(0, 0, -1), dir2); + float val = 0.5f*(1.0f + dir1.dot(dir2)); // value in range [0,1] + int div = (int)(val * 20.0f); + int steps = 20-div; // do it with max. 20 steps + + // check whether a movement is required + if (steps > 0) { + PRIVATE(this)->endRotation = rot; // this is the final camera orientation + this->spinRotation = cam_rot; + PRIVATE(this)->animationsteps = 5; + PRIVATE(this)->animationdelta = std::max(100/steps, 5); + PRIVATE(this)->animsensor->setBaseTime(SbTime::getTimeOfDay()); + PRIVATE(this)->animsensor->schedule(); + this->interactiveCountInc(); + } + else { + // due to possible round-off errors make sure that the + // exact orientation is set + cam->orientation.setValue(rot); + cam->position = PRIVATE(this)->focal2 - cam->focalDistance.getValue() * direction; + } } else { - // Distance from rotation center to camera position in camera coordinate system - SbVec3f rotationCenterDistanceCam = camera->focalDistance.getValue() * SbVec3f(0, 0, 1); - - // Set to the given orientation - camera->orientation = orientation; - - // Distance from rotation center to new camera position in global coordinate system - SbVec3f newRotationCenterDistance; - camera->orientation.getValue().multVec(rotationCenterDistanceCam, newRotationCenterDistance); - - // Reposition camera so the rotation center stays in the same place - // Optionally add translation to move to center - camera->position = focalPoint + newRotationCenterDistance + translation; + // set to the given rotation + cam->orientation.setValue(rot); + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + cam->position = PRIVATE(this)->focal2 - cam->focalDistance.getValue() * direction; } } -void NavigationStyle::translateCamera(const SbVec3f& translation) +void NavigationStyleP::viewAnimationCB(void * data, SoSensor * sensor) { - SoCamera* camera = getCamera(); - if (!camera) - return; + Q_UNUSED(sensor); + auto that = static_cast(data); + if (PRIVATE(that)->animationsteps > 0) { + // here the camera rotates from the current rotation to a given + // rotation (e.g. the standard views). To get this movement animated + // we calculate an interpolated rotation and update the view after + // each step + float step = std::min((float)PRIVATE(that)->animationsteps/100.0f, 1.0f); + SbRotation slerp = SbRotation::slerp(that->spinRotation, PRIVATE(that)->endRotation, step); + SbVec3f focalpoint = (1.0f-step)*PRIVATE(that)->focal1 + step*PRIVATE(that)->focal2; + SoCamera* cam = that->viewer->getSoRenderManager()->getCamera(); + if (!cam) // no camera + return; - animator->stop(); + SbVec3f direction; + cam->orientation.setValue(slerp); + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + cam->position = focalpoint - cam->focalDistance.getValue() * direction; - // Start an animation or set the pose directly - if (isAnimationEnabled()) { - viewer->startAnimation(camera->orientation.getValue(), SbVec3f(0, 0, 0), translation); - } - else { - camera->position = camera->position.getValue() + translation; + PRIVATE(that)->animationsteps += PRIVATE(that)->animationdelta; + if (PRIVATE(that)->animationsteps > 100) { + // now we have reached the end of the movement + PRIVATE(that)->animationsteps=0; + PRIVATE(that)->animsensor->unschedule(); + that->interactiveCountDec(); + // set to the actual given rotation + cam->orientation.setValue(PRIVATE(that)->endRotation); + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + cam->position = PRIVATE(that)->focal2 - cam->focalDistance.getValue() * direction; + } } } @@ -474,41 +604,29 @@ void NavigationStyle::viewAll() } } -/** Rotate the camera by the given amount, then reposition it so we're still pointing at the same - * focal point +/** Rotate the camera by the given amount, then reposition it so we're + * still pointing at the same focal point. */ -void NavigationStyle::reorientCamera(SoCamera* camera, const SbRotation& rotation) +void NavigationStyle::reorientCamera(SoCamera * cam, const SbRotation & rot) { - reorientCamera(camera, rotation, getFocalPoint()); -} - -/** Rotate the camera by the given amount, then reposition it so the rotation center stays in the - * same place - */ -void NavigationStyle::reorientCamera(SoCamera* camera, const SbRotation& rotation, const SbVec3f& rotationCenter) -{ - if (!camera) { + if (!cam) return; - } - // Distance from rotation center to camera position in camera coordinate system - SbVec3f rotationCenterDistanceCam; - camera->orientation.getValue().inverse().multVec(camera->position.getValue() - rotationCenter, rotationCenterDistanceCam); - - // Set new orientation value by accumulating the new rotation - camera->orientation = rotation * camera->orientation.getValue(); + // Find global coordinates of focal point. + SbVec3f direction; + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + SbVec3f focalpoint = cam->position.getValue() + + cam->focalDistance.getValue() * direction; + // Set new orientation value by accumulating the new rotation. + cam->orientation = rot * cam->orientation.getValue(); // Fix issue with near clipping in orthogonal view - if (camera->getTypeId().isDerivedFrom(SoOrthographicCamera::getClassTypeId())) { - camera->focalDistance = static_cast(camera)->height; + if (cam->getTypeId().isDerivedFrom(SoOrthographicCamera::getClassTypeId())) { + cam->focalDistance = static_cast(cam)->height; } - - // Distance from rotation center to new camera position in global coordinate system - SbVec3f newRotationCenterDistance; - camera->orientation.getValue().multVec(rotationCenterDistanceCam, newRotationCenterDistance); - - // Reposition camera so the rotation center stays in the same place - camera->position = rotationCenter + newRotationCenterDistance; + // Reposition camera so we are still pointing at the same old focal point. + cam->orientation.getValue().multVec(SbVec3f(0, 0, -1), direction); + cam->position = focalpoint - cam->focalDistance.getValue() * direction; } void NavigationStyle::panCamera(SoCamera * cam, float aspectratio, const SbPlane & panplane, @@ -566,7 +684,7 @@ void NavigationStyle::panToCenter(const SbPlane & pplane, const SbVec2f & currpo const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); float ratio = vp.getViewportAspectRatio(); panCamera(viewer->getSoRenderManager()->getCamera(), ratio, pplane, SbVec2f(0.5,0.5), currpos); - this->rotationCenterFound = false; + PRIVATE(this)->rotationCenterFound = false; } /** Dependent on the camera type this will either shrink or expand the @@ -577,9 +695,6 @@ void NavigationStyle::zoom(SoCamera * cam, float diffvalue) { if (!cam) // can happen for empty scenegraph return; - - animator->stop(); - SoType t = cam->getTypeId(); SbName tname = t.getName(); @@ -747,14 +862,14 @@ void NavigationStyle::doRotate(SoCamera * camera, float angle, const SbVec2f& po SbVec3f NavigationStyle::getRotationCenter(SbBool& found) const { - found = this->rotationCenterFound; - return this->rotationCenter; + found = PRIVATE(this)->rotationCenterFound; + return PRIVATE(this)->rotationCenter; } void NavigationStyle::setRotationCenter(const SbVec3f& cnt) { - this->rotationCenter = cnt; - this->rotationCenterFound = true; + PRIVATE(this)->rotationCenter = cnt; + PRIVATE(this)->rotationCenterFound = true; } SbVec3f NavigationStyle::getFocalPoint() const @@ -786,8 +901,8 @@ void NavigationStyle::spin(const SbVec2f & pointerpos) lastpos[0] = float(this->log.position[1][0]) / float(std::max((int)(glsize[0]-1), 1)); lastpos[1] = float(this->log.position[1][1]) / float(std::max((int)(glsize[1]-1), 1)); - if (this->rotationCenterMode && this->rotationCenterFound) { - SbVec3f hitpoint = this->rotationCenter; + if (PRIVATE(this)->rotationCenterMode && PRIVATE(this)->rotationCenterFound) { + SbVec3f hitpoint = PRIVATE(this)->rotationCenter; // set to the given position SbVec3f direction; @@ -814,7 +929,7 @@ void NavigationStyle::spin(const SbVec2f & pointerpos) r.invert(); this->reorientCamera(viewer->getSoRenderManager()->getCamera(), r); - if (this->rotationCenterMode && this->rotationCenterFound) { + if (PRIVATE(this)->rotationCenterMode && PRIVATE(this)->rotationCenterFound) { float ratio = vp.getViewportAspectRatio(); SbViewVolume vv = viewer->getSoRenderManager()->getCamera()->getViewVolume(vp.getViewportAspectRatio()); SbPlane panplane = vv.getPlane(viewer->getSoRenderManager()->getCamera()->focalDistance.getValue()); @@ -900,7 +1015,7 @@ SbBool NavigationStyle::doSpin() float radians; rot.getValue(axis, radians); if ((radians > 0.01f) && (deltatime < 0.300)) { - viewer->startSpinningAnimation(axis, radians * 5); + this->spinRotation = rot; return true; } } @@ -915,14 +1030,14 @@ void NavigationStyle::saveCursorPosition(const SoEvent * const ev) this->localPos = ev->getPosition(); // mode is WindowCenter - if (!this->rotationCenterMode) { + if (!PRIVATE(this)->rotationCenterMode) { setRotationCenter(getFocalPoint()); } //Option to get point on model (slow) or always on focal plane (fast) // // mode is ScenePointAtCursor to get exact point if possible - if (this->rotationCenterMode & NavigationStyle::RotationCenterMode::ScenePointAtCursor) { + if (PRIVATE(this)->rotationCenterMode & NavigationStyle::RotationCenterMode::ScenePointAtCursor) { SoRayPickAction rpaction(viewer->getSoRenderManager()->getViewportRegion()); rpaction.setPoint(this->localPos); rpaction.setRadius(viewer->getPickRadius()); @@ -936,7 +1051,7 @@ void NavigationStyle::saveCursorPosition(const SoEvent * const ev) } // mode is FocalPointAtCursor or a ScenePointAtCursor failed - if (this->rotationCenterMode & NavigationStyle::RotationCenterMode::FocalPointAtCursor) { + if (PRIVATE(this)->rotationCenterMode & NavigationStyle::RotationCenterMode::FocalPointAtCursor) { // get the intersection point of the ray and the focal plane const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); float ratio = vp.getViewportAspectRatio(); @@ -957,7 +1072,7 @@ void NavigationStyle::saveCursorPosition(const SoEvent * const ev) } // mode is BoundingBoxCenter or a ScenePointAtCursor failed - if (this->rotationCenterMode & NavigationStyle::RotationCenterMode::BoundingBoxCenter) { + if (PRIVATE(this)->rotationCenterMode & NavigationStyle::RotationCenterMode::BoundingBoxCenter) { const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); float ratio = vp.getViewportAspectRatio(); @@ -1013,6 +1128,20 @@ void NavigationStyle::moveCursorPosition() } } +void NavigationStyle::updateAnimation() +{ + SbTime now = SbTime::getTimeOfDay(); + double secs = now.getValue() - prevRedrawTime.getValue(); + this->prevRedrawTime = now; + + if (this->isAnimating()) { + // here the camera rotates around a fix axis + SbRotation deltaRotation = this->spinRotation; + deltaRotation.scaleAngle(secs * 5.0); + this->reorientCamera(viewer->getSoRenderManager()->getCamera(), deltaRotation); + } +} + void NavigationStyle::redraw() { if (mouseSelection) @@ -1039,7 +1168,7 @@ void NavigationStyle::setAnimationEnabled(const SbBool enable) { this->spinanimatingallowed = enable; - if (!enable && this->isAnimating()) { animator->stop(); } + if (!enable && this->isAnimating()) { this->stopAnimating(); } } /*! @@ -1062,29 +1191,52 @@ SbBool NavigationStyle::isAnimating() const return this->currentmode == NavigationStyle::SPINNING; } -NavigationAnimator* NavigationStyle::getAnimator() const +/*! + * Starts programmatically the viewer in animation mode. The given axis direction + * is always in screen coordinates, not in world coordinates. + */ +void NavigationStyle::startAnimating(const SbVec3f& axis, float velocity) { - return this->animator; + if (!isAnimationEnabled()) + return; + + this->prevRedrawTime = SbTime::getTimeOfDay(); + this->spinincrement = SbRotation::identity(); + SbRotation rot; + rot.setValue(axis, velocity); + + this->setViewing(true); + this->setViewingMode(NavigationStyle::SPINNING); + this->spinRotation = rot; +} + +void NavigationStyle::stopAnimating() +{ + if (this->currentmode != NavigationStyle::SPINNING) { + return; + } + this->setViewingMode(this->isViewing() ? + NavigationStyle::IDLE : NavigationStyle::INTERACT); } void NavigationStyle::setSensitivity(float val) { - this->sensitivity = val; + PRIVATE(this)->sensitivity = val; } float NavigationStyle::getSensitivity() const { - return this->sensitivity; + return PRIVATE(this)->sensitivity; } void NavigationStyle::setResetCursorPosition(SbBool on) { - this->resetcursorpos = on; + PRIVATE(this)->resetcursorpos = on; } SbBool NavigationStyle::isResetCursorPosition() const { - return this->resetcursorpos; + return PRIVATE(this)->resetcursorpos; } void NavigationStyle::setZoomInverted(SbBool on) @@ -1114,12 +1266,12 @@ SbBool NavigationStyle::isZoomAtCursor() const void NavigationStyle::setRotationCenterMode(NavigationStyle::RotationCenterModes mode) { - this->rotationCenterMode = mode; + PRIVATE(this)->rotationCenterMode = mode; } NavigationStyle::RotationCenterModes NavigationStyle::getRotationCenterMode() const { - return this->rotationCenterMode; + return PRIVATE(this)->rotationCenterMode; } void NavigationStyle::startSelection(AbstractMouseSelection* mouse) @@ -1263,7 +1415,6 @@ void NavigationStyle::setViewingMode(const ViewerMode newmode) case DRAGGING: // Set up initial projection point for the projector object when // first starting a drag operation. - animator->stop(); viewer->showRotationCenter(true); this->spinprojector->project(this->lastmouseposition); this->interactiveCountInc(); @@ -1277,18 +1428,15 @@ void NavigationStyle::setViewingMode(const ViewerMode newmode) break; case PANNING: - animator->stop(); pan(viewer->getSoRenderManager()->getCamera()); this->interactiveCountInc(); break; case ZOOMING: - animator->stop(); this->interactiveCountInc(); break; case BOXZOOM: - animator->stop(); this->interactiveCountInc(); break; diff --git a/src/Gui/NavigationStyle.h b/src/Gui/NavigationStyle.h index 1bcdef2854..cbc6204a9a 100644 --- a/src/Gui/NavigationStyle.h +++ b/src/Gui/NavigationStyle.h @@ -52,7 +52,6 @@ class SbSphereSheetProjector; namespace Gui { class View3DInventorViewer; -class NavigationAnimator; class AbstractMouseSelection; /** @@ -123,8 +122,9 @@ public: void setAnimationEnabled(const SbBool enable); SbBool isAnimationEnabled() const; + void startAnimating(const SbVec3f& axis, float velocity); + void stopAnimating(); SbBool isAnimating() const; - NavigationAnimator* getAnimator() const; void setSensitivity(float); float getSensitivity() const; @@ -144,14 +144,11 @@ public: void setRotationCenter(const SbVec3f& cnt); SbVec3f getFocalPoint() const; + void updateAnimation(); void redraw(); - SoCamera* getCamera() const; - void setCameraOrientation(const SbRotation& orientation, SbBool moveToCenter = false); - void translateCamera(const SbVec3f& translation); - void reorientCamera(SoCamera* camera, const SbRotation& rotation); - void reorientCamera(SoCamera* camera, const SbRotation& rotation, const SbVec3f& rotationCenter); - + void setCameraOrientation(const SbRotation& rot, SbBool moveTocenter=false); + void lookAtPoint(const SbVec3f&); void boxZoom(const SbBox2s& box); virtual void viewAll(); @@ -176,9 +173,6 @@ public: void setOrbitStyle(OrbitStyle style); OrbitStyle getOrbitStyle() const; - SbBool isViewing() const; - void setViewing(SbBool); - SbVec3f getRotationCenter(SbBool&) const; protected: @@ -189,12 +183,15 @@ protected: void interactiveCountDec(); int getInteractiveCount() const; + SbBool isViewing() const; + void setViewing(SbBool); SbBool isSeekMode() const; void setSeekMode(SbBool enable); SbBool seekToPoint(const SbVec2s screenpos); void seekToPoint(const SbVec3f& scenepos); SbBool lookAtPoint(const SbVec2s screenpos); + void reorientCamera(SoCamera * camera, const SbRotation & rot); void panCamera(SoCamera * camera, float vpaspect, const SbPlane & panplane, @@ -236,13 +233,13 @@ protected: } log; View3DInventorViewer* viewer{nullptr}; - NavigationAnimator* animator; ViewerMode currentmode; SoMouseButtonEvent mouseDownConsumedEvent; SbVec2f lastmouseposition; SbVec2s globalPos; SbVec2s localPos; SbPlane panningplane; + SbTime prevRedrawTime; SbTime centerTime; SbBool lockrecenter; SbBool menuenabled; @@ -264,17 +261,13 @@ protected: SbBool spinanimatingallowed; int spinsamplecounter; SbRotation spinincrement; + SbRotation spinRotation; SbSphereSheetProjector * spinprojector; //@} private: - friend class NavigationAnimator; - - SbVec3f rotationCenter; - SbBool rotationCenterFound; - NavigationStyle::RotationCenterModes rotationCenterMode; - float sensitivity; - SbBool resetcursorpos; + struct NavigationStyleP* pimpl; + friend struct NavigationStyleP; }; /** Sub-classes of this class appear in the preference dialog where users can diff --git a/src/Gui/PreferencePackTemplates/Shortcuts.cfg b/src/Gui/PreferencePackTemplates/Shortcuts.cfg index 79025a3d10..554404ab8b 100644 --- a/src/Gui/PreferencePackTemplates/Shortcuts.cfg +++ b/src/Gui/PreferencePackTemplates/Shortcuts.cfg @@ -677,7 +677,6 @@ F11 F10 Shift+F6 - Alt+F11 diff --git a/src/Gui/PreferencePackTemplates/View.cfg b/src/Gui/PreferencePackTemplates/View.cfg index 708b9b9498..6ad815c14c 100644 --- a/src/Gui/PreferencePackTemplates/View.cfg +++ b/src/Gui/PreferencePackTemplates/View.cfg @@ -32,8 +32,7 @@ - - + diff --git a/src/Gui/PreferencePages/DlgSettingsDocument.ui b/src/Gui/PreferencePages/DlgSettingsDocument.ui index 6e9a18fc34..37ca15fcee 100644 --- a/src/Gui/PreferencePages/DlgSettingsDocument.ui +++ b/src/Gui/PreferencePages/DlgSettingsDocument.ui @@ -98,7 +98,7 @@ Compression level for FCStd files - 3 + 7 CompressionLevel @@ -393,7 +393,7 @@ Common sizes are 128, 256 and 512 512 - 128 + 256 ThumbnailSize diff --git a/src/Gui/PreferencePages/DlgSettingsGeneral.cpp b/src/Gui/PreferencePages/DlgSettingsGeneral.cpp index 9ed9ebf963..f513244d34 100644 --- a/src/Gui/PreferencePages/DlgSettingsGeneral.cpp +++ b/src/Gui/PreferencePages/DlgSettingsGeneral.cpp @@ -438,9 +438,9 @@ void DlgSettingsGeneral::changeEvent(QEvent *event) void DlgSettingsGeneral::saveDockWindowVisibility() { auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows"); - bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", true); - bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", true); - bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", false); + bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", false); + bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", false); + bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", true); switch (ui->treeMode->currentIndex()) { case 0: comboView = true; @@ -464,9 +464,9 @@ void DlgSettingsGeneral::loadDockWindowVisibility() ui->treeMode->addItem(tr("TreeView and PropertyView")); auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/DockWindows"); - bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", true); - bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", true); - bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", false); + bool propertyView = hGrp->GetGroup("PropertyView")->GetBool("Enabled", false); + bool treeView = hGrp->GetGroup("TreeView")->GetBool("Enabled", false); + bool comboView = hGrp->GetGroup("ComboView")->GetBool("Enabled", true); int index = -1; if (propertyView || treeView) { index = 1; diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp index f10725e787..f52118d296 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp @@ -59,6 +59,7 @@ DlgSettingsNavigation::DlgSettingsNavigation(QWidget* parent) { ui->setupUi(this); ui->naviCubeBaseColor->setAllowTransparency(true); + ui->rotationCenterColor->setAllowTransparency(true); retranslate(); } @@ -85,10 +86,10 @@ void DlgSettingsNavigation::saveSettings() ui->checkBoxZoomAtCursor->onSave(); ui->checkBoxInvertZoom->onSave(); ui->checkBoxDisableTilt->onSave(); - ui->checkBoxShowRotationCenter->onSave(); + ui->rotationCenterSize->onSave(); + ui->rotationCenterColor->onSave(); ui->spinBoxZoomStep->onSave(); - ui->checkBoxNavigationAnimations->onSave(); - ui->spinBoxAnimationDuration->onSave(); + ui->checkBoxUseAutoRotation->onSave(); ui->qspinNewDocScale->onSave(); ui->prefStepByTurn->onSave(); ui->naviCubeCorner->onSave(); @@ -99,6 +100,9 @@ void DlgSettingsNavigation::saveSettings() bool showNaviCube = ui->groupBoxNaviCube->isChecked(); hGrp->SetBool("ShowNaviCube", showNaviCube); + bool showRotationCenter = ui->groupBoxRotationCenter->isChecked(); + hGrp->SetBool("ShowRotationCenter", showRotationCenter); + QVariant camera = ui->comboNewDocView->itemData(ui->comboNewDocView->currentIndex(), Qt::UserRole); hGrp->SetASCII("NewDocumentCameraOrientation", (const char*)camera.toByteArray()); @@ -112,7 +116,7 @@ void DlgSettingsNavigation::saveSettings() hGrp = App::GetApplication().GetParameterGroupByPath( "User parameter:BaseApp/Preferences/NaviCube"); if (ui->naviCubeFontName->currentIndex()) { - hGrp->SetASCII("FontString", ui->naviCubeFontName->currentText().toLatin1()); + hGrp->SetASCII("FontString", ui->naviCubeFontName->currentText().toLatin1()); } else { hGrp->RemoveASCII("FontString"); } @@ -123,10 +127,10 @@ void DlgSettingsNavigation::loadSettings() ui->checkBoxZoomAtCursor->onRestore(); ui->checkBoxInvertZoom->onRestore(); ui->checkBoxDisableTilt->onRestore(); - ui->checkBoxShowRotationCenter->onRestore(); + ui->rotationCenterSize->onRestore(); + ui->rotationCenterColor->onRestore(); ui->spinBoxZoomStep->onRestore(); - ui->checkBoxNavigationAnimations->onRestore(); - ui->spinBoxAnimationDuration->onRestore(); + ui->checkBoxUseAutoRotation->onRestore(); ui->qspinNewDocScale->onRestore(); ui->prefStepByTurn->onRestore(); ui->naviCubeCorner->onRestore(); @@ -150,6 +154,9 @@ void DlgSettingsNavigation::loadSettings() bool showNaviCube = hGrp->GetBool("ShowNaviCube", true); ui->groupBoxNaviCube->setChecked(showNaviCube); + bool showRotationCenter = hGrp->GetBool("ShowRotationCenter", true); + ui->groupBoxRotationCenter->setChecked(showRotationCenter); + ui->comboNewDocView->addItem(tr("Isometric"), QByteArray("Isometric")); ui->comboNewDocView->addItem(tr("Dimetric"), QByteArray("Dimetric")); ui->comboNewDocView->addItem(tr("Trimetric"), QByteArray("Trimetric")); @@ -185,7 +192,7 @@ void DlgSettingsNavigation::loadSettings() QStringList familyNames = QFontDatabase::families(QFontDatabase::Any); #endif ui->naviCubeFontName->addItems(familyNames); - + hGrp = App::GetApplication().GetParameterGroupByPath( "User parameter:BaseApp/Preferences/NaviCube"); int indexFamilyNames = familyNames.indexOf( diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.ui b/src/Gui/PreferencePages/DlgSettingsNavigation.ui index c107e57cf2..6ccab19a45 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.ui +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.ui @@ -6,8 +6,8 @@ 0 0 - 432 - 423 + 484 + 586 @@ -229,6 +229,99 @@ + + + + Rotation center indicator + + + true + + + + + + Sphere size + + + + + + + Color and transparency + + + + + + + + 60 + 16777215 + + + + The size of the rotation center indicator + + + 1 + + + 1.0 + + + 100.0 + + + 0.5 + + + 5.0 + + + RotationCenterSize + + + View + + + + + + + The color of the rotation center indicator + + + + 255 + 0 + 0 + + + + RotationCenterColor + + + View + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + @@ -473,91 +566,27 @@ The value is the diameter of the sphere to fit on the screen. - + true - Enable navigation animations + Enable animated rotations - Enable navigation animations + Enable animation - true + false - UseNavigationAnimations + UseAutoRotation View - - - - Duration of navigation animations that have a fixed duration - - - Animation duration - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - 60 - 16777215 - - - - The duration of navigation animations in milliseconds - - - 100 - - - 10000 - - - 50 - - - 250 - - - AnimationDuration - - - View - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 10 - 20 - - - - - - @@ -580,7 +609,7 @@ The value is the diameter of the sphere to fit on the screen. - Zoom step + Zoom step Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -679,25 +708,6 @@ Mouse tilting is not disabled by this setting. - - - - Show the rotation center when dragging. - - - Enable rotation center indication - - - true - - - ShowRotationCenter - - - View - - - diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index d5636d75f5..ee2a800766 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -118,8 +118,6 @@ #include "ViewProvider.h" #include "ViewProviderDocumentObject.h" #include "ViewProviderLink.h" -#include "NavigationAnimator.h" -#include "NavigationAnimation.h" FC_LOG_LEVEL_INIT("3DViewer",true,true) @@ -204,8 +202,8 @@ while the progress bar is running. class Gui::ViewerEventFilter : public QObject { public: - ViewerEventFilter() {} - ~ViewerEventFilter() override {} + ViewerEventFilter() = default; + ~ViewerEventFilter() override = default; bool eventFilter(QObject* obj, QEvent* event) override { // Bug #0000607: Some mice also support horizontal scrolling which however might @@ -247,8 +245,8 @@ public: class SpaceNavigatorDevice : public Quarter::InputDevice { public: - SpaceNavigatorDevice() {} - ~SpaceNavigatorDevice() override {} + SpaceNavigatorDevice() = default; + ~SpaceNavigatorDevice() override = default; const SoEvent* translateEvent(QEvent* event) override { if (event->type() == Spaceball::MotionEvent::MotionEventType) { @@ -1319,6 +1317,17 @@ void View3DInventorViewer::showRotationCenter(bool show) } if (!rotationCenterGroup) { + float size = App::GetApplication() + .GetParameterGroupByPath("User parameter:BaseApp/Preferences/View") + ->GetFloat("RotationCenterSize", 5.0); + + unsigned long rotationCenterColor = + App::GetApplication() + .GetParameterGroupByPath("User parameter:BaseApp/Preferences/View") + ->GetUnsigned("RotationCenterColor", 4278190131); + + QColor color = App::Color::fromPackedRGBA(rotationCenterColor); + rotationCenterGroup = new SoSkipBoundingGroup(); auto sphere = new SoSphere(); @@ -1334,8 +1343,8 @@ void View3DInventorViewer::showRotationCenter(bool show) complexity->value = 1; auto material = new SoMaterial(); - material->emissiveColor = SbColor(1, 0, 0); - material->transparency = 0.8F; + material->emissiveColor = SbColor(color.redF(), color.greenF(), color.blueF()); + material->transparency = 1.0F - color.alphaF(); auto translation = new SoTranslation(); translation->translation.setValue(center); @@ -1347,7 +1356,7 @@ void View3DInventorViewer::showRotationCenter(bool show) auto scaledSphere = new SoShapeScale(); scaledSphere->setPart("shape", annotation); - scaledSphere->scaleFactor = 4.0; + scaledSphere->scaleFactor = size; rotationCenterGroup->addChild(translation); rotationCenterGroup->addChild(hidden); @@ -2237,6 +2246,8 @@ void View3DInventorViewer::renderScene() drawSingleBackground(col); glra->apply(this->backgroundroot); + navigation->updateAnimation(); + if (!this->shading) { state->push(); SoLightModelElement::set(state, selectionRoot, SoLightModelElement::BASE_COLOR); @@ -2754,9 +2765,9 @@ void View3DInventorViewer::pubSeekToPoint(const SbVec3f& pos) this->seekToPoint(pos); } -void View3DInventorViewer::setCameraOrientation(const SbRotation& orientation, SbBool moveToCenter) +void View3DInventorViewer::setCameraOrientation(const SbRotation& rot, SbBool moveTocenter) { - navigation->setCameraOrientation(orientation, moveToCenter); + navigation->setCameraOrientation(rot, moveTocenter); } void View3DInventorViewer::setCameraType(SoType t) @@ -2777,19 +2788,54 @@ void View3DInventorViewer::setCameraType(SoType t) } } -void View3DInventorViewer::moveCameraTo(const SbRotation& orientation, const SbVec3f& position) +namespace Gui { + class CameraAnimation : public QVariantAnimation + { + SoCamera* camera; + SbRotation startRot, endRot; + SbVec3f startPos, endPos; + + public: + CameraAnimation(SoCamera* camera, const SbRotation& rot, const SbVec3f& pos) + : camera(camera), endRot(rot), endPos(pos) + { + startPos = camera->position.getValue(); + startRot = camera->orientation.getValue(); + } + ~CameraAnimation() override = default; + protected: + void updateCurrentValue(const QVariant & value) override + { + int steps = endValue().toInt(); + int curr = value.toInt(); + + float s = static_cast(curr)/static_cast(steps); + SbVec3f curpos = startPos * (1.0f-s) + endPos * s; + SbRotation currot = SbRotation::slerp(startRot, endRot, s); + camera->orientation.setValue(currot); + camera->position.setValue(curpos); + } + }; +} + +void View3DInventorViewer::moveCameraTo(const SbRotation& rot, const SbVec3f& pos, int steps, int ms) { - SoCamera* camera = getCamera(); - if (!camera) + SoCamera* cam = this->getSoRenderManager()->getCamera(); + if (!cam) return; - if (isAnimationEnabled()) { - startAnimation( - orientation, camera->position.getValue(), position - camera->position.getValue(), true); - } + CameraAnimation anim(cam, rot, pos); + anim.setDuration(Base::clamp(ms,0,5000)); + anim.setStartValue(static_cast(0)); + anim.setEndValue(steps); - camera->orientation.setValue(orientation); - camera->position.setValue(position); + QEventLoop loop; + QObject::connect(&anim, &CameraAnimation::finished, &loop, &QEventLoop::quit); + anim.start(); + loop.exec(QEventLoop::ExcludeUserInputEvents); + + cam->orientation.setValue(rot); + cam->position.setValue(pos); } void View3DInventorViewer::animatedViewAll(int steps, int ms) @@ -3071,49 +3117,18 @@ SbBool View3DInventorViewer::isAnimating() const return navigation->isAnimating(); } -/** - * @brief Change the camera pose with an animation - * - * @param orientation The new orientation - * @param rotationCenter The rotation center - * @param translation An additional translation on top of the translation caused by the rotation around the rotation center +/*! + * Starts programmatically the viewer in animation mode. The given axis direction + * is always in screen coordinates, not in world coordinates. */ -void View3DInventorViewer::startAnimation(const SbRotation& orientation, - const SbVec3f& rotationCenter, const SbVec3f& translation, bool wait) +void View3DInventorViewer::startAnimating(const SbVec3f& axis, float velocity) { - // Currently starts a FixedTimeAnimation. If there is going to be an additional animation like - // FixedVelocityAnimation, check the animation type from a parameter and start the right animation - - int duration = App::GetApplication() - .GetParameterGroupByPath("User parameter:BaseApp/Preferences/View") - ->GetInt("AnimationDuration", 250); - - auto animation = std::make_shared( - navigation, orientation, rotationCenter, translation, duration); - - if (wait) { - navigation->getAnimator()->startAndWait(animation); - } - else { - navigation->getAnimator()->start(animation); - } -} - -/** - * @brief Start an infinite spin animation - * - * @param axis The rotation axis in screen coordinates - * @param velocity The angular velocity in radians per second - */ -void View3DInventorViewer::startSpinningAnimation(const SbVec3f& axis, float velocity) -{ - auto animation = std::make_shared(navigation, axis, velocity); - navigation->getAnimator()->start(animation); + navigation->startAnimating(axis, velocity); } void View3DInventorViewer::stopAnimating() { - navigation->getAnimator()->stop(); + navigation->stopAnimating(); } void View3DInventorViewer::setPopupMenuEnabled(const SbBool on) diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h index 85441f11b8..0f0edfb429 100644 --- a/src/Gui/View3DInventorViewer.h +++ b/src/Gui/View3DInventorViewer.h @@ -164,9 +164,7 @@ public: void setPopupMenuEnabled(const SbBool on); SbBool isPopupMenuEnabled() const; - void startAnimation(const SbRotation& orientation, const SbVec3f& rotationCenter, - const SbVec3f& translation, bool wait = false); - void startSpinningAnimation(const SbVec3f& axis, float velocity); + void startAnimating(const SbVec3f& axis, float velocity); void stopAnimating(); SbBool isAnimating() const; @@ -375,9 +373,9 @@ public: * \a true the reorientation is animated, otherwise its directly * set. */ - void setCameraOrientation(const SbRotation& orientation, SbBool moveToCenter = false); + void setCameraOrientation(const SbRotation& rot, SbBool moveTocenter=false); void setCameraType(SoType t) override; - void moveCameraTo(const SbRotation& orientation, const SbVec3f& position); + void moveCameraTo(const SbRotation& rot, const SbVec3f& pos, int steps, int ms); /** * Zooms the viewport to the size of the bounding box. */ diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp index 7e36f8b4a3..92f407bbab 100644 --- a/src/Gui/View3DPy.cpp +++ b/src/Gui/View3DPy.cpp @@ -777,8 +777,10 @@ Py::Object View3DInventorPy::getCameraOrientation() Py::Object View3DInventorPy::viewPosition(const Py::Tuple& args) { - PyObject* p = nullptr; - if (!PyArg_ParseTuple(args.ptr(), "|O!", &Base::PlacementPy::Type, &p)) + PyObject* p=nullptr; + int steps = 20; + int ms = 30; + if (!PyArg_ParseTuple(args.ptr(), "|O!ii",&Base::PlacementPy::Type,&p,&steps,&ms)) throw Py::Exception(); if (p) { @@ -789,7 +791,7 @@ Py::Object View3DInventorPy::viewPosition(const Py::Tuple& args) rot.getValue(q0,q1,q2,q3); getView3DIventorPtr()->getViewer()->moveCameraTo( SbRotation((float)q0, (float)q1, (float)q2, (float)q3), - SbVec3f((float)pos.x, (float)pos.y, (float)pos.z)); + SbVec3f((float)pos.x, (float)pos.y, (float)pos.z), steps, ms); } SoCamera* cam = getView3DIventorPtr()->getViewer()->getSoRenderManager()->getCamera(); @@ -808,11 +810,11 @@ Py::Object View3DInventorPy::viewPosition(const Py::Tuple& args) Py::Object View3DInventorPy::startAnimating(const Py::Tuple& args) { - float x, y, z; + float x,y,z; float velocity; - if (!PyArg_ParseTuple(args.ptr(), "ffff", &x, &y, &z, &velocity)) + if (!PyArg_ParseTuple(args.ptr(), "ffff", &x,&y,&z,&velocity)) throw Py::Exception(); - getView3DIventorPtr()->getViewer()->startSpinningAnimation(SbVec3f(x, y, z), velocity); + getView3DIventorPtr()->getViewer()->startAnimating(SbVec3f(x,y,z),velocity); return Py::None(); } diff --git a/src/Gui/View3DSettings.cpp b/src/Gui/View3DSettings.cpp index 449302fffb..f16e5e5acb 100644 --- a/src/Gui/View3DSettings.cpp +++ b/src/Gui/View3DSettings.cpp @@ -74,7 +74,7 @@ void View3DSettings::applySettings() OnChange(*hGrp,"CornerCoordSystem"); OnChange(*hGrp,"CornerCoordSystemSize"); OnChange(*hGrp,"ShowAxisCross"); - OnChange(*hGrp,"UseNavigationAnimations"); + OnChange(*hGrp,"UseAutoRotation"); OnChange(*hGrp,"Gradient"); OnChange(*hGrp,"RadialGradient"); OnChange(*hGrp,"BackgroundColor"); @@ -287,9 +287,9 @@ void View3DSettings::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::M _viewer->setAxisCross(rGrp.GetBool("ShowAxisCross", false)); } } - else if (strcmp(Reason,"UseNavigationAnimations") == 0) { + else if (strcmp(Reason,"UseAutoRotation") == 0) { for (auto _viewer : _viewers) { - _viewer->setAnimationEnabled(rGrp.GetBool("UseNavigationAnimations", true)); + _viewer->setAnimationEnabled(rGrp.GetBool("UseAutoRotation", false)); } } else if (strcmp(Reason,"Gradient") == 0 || strcmp(Reason,"RadialGradient") == 0) { diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index 01a4ebeb15..b8767f7f44 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -28,6 +28,7 @@ #endif #include "Workbench.h" +#include "WorkbenchManipulator.h" #include "WorkbenchPy.h" #include "Action.h" #include "Application.h" @@ -313,6 +314,12 @@ void Workbench::setupCustomShortcuts() const // Now managed by ShortcutManager } +void Workbench::createContextMenu(const char* recipient, MenuItem* item) const +{ + setupContextMenu(recipient, item); + WorkbenchManipulator::changeContextMenu(recipient, item); +} + void Workbench::setupContextMenu(const char* recipient,MenuItem* item) const { Q_UNUSED(recipient); @@ -400,6 +407,7 @@ bool Workbench::activate() { ToolBarItem* tb = setupToolBars(); setupCustomToolbars(tb, "Toolbar"); + WorkbenchManipulator::changeToolBars(tb); ToolBarManager::getInstance()->setup( tb ); delete tb; @@ -409,11 +417,13 @@ bool Workbench::activate() //delete cb; DockWindowItems* dw = setupDockWindows(); + WorkbenchManipulator::changeDockWindows(dw); DockWindowManager::instance()->setup( dw ); delete dw; MenuItem* mb = setupMenuBar(); addPermanentMenuItems(mb); + WorkbenchManipulator::changeMenuBar(mb); MenuManager::getInstance()->setup( mb ); delete mb; @@ -586,7 +596,7 @@ void StdWorkbench::setupContextMenu(const char* recipient, MenuItem* item) const *item << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_DrawStyle" - << StdViews << measure << "Std_SelectFilter" << "Separator" + << StdViews << measure << "Separator" << "Std_ViewDockUndockFullscreen"; if (Gui::Selection().countObjectsOfType(App::DocumentObject::getClassTypeId()) > 0) { @@ -722,7 +732,6 @@ MenuItem* StdWorkbench::setupMenuBar() const auto macro = new MenuItem( menuBar ); macro->setCommand("&Macro"); *macro << "Std_DlgMacroRecord" - << "Std_MacroStopRecord" << "Std_DlgMacroExecute" << "Std_RecentMacros" << "Separator" @@ -786,7 +795,7 @@ ToolBarItem* StdWorkbench::setupToolBars() const // Macro auto macro = new ToolBarItem( root ); macro->setCommand("Macro"); - *macro << "Std_DlgMacroRecord" << "Std_MacroStopRecord" << "Std_DlgMacroExecute" + *macro << "Std_DlgMacroRecord" << "Std_DlgMacroExecute" << "Std_DlgMacroExecuteDirect"; // View @@ -795,7 +804,7 @@ ToolBarItem* StdWorkbench::setupToolBars() const *view << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_ViewIsometric" << "Std_ViewFront"<< "Std_ViewTop" << "Std_ViewRight" << "Std_ViewRear" << "Std_ViewBottom"<< "Std_ViewLeft" - << "Separator" << "Std_DrawStyle" << "Std_SelectFilter" << "Std_TreeViewActions" + << "Separator" << "Std_DrawStyle" << "Std_TreeViewActions" << "Separator" << "Std_MeasureDistance"; // Structure @@ -820,12 +829,12 @@ ToolBarItem* StdWorkbench::setupCommandBars() const view->setCommand("Standard views"); *view << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_ViewIsometric" << "Separator" << "Std_ViewFront" << "Std_ViewRight" << "Std_ViewTop" << "Separator" - << "Std_ViewRear" << "Std_ViewLeft" << "Std_ViewBottom" << "Std_SelectFilter"; + << "Std_ViewRear" << "Std_ViewLeft" << "Std_ViewBottom"; // Special Ops auto macro = new ToolBarItem( root ); macro->setCommand("Special Ops"); - *macro << "Std_DlgParameter" << "Std_DlgPreferences" << "Std_DlgMacroRecord" << "Std_MacroStopRecord" + *macro << "Std_DlgParameter" << "Std_DlgPreferences" << "Std_DlgMacroRecord" << "Std_DlgMacroExecute" << "Std_DlgCustomize"; return root; @@ -838,9 +847,9 @@ DockWindowItems* StdWorkbench::setupDockWindows() const //root->addDockWidget("Std_HelpView", Qt::RightDockWidgetArea, true, false); root->addDockWidget("Std_TreeView", Qt::LeftDockWidgetArea, true, false); root->addDockWidget("Std_PropertyView", Qt::LeftDockWidgetArea, true, false); - root->addDockWidget("Std_TaskView", Qt::LeftDockWidgetArea, true, true); root->addDockWidget("Std_SelectionView", Qt::LeftDockWidgetArea, false, false); - root->addDockWidget("Std_ComboView", Qt::LeftDockWidgetArea, false, false); + root->addDockWidget("Std_ComboView", Qt::LeftDockWidgetArea, true, true); + root->addDockWidget("Std_TaskView", Qt::LeftDockWidgetArea, true, true); root->addDockWidget("Std_ReportView", Qt::BottomDockWidgetArea, true, true); root->addDockWidget("Std_PythonView", Qt::BottomDockWidgetArea, true, true); diff --git a/src/Gui/Workbench.h b/src/Gui/Workbench.h index 46fe9038b1..2bb9c2cf40 100644 --- a/src/Gui/Workbench.h +++ b/src/Gui/Workbench.h @@ -70,9 +70,8 @@ public: */ PyObject* getPyObject() override; /** Sets up the contextmenu for this workbench. - * The default implementation does nothing. */ - virtual void setupContextMenu(const char* recipient,MenuItem*) const; + void createContextMenu(const char* recipient, MenuItem*) const; /** Sets up the contextmenu for the main window for this workbench. * The default implementation does nothing. */ @@ -121,6 +120,10 @@ protected: virtual ToolBarItem* setupCommandBars() const=0; /** Returns a DockWindowItems structure of dock windows this workbench. */ virtual DockWindowItems* setupDockWindows() const=0; + /** Sets up the contextmenu for this workbench. + * The default implementation does nothing. + */ + virtual void setupContextMenu(const char* recipient,MenuItem*) const; /** Add permanent menu items to the structure */ void addPermanentMenuItems(MenuItem*) const; diff --git a/src/Gui/WorkbenchManipulator.cpp b/src/Gui/WorkbenchManipulator.cpp new file mode 100644 index 0000000000..fdddbb878d --- /dev/null +++ b/src/Gui/WorkbenchManipulator.cpp @@ -0,0 +1,88 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" +#include "WorkbenchManipulator.h" + +using namespace Gui; + +std::set WorkbenchManipulator::manipulators; // NOLINT + +void WorkbenchManipulator::installManipulator(const WorkbenchManipulator::Ptr& ptr) +{ + manipulators.insert(ptr); +} + +void WorkbenchManipulator::removeManipulator(const WorkbenchManipulator::Ptr& ptr) +{ + auto it = manipulators.find(ptr); + if (it != manipulators.end()) { + manipulators.erase(it); + } +} + +void WorkbenchManipulator::changeMenuBar(MenuItem* menuBar) +{ + for (auto& it : manipulators) { + it->modifyMenuBar(menuBar); + } +} + +void WorkbenchManipulator::changeContextMenu(const char* recipient, MenuItem* menuBar) +{ + for (auto& it : manipulators) { + it->modifyContextMenu(recipient, menuBar); + } +} + +void WorkbenchManipulator::changeToolBars(ToolBarItem* toolBar) +{ + for (auto& it : manipulators) { + it->modifyToolBars(toolBar); + } +} + +void WorkbenchManipulator::changeDockWindows(DockWindowItems* dockWindow) +{ + for (auto& it : manipulators) { + it->modifyDockWindows(dockWindow); + } +} + +void WorkbenchManipulator::modifyMenuBar([[maybe_unused]] MenuItem* menuBar) +{ +} + +void WorkbenchManipulator::modifyContextMenu([[maybe_unused]] const char* recipient, + [[maybe_unused]] MenuItem* menuBar) +{ +} + +void WorkbenchManipulator::modifyToolBars([[maybe_unused]] ToolBarItem* toolBar) +{ +} + +void WorkbenchManipulator::modifyDockWindows([[maybe_unused]] DockWindowItems* dockWindow) +{ +} diff --git a/src/Gui/WorkbenchManipulator.h b/src/Gui/WorkbenchManipulator.h new file mode 100644 index 0000000000..b4901fba98 --- /dev/null +++ b/src/Gui/WorkbenchManipulator.h @@ -0,0 +1,125 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#ifndef GUI_WORKBENCHMANIPULATOR_H +#define GUI_WORKBENCHMANIPULATOR_H + +#include +#include +#include +#include +#include + +namespace Gui { + +class DockWindowItems; +class MenuItem; +class ToolBarItem; + +/** + * The WorkbenchManipulator is a class that allows to modify the workbench + * by adding or removing commands. + * WorkbenchManipulator provides methods to manipulate the MenuItem, ToolBarItem or + * DockWindowItems structure before setting up the workbench. + * @author Werner Mayer + */ +class GuiExport WorkbenchManipulator +{ +public: + using Ptr = std::shared_ptr; + /*! + * \brief installManipulator + * Installs a new instance of WorkbenchManipulator + */ + static void installManipulator(const WorkbenchManipulator::Ptr&); + /*! + * \brief removeManipulator + * Removes an installed instance of WorkbenchManipulator + */ + static void removeManipulator(const WorkbenchManipulator::Ptr&); + /*! + * \brief changeMenuBar + * Calls \ref modifyMenuBar for every installed WorkbenchManipulator + */ + static void changeMenuBar(MenuItem* menuBar); + /*! + * \brief changeContextMenu + * Calls \ref modifyContextMenu for every installed WorkbenchManipulator + */ + static void changeContextMenu(const char* recipient, MenuItem* menuBar); + /*! + * \brief changeToolBars + * Calls \ref modifyToolBars for every installed WorkbenchManipulator + */ + static void changeToolBars(ToolBarItem* toolBar); + /*! + * \brief changeDockWindows + * Calls \ref modifyDockWindows for every installed WorkbenchManipulator + */ + static void changeDockWindows(DockWindowItems* dockWindow); + + WorkbenchManipulator() = default; + virtual ~WorkbenchManipulator() = default; + +protected: + /*! + * \brief modifyMenuBar + * Method to manipulate the menu structure of a workbench. + * The default implementation doesn't change anything. + */ + virtual void modifyMenuBar([[maybe_unused]] MenuItem* menuBar); + /*! + * \brief modifyContextMenu + * Method to manipulate the contextmenu structure of a workbench. + * The default implementation doesn't change anything. + */ + virtual void modifyContextMenu([[maybe_unused]] const char* recipient, + [[maybe_unused]] MenuItem* menuBar); + /*! + * \brief modifyToolBars + * Method to manipulate the toolbar structure of a workbench + * The default implementation doesn't change anything. + */ + virtual void modifyToolBars([[maybe_unused]] ToolBarItem* toolBar); + /*! + * \brief modifyDockWindows + * Method to manipulate the dock window structure of a workbench + * The default implementation doesn't change anything. + */ + virtual void modifyDockWindows([[maybe_unused]] DockWindowItems* dockWindow); + +public: + WorkbenchManipulator(const WorkbenchManipulator&) = delete; + WorkbenchManipulator(WorkbenchManipulator&&) = delete; + WorkbenchManipulator& operator = (const WorkbenchManipulator&) = delete; + WorkbenchManipulator& operator = (WorkbenchManipulator&&) = delete; + +private: + static std::set manipulators; // NOLINT +}; + +} // namespace Gui + + +#endif // GUI_WORKBENCHMANIPULATOR_H diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager_el.qm b/src/Mod/AddonManager/Resources/translations/AddonManager_el.qm index 2df577c15a..e1b428127a 100644 Binary files a/src/Mod/AddonManager/Resources/translations/AddonManager_el.qm and b/src/Mod/AddonManager/Resources/translations/AddonManager_el.qm differ diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager_el.ts b/src/Mod/AddonManager/Resources/translations/AddonManager_el.ts index 7c8e049eaf..e6fac2d7d3 100644 --- a/src/Mod/AddonManager/Resources/translations/AddonManager_el.ts +++ b/src/Mod/AddonManager/Resources/translations/AddonManager_el.ts @@ -528,12 +528,12 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Supported FreeCAD Versions - Supported FreeCAD Versions + Υποστηριζόμενες Εκδόσεις FreeCAD Minimum FreeCAD Version Supported - Minimum FreeCAD Version Supported + Ελάχιστη Υποστηριζόμενη Έκδοση FreeCAD @@ -544,7 +544,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Maximum FreeCAD Version Supported - Maximum FreeCAD Version Supported + Μέγιστη Υποστηριζόμενη Έκδοση FreeCAD @@ -731,22 +731,22 @@ installed addons will be checked for available updates Package name - Package name + Όνομα πακέτου Installed version - Installed version + Εγκατεστημένη έκδοση Available version - Available version + Διαθέσιμη έκδοση Used by - Used by + Χρησιμοποιείται από @@ -756,7 +756,7 @@ installed addons will be checked for available updates Update all available - Update all available + Ενημέρωση όλων των διαθέσιμων @@ -777,12 +777,12 @@ installed addons will be checked for available updates Updating Addons - Updating Addons + Ενημέρωση Πρόσθετων Updating out-of-date addons... - Updating out-of-date addons... + Ενημέρωση μη ενημερωμένων προσθέτων... @@ -1997,7 +1997,7 @@ installed addons will be checked for available updates Installed version - Installed version + Εγκατεστημένη έκδοση @@ -2012,7 +2012,7 @@ installed addons will be checked for available updates Available version - Available version + Διαθέσιμη έκδοση diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager_nl.qm b/src/Mod/AddonManager/Resources/translations/AddonManager_nl.qm index 5d62c021b2..e6c5f312aa 100644 Binary files a/src/Mod/AddonManager/Resources/translations/AddonManager_nl.qm and b/src/Mod/AddonManager/Resources/translations/AddonManager_nl.qm differ diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager_nl.ts b/src/Mod/AddonManager/Resources/translations/AddonManager_nl.ts index 1f24756be2..42d6ce7071 100644 --- a/src/Mod/AddonManager/Resources/translations/AddonManager_nl.ts +++ b/src/Mod/AddonManager/Resources/translations/AddonManager_nl.ts @@ -104,12 +104,12 @@ Wilt u dat de Addon Manager deze automatisch installeert? Kies "Negeren&quo Required Python modules - Required Python modules + Vereiste Python modules Optional Python modules - Optional Python modules + Optionele Python modules @@ -117,12 +117,12 @@ Wilt u dat de Addon Manager deze automatisch installeert? Kies "Negeren&quo Addon Developer Tools - Addon Developer Tools + Uitbreiding ontwikkelaar gereedschappen Path to Addon - Path to Addon + Pad naar de uitbreiding @@ -144,7 +144,7 @@ Wilt u dat de Addon Manager deze automatisch installeert? Kies "Negeren&quo Explanation of what this Addon provides. Displayed in the Addon Manager. It is not necessary for this to state that this is a FreeCAD Addon. - Explanation of what this Addon provides. Displayed in the Addon Manager. It is not necessary for this to state that this is a FreeCAD Addon. + Uitleg waar deze uitbreiding over gaat. Wordt weergegeven in de Addon Manager. Het is niet nodig om te vermelden dat dit een FreeCAD Addon is. @@ -169,7 +169,7 @@ Wilt u dat de Addon Manager deze automatisch installeert? Kies "Negeren&quo Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported - Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported + Semantic (1.2.3-beta) of CalVer (2022.08.30) stijlen worden ondersteund @@ -188,7 +188,7 @@ Wilt u dat de Addon Manager deze automatisch installeert? Kies "Negeren&quo Displayed in the Addon Manager's list of Addons. Should not include the word "FreeCAD", and must be a valid directory name on all support operating systems. - Displayed in the Addon Manager's list of Addons. Should not include the word "FreeCAD", and must be a valid directory name on all support operating systems. + Wordt weergegeven in de Addon Manager's lijst met Addons. Zou het woord "FreeCAD" niet moeten bevatten, en moet een geldige mapnaam zijn op alle ondersteunende besturingssystemen. @@ -198,7 +198,7 @@ Wilt u dat de Addon Manager deze automatisch installeert? Kies "Negeren&quo TIP: Since this is displayed within FreeCAD, in the Addon Manager, it is not necessary to take up space saying things like "This is a FreeCAD Addon..." -- just say what it does. - TIP: Since this is displayed within FreeCAD, in the Addon Manager, it is not necessary to take up space saying things like "This is a FreeCAD Addon..." -- just say what it does. + TIP: Omdat dit wordt weergegeven in het programma FreeCAD, in de Addon Manager, is het niet nodig om ruimte te gebruiken om dingen te zeggen zoals "dit is een FreeCAD Addon ..." -- zeg gewoon wat het doet. @@ -218,7 +218,7 @@ Wilt u dat de Addon Manager deze automatisch installeert? Kies "Negeren&quo Addon Name - Addon Name + Naam van de uitbreiding @@ -248,7 +248,7 @@ Wilt u dat de Addon Manager deze automatisch installeert? Kies "Negeren&quo Addon Contents - Addon Contents + Inhoud van de uitbreiding @@ -912,7 +912,7 @@ installed addons will be checked for available updates Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported - Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported + Semantic (1.2.3-beta) of CalVer (2022.08.30) stijlen worden ondersteund diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager_zh-TW.qm b/src/Mod/AddonManager/Resources/translations/AddonManager_zh-TW.qm index 6f594d6fbf..37a42df6a0 100644 Binary files a/src/Mod/AddonManager/Resources/translations/AddonManager_zh-TW.qm and b/src/Mod/AddonManager/Resources/translations/AddonManager_zh-TW.qm differ diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager_zh-TW.ts b/src/Mod/AddonManager/Resources/translations/AddonManager_zh-TW.ts index 3af4af1cad..37129a3d0f 100644 --- a/src/Mod/AddonManager/Resources/translations/AddonManager_zh-TW.ts +++ b/src/Mod/AddonManager/Resources/translations/AddonManager_zh-TW.ts @@ -6,12 +6,12 @@ Custom repository - Custom repository + 自訂儲存庫 Repository URL - Repository URL + 儲存庫網址 @@ -92,9 +92,9 @@ This Addon has the following required and optional dependencies. You must install them before this Addon can be used. Do you want the Addon Manager to install them automatically? Choose "Ignore" to install the Addon without installing the dependencies. - This Addon has the following required and optional dependencies. You must install them before this Addon can be used. + 此附加元件需要以下必要和選用相依套件。您必須在使用此附加元件之前安裝它們。 -Do you want the Addon Manager to install them automatically? Choose "Ignore" to install the Addon without installing the dependencies. +您是否希望附加元件管理員自動安裝它們？選擇"忽略"以安裝附加元件而不安裝相依套件。 @@ -104,12 +104,12 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Required Python modules - Required Python modules + 所需之 Python 模組 Optional Python modules - Optional Python modules + 可選的 Python 模組 @@ -117,12 +117,12 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Addon Developer Tools - Addon Developer Tools + 附加元件開發者工具 Path to Addon - Path to Addon + 附加元件路徑 @@ -154,7 +154,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Discussion URL - Discussion URL + 討論網址 @@ -169,7 +169,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported - Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported + 支援 Semantic (1.2.3-beta 版) 或 CalVer (2022.08.30 版) 風格 @@ -182,7 +182,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore (Optional) - (Optional) + （可選） @@ -203,17 +203,17 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Repository URL - Repository URL + 儲存庫網址 Website URL - Website URL + 網址 Documentation URL - Documentation URL + 文件網址 @@ -233,12 +233,12 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Minimum Python - Minimum Python + 最低要求的Python版本 (Optional, only 3.x version supported) - (Optional, only 3.x version supported) + (可選，只支援 3.x 版) @@ -248,7 +248,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Addon Contents - Addon Contents + 附加元件內容 @@ -261,7 +261,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Downloading info... - Downloading info... + 下載資訊... @@ -271,17 +271,17 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Refresh local cache - Refresh local cache + 刷新本地端快取 Download and apply all available updates - Download and apply all available updates + 下載並套用全部可用更新 Update all Addons - Update all Addons + 更新所有附加元件 @@ -291,17 +291,17 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore View and update Python package dependencies - View and update Python package dependencies + 查看並更新Python套件的依賴性 Python dependencies... - Python dependencies... + Python 相依性... Developer tools... - Developer tools... + 開發者工具... @@ -316,7 +316,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Edit Tags - Edit Tags + 編輯標籤 @@ -331,7 +331,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Welcome to the Addon Manager - Welcome to the Addon Manager + 觀迎光臨附加元件管理器 @@ -346,32 +346,32 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Automatically check installed Addons for updates - Automatically check installed Addons for updates + 自動檢查已安裝的附加元件是否有更新 Download Macro metadata (approximately 10MB) - Download Macro metadata (approximately 10MB) + 下載巨集後設資料(約 10 MB) No proxy - No proxy + 不使用代理伺服器 System proxy - System proxy + 系統的代理伺服器 User-defined proxy: - User-defined proxy: + 使用者定義的代理伺服器： These and other settings are available in the FreeCAD Preferences window. - These and other settings are available in the FreeCAD Preferences window. + 這些和其他設定可以在 FreeCAD 偏好設定視窗中找到。 @@ -379,22 +379,22 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Edit Dependency - Edit Dependency + 編輯相依性 Dependency Type - Dependency Type + 相依類型 Dependency - Dependency + 相依性 Package name, if "Other..." - Package name, if "Other..." + 套件名稱，若 " 其它..." @@ -409,7 +409,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Optional - Optional + 選用項 @@ -436,7 +436,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore (tags) - (tags) + (標籤) @@ -496,7 +496,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Email - Email + 電子郵件 @@ -514,7 +514,7 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore FreeCAD Version - FreeCAD Version + FreeCAD 版本 @@ -527,23 +527,23 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Supported FreeCAD Versions - Supported FreeCAD Versions + 所支援之 FreeCAD 版本 Minimum FreeCAD Version Supported - Minimum FreeCAD Version Supported + 所支援的最低 FreeCAD 版本 Optional - Optional + 選用項 Maximum FreeCAD Version Supported - Maximum FreeCAD Version Supported + 所支援的最高 FreeCAD 版本 @@ -556,16 +556,14 @@ Do you want the Addon Manager to install them automatically? Choose "Ignore Addon manager options - Addon manager options + 附加元件管理器選項 If this option is selected, when launching the Addon Manager, installed addons will be checked for available updates (this requires the GitPython package installed on your system) - If this option is selected, when launching the Addon Manager, -installed addons will be checked for available updates -(this requires the GitPython package installed on your system) + 如果選擇此選項，在啟動附加元件管理員時，將檢查已安裝的附加元件是否有可用的更新（這需要在您的系統上安裝 GitPython 套件）。 @@ -575,42 +573,42 @@ installed addons will be checked for available updates Download Macro metadata (approximately 10MB) - Download Macro metadata (approximately 10MB) + 下載巨集後設資料(約 10 MB) Cache update frequency - Cache update frequency + 快取更新頻率 Manual (no automatic updates) - Manual (no automatic updates) + 手動 (非自動更新) Daily - Daily + 每日 Weekly - Weekly + 每週 Hide Addons marked Python 2 Only - Hide Addons marked Python 2 Only + 隱藏標記只能使用於 Python 2 之附加元件 Hide Addons marked Obsolete - Hide Addons marked Obsolete + 隱藏已標記為過時的附加元件 Hide Addons that require a newer version of FreeCAD - Hide Addons that require a newer version of FreeCAD + 隱藏需要更新版本的 FreeCAD 的附加元件 @@ -625,57 +623,57 @@ installed addons will be checked for available updates No proxy - No proxy + 不使用代理伺服器 User system proxy - User system proxy + 使用系統代理伺服器 User-defined proxy: - User-defined proxy: + 使用者定義的代理伺服器： Path to Python executable (optional): - Path to Python executable (optional): + Python 可執行檔的路徑(選填): Path to git executable (optional): - Path to git executable (optional): + git 可執行檔的路徑(選填): The path to the Python executable for package installation with pip. Autodetected if needed and not specified. - The path to the Python executable for package installation with pip. Autodetected if needed and not specified. + 以 pip 安裝給 Python 可執行檔之套件路徑。如果需要且未指定，則會自動檢測。 The path to the git executable. Autodetected if needed and not specified. - The path to the git executable. Autodetected if needed and not specified. + git 可執行檔之路徑。如果需要且未指定，則會自動檢測。 Advanced Options - Advanced Options + 進階選項 Show option to change branches (requires git) - Show option to change branches (requires git) + 顯示更改分支的選項 (需要git) Disable git (fall back to ZIP downloads only) - Disable git (fall back to ZIP downloads only) + 停用 git (返回到僅使用 ZIP 下載) Activate Addon Manager options intended for developers of new Addons. - Activate Addon Manager options intended for developers of new Addons. + 啟用針對新附加元件開發者設計的附加元件管理員選項。 @@ -721,7 +719,7 @@ installed addons will be checked for available updates Manage Python Dependencies - Manage Python Dependencies + 管理 Python 相依性 @@ -731,22 +729,22 @@ installed addons will be checked for available updates Package name - Package name + 套件名稱 Installed version - Installed version + Available version - Available version + 可用版本 Used by - Used by + 使用中 @@ -756,7 +754,7 @@ installed addons will be checked for available updates Update all available - Update all available + 更新所有可用更新 @@ -777,7 +775,7 @@ installed addons will be checked for available updates Updating Addons - Updating Addons + 更新附加元件 @@ -805,7 +803,7 @@ installed addons will be checked for available updates Preference Pack - Preference Pack + 偏好設定包 @@ -825,7 +823,7 @@ installed addons will be checked for available updates Main macro file - Main macro file + 主巨集檔 @@ -847,17 +845,17 @@ installed addons will be checked for available updates Workbench class name - Workbench class name + 工作台類別名稱 Class that defines "Icon" data member - Class that defines "Icon" data member + 定義 "圖示 "資料成員之類別 Subdirectory - Subdirectory + 子目錄 @@ -877,22 +875,22 @@ installed addons will be checked for available updates Tags... - Tags... + 標籤... Dependencies... - Dependencies... + 相依性... FreeCAD Versions... - FreeCAD Versions... + FreeCAD 版本... Other Metadata - Other Metadata + 其它後設資料 @@ -912,7 +910,7 @@ installed addons will be checked for available updates Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported - Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported + 支援 Semantic (1.2.3-beta 版) 或 CalVer (2022.08.30 版) 風格 @@ -922,7 +920,7 @@ installed addons will be checked for available updates Display Name - Display Name + 顯示名稱 @@ -935,27 +933,27 @@ installed addons will be checked for available updates Add button? - Add button? + 添加按鈕? Add a toolbar button for this macro? - Add a toolbar button for this macro? + 選擇要加入此巨集的工具列按鈕 ? Yes - Yes + 是 No - No + 否 Never - Never + 決不 @@ -976,17 +974,17 @@ installed addons will be checked for available updates Copyright Information - Copyright Information + 版權資訊 Copyright holder: - Copyright holder: + 版權所有人: Copyright year: - Copyright year: + 版權年份: @@ -1022,42 +1020,42 @@ installed addons will be checked for available updates Proxy login required - Proxy login required + 代理伺服器必須登入 Proxy requires authentication - Proxy requires authentication + 代理伺服器需要認證 Proxy: - Proxy: + 代理伺服器: Placeholder for proxy address - Placeholder for proxy address + 代理伺服器位址的佔位符號 Realm: - Realm: + 領域: Placeholder for proxy realm - Placeholder for proxy realm + 代理伺服器領域的佔位符號 Username - Username + 使用者名稱 Password - Password + 密碼 @@ -1065,17 +1063,17 @@ installed addons will be checked for available updates Select a license - Select a license + 選擇授權 About... - About... + 關於... License name: - License name: + 許可證名稱： @@ -1106,17 +1104,17 @@ installed addons will be checked for available updates Select Toolbar - Select Toolbar + 選擇工具列 Select a toolbar to add this macro to: - Select a toolbar to add this macro to: + 選擇要加入此巨集的工具列: Ask every time - Ask every time + 每次都詢問 @@ -1125,27 +1123,27 @@ installed addons will be checked for available updates Add button? - Add button? + 添加按鈕? Add a toolbar button for this macro? - Add a toolbar button for this macro? + 選擇要加入此巨集的工具列按鈕 ? Yes - Yes + 是 No - No + 否 Never - Never + 決不 @@ -1153,12 +1151,12 @@ installed addons will be checked for available updates Starting up... - Starting up... + 啟動中... Loading addon information - Loading addon information + 載入附加元件資訊 @@ -1169,8 +1167,7 @@ installed addons will be checked for available updates Previous cache process was interrupted, restarting... - Previous cache process was interrupted, restarting... - + 先前快取行程被中斷，正在重新啟動... @@ -1182,56 +1179,55 @@ installed addons will be checked for available updates Addon manager - Addon manager + 附加元件管理器 You must restart FreeCAD for changes to take effect. - You must restart FreeCAD for changes to take effect. + 您必須重新啟動 FreeCAD 以使更改生效。 Restart now - Restart now + 現在重新啟動 Restart later - Restart later + 稍後重新啟動 Refresh local cache - Refresh local cache + 刷新本地端快取 Updating cache... - Updating cache... + 更新快取... Could not find addon '{}' to select - Could not find addon '{}' to select - + 無法找到附加元件'{}' 以選擇 Checking for updates... - Checking for updates... + 檢查更新... Apply {} update(s) - Apply {} update(s) + 應用 {} 更新 No updates available - No updates available + 沒有可用更新 @@ -1269,7 +1265,7 @@ installed addons will be checked for available updates This appears to be the first time this version of Python has been used with the Addon Manager. Would you like to install the same auto-installed dependencies for it? - This appears to be the first time this version of Python has been used with the Addon Manager. Would you like to install the same auto-installed dependencies for it? + 這似乎是第一次使用這個版本的 Python 與附加元件管理員。您是否想要為其安裝相同的自動安裝相依套件？ @@ -1310,7 +1306,7 @@ installed addons will be checked for available updates Addon Manager: Unexpected {} response from server - Addon Manager: Unexpected {} response from server + 附加元件管理員：從伺服器收到意外的 {} 回應 @@ -1322,7 +1318,7 @@ installed addons will be checked for available updates Confirm remove - Confirm remove + 確認移除 @@ -1356,7 +1352,7 @@ installed addons will be checked for available updates Addon Manager Warning: Could not import QtWebEngineWidgets -- README data will display as text-only - Addon Manager Warning: Could not import QtWebEngineWidgets -- README data will display as text-only + 附加元件管理員警告：無法匯入 QtWebEngineWidgets -- README 資料將僅以純文字顯示 @@ -1404,47 +1400,47 @@ installed addons will be checked for available updates This is the latest version available for branch {} - This is the latest version available for branch {} + 這是分支 {} 可用的最新版本 Updated, please restart FreeCAD to use - Updated, please restart FreeCAD to use + 已更新，請重新啟動 FreeCAD 以使用 Update check in progress - Update check in progress + 正在檢查更新 Automatic update checks disabled - Automatic update checks disabled + 停用自動更新檢查 Installation location - Installation location + 安裝位置 WARNING: This addon is obsolete - WARNING: This addon is obsolete + 警告：此附加元件已過時 WARNING: This addon is Python 2 Only - WARNING: This addon is Python 2 Only + 警告：此附加元件僅適用於 Python 2 WARNING: This addon requires FreeCAD - WARNING: This addon requires FreeCAD + 警告：此附加元件需要 FreeCAD WARNING: This addon is currently installed, but disabled. Use the 'enable' button to re-enable. - WARNING: This addon is currently installed, but disabled. Use the 'enable' button to re-enable. + 警告：此附加元件目前已安裝，但是被停用。使用 '啟用' 按鈕以重新啟用。 @@ -1460,12 +1456,12 @@ installed addons will be checked for available updates This Addon will be enabled next time you restart FreeCAD. - This Addon will be enabled next time you restart FreeCAD. + 此附加元件將會在您重新起動 FreeCAD 後啟用。 This Addon will be disabled next time you restart FreeCAD. - This Addon will be disabled next time you restart FreeCAD. + 此附加元件將會在您重新起動 FreeCAD 後停用。 @@ -1477,22 +1473,22 @@ installed addons will be checked for available updates Success - Success + 成功 Branch change succeeded, please restart to use the new version. - Branch change succeeded, please restart to use the new version. + 分支更改成功，請重新啟動以使用此新版本。 Changed to git ref '{}' -- please restart to use Addon. - Changed to git ref '{}' -- please restart to use Addon. + 更改為 git 參考 '{}' -- 請重新啟動以使用附加元件。 Page JavaScript reported - Page JavaScript reported + JavaScript 報告頁面 @@ -1507,7 +1503,7 @@ installed addons will be checked for available updates Check for Update - Check for Update + 檢查更新 @@ -1532,37 +1528,37 @@ installed addons will be checked for available updates Return to package list - Return to package list + 返回套件列表 The page is taking a long time to load... showing the data we have so far... - The page is taking a long time to load... showing the data we have so far... + 該頁面載入時間過長...顯示我們迄今為止獲得的資料... Checking connection - Checking connection + 正在檢查連線 Checking for connection to GitHub... - Checking for connection to GitHub... + 正在檢查通往 GitHub 之連線... Connection failed - Connection failed + 連線失敗 Missing dependency - Missing dependency + 缺少相依套件 Could not import QtNetwork -- see Report View for details. Addon Manager unavailable. - Could not import QtNetwork -- see Report View for details. Addon Manager unavailable. + 無法匯入 QtNetwork - 請參閱報告檢視以了解細節。附加元件管理員不可用。 @@ -1588,7 +1584,7 @@ installed addons will be checked for available updates Failed to install macro {} - Failed to install macro {} + 安裝巨集 {} 失敗 @@ -1610,7 +1606,7 @@ installed addons will be checked for available updates {} is not a subdirectory of {} - {} is not a subdirectory of {} + {} 不是 {} 的一個子目錄 @@ -1640,7 +1636,7 @@ installed addons will be checked for available updates Yes - Yes + 是 @@ -1671,7 +1667,7 @@ installed addons will be checked for available updates Too many to list - Too many to list + 太多以至於無法列出 @@ -1681,7 +1677,7 @@ installed addons will be checked for available updates Missing Requirement - Missing Requirement + 缺少要求 @@ -1696,7 +1692,7 @@ installed addons will be checked for available updates Press OK to install anyway. - Press OK to install anyway. + 按 OK 以進行安裝。 @@ -1707,29 +1703,29 @@ installed addons will be checked for available updates This Addon (or one if its dependencies) requires Python {}.{}, and your system is running {}.{}. Installation cancelled. - This Addon (or one if its dependencies) requires Python {}.{}, and your system is running {}.{}. Installation cancelled. + 此附加元件 (或其一相依元件) 需要 Python {}.{}, 而您的系統正在執行 {}.{}. 安裝取消. Optional dependency on {} ignored because it is not in the allow-list - Optional dependency on {} ignored because it is not in the allow-list + 可選相依性 {} 被忽略因其不在可允許清單中 Installing dependencies - Installing dependencies + 正在安裝相依性 Cannot execute Python - Cannot execute Python + 無法執行 Python Failed to automatically locate your Python executable, or the path is set incorrectly. Please check the Addon Manager preferences setting for the path to Python. - Failed to automatically locate your Python executable, or the path is set incorrectly. Please check the Addon Manager preferences setting for the path to Python. + 自動定位您的 Python 可執行檔失敗，或者設置的路徑不正確。請檢查附加元件管理器偏好設定中 Python 路徑的設置。 @@ -1740,7 +1736,7 @@ installed addons will be checked for available updates Cannot execute pip - Cannot execute pip + 無法執行 pip @@ -1757,7 +1753,7 @@ installed addons will be checked for available updates Package installation failed - Package installation failed + 套件安裝失敗 @@ -1777,7 +1773,7 @@ installed addons will be checked for available updates Cancelling - Cancelling + 正在取消 @@ -1787,30 +1783,30 @@ installed addons will be checked for available updates {} was installed successfully - {} was installed successfully + {} 已成功安裝 Installation Failed - Installation Failed + 安裝失敗 Failed to install {} - Failed to install {} + {} 安裝失敗 Create new toolbar - Create new toolbar + 建立新工具列 A macro installed with the FreeCAD Addon Manager - A macro installed with the FreeCAD Addon Manager + 使用 FreeCAD 附加元件管理器安裝的巨集 @@ -1832,12 +1828,12 @@ installed addons will be checked for available updates Invalid metadata in file {} - Invalid metadata in file {} + 在檔案 {} 中無效的後設資料 WARNING: Path specified in package.xml metadata does not match currently checked-out branch. - WARNING: Path specified in package.xml metadata does not match currently checked-out branch. + 警告：在 package.xml 後設資料中指定的路徑與當前檢查出的分支不匹配。 @@ -1857,7 +1853,7 @@ installed addons will be checked for available updates Subdirectory - Subdirectory + 子目錄 @@ -1873,7 +1869,7 @@ installed addons will be checked for available updates No Vermin, cancelling operation. NOTE: Vermin is a Python package and proper noun - do not translate - No Vermin, cancelling operation. + 沒有 Vermin 套件，正在取消操作。 @@ -1888,22 +1884,23 @@ installed addons will be checked for available updates Vermin auto-detected a required version of Python 3.{} - Vermin auto-detected a required version of Python 3.{} + Vermin 自動檢測到所需的 Python 3.{} 版本 Install Vermin? - Install Vermin? + 安裝 Vermin 套件? Auto-detecting the required version of Python for this Addon requires Vermin (https://pypi.org/project/vermin/). OK to install? - Auto-detecting the required version of Python for this Addon requires Vermin (https://pypi.org/project/vermin/). OK to install? + 自動偵測此附加元件所需的 Python 版本需要使用 Vermin 套件 +(https://pypi.org/project/vermin/)。確定安裝 ? Attempting to install Vermin from PyPi - Attempting to install Vermin from PyPi + 試圖從 PyPi 安裝 Vermin 套件 @@ -1915,13 +1912,13 @@ installed addons will be checked for available updates Failed to install Vermin -- check Report View for details. 'Vermin' is the name of a Python package, do not translate - Failed to install Vermin -- check Report View for details. + 安裝 Vermin 套件失敗 - 檢查報告檢視以看細節。 Failed to import vermin after installation -- cannot scan Addon. 'vermin' is the name of a Python package, do not translate - Failed to import vermin after installation -- cannot scan Addon. + 安裝後無法匯入 vermin - 無法掃瞄附加元件。 @@ -1985,18 +1982,18 @@ installed addons will be checked for available updates Pending restart - Pending restart + 等待重啟 DISABLED - DISABLED + 已被停用 Installed version - Installed version + @@ -2011,12 +2008,12 @@ installed addons will be checked for available updates Available version - Available version + 可用版本 Show Addons containing: - Show Addons containing: + 顯示包含以下內容的附加元件: @@ -2155,7 +2152,7 @@ installed addons will be checked for available updates Failed to decode {} file for Addon '{}' - Failed to decode {} file for Addon '{}' + 解碼 Addon 的檔案 {} 失敗 '{}' @@ -2215,12 +2212,12 @@ installed addons will be checked for available updates Addon Developer Warning: Repository URL set in package.xml file for addon {} ({}) does not match the URL it was fetched from ({}) - Addon Developer Warning: Repository URL set in package.xml file for addon {} ({}) does not match the URL it was fetched from ({}) + 附加元件開發者警告：給附加元件{} ({}) 之 package.xml 檔中的儲存庫網址集與截取自 ({}) 的網址不匹配 Addon Developer Warning: Repository branch set in package.xml file for addon {} ({}) does not match the branch it was fetched from ({}) - Addon Developer Warning: Repository branch set in package.xml file for addon {} ({}) does not match the branch it was fetched from ({}) + 附加元件開發者警告：給附加元件{} ({}) 之 package.xml 檔中的儲存庫分支集與截取自 ({}) 的分支不匹配 @@ -2276,7 +2273,7 @@ installed addons will be checked for available updates Git is disabled, skipping git macros - Git is disabled, skipping git macros + Git 已被停用，正在跳過 git 巨集 @@ -2303,7 +2300,7 @@ installed addons will be checked for available updates Failed to update macros from GitHub -- try clearing the Addon Manager's cache. - Failed to update macros from GitHub -- try clearing the Addon Manager's cache. + 無法從 GitHub 更新巨集 - 請嘗試清除附加元件管理員'的快取。 @@ -2338,7 +2335,7 @@ installed addons will be checked for available updates Addon Manager: a worker process failed to complete while fetching {name} - Addon Manager: a worker process failed to complete while fetching {name} + 附加元件管理員：在擷取 {name} 時，工作行程未能完成 @@ -2348,7 +2345,7 @@ installed addons will be checked for available updates Addon Manager: a worker process failed to halt ({name}) - Addon Manager: a worker process failed to halt ({name}) + 附加元件管理員：在停止 ({name}) 時，工作行程未能完成 @@ -2386,7 +2383,7 @@ installed addons will be checked for available updates Repository URL Preferences header for custom repositories - Repository URL + 儲存庫網址 @@ -2440,7 +2437,7 @@ installed addons will be checked for available updates &Addon manager - &Addon manager + &附加元件管理器 @@ -2474,7 +2471,7 @@ installed addons will be checked for available updates Auto-Created Macro Toolbar - Auto-Created Macro Toolbar + 自動建立之巨集工具列 diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py index 8e6177dfc1..c2c340eaef 100644 --- a/src/Mod/Arch/ArchSectionPlane.py +++ b/src/Mod/Arch/ArchSectionPlane.py @@ -281,6 +281,7 @@ def getSVG(source, linewidth=1, lineColor=(0.0, 0.0, 0.0), fontsize=1, + linespacing=None, showFill=False, fillColor=(1.0, 1.0, 1.0), techdraw=False, @@ -504,6 +505,7 @@ def getSVG(source, scale=scale, linewidth=svgSymbolLineWidth, fontsize=fontsize, + linespacing=linespacing, direction=direction, color=lineColor, techdraw=techdraw, @@ -526,6 +528,7 @@ def getSVG(source, scale=scale, linewidth=svgSymbolLineWidth, fontsize=fontsize, + linespacing=linespacing, direction=direction, color=lineColor, techdraw=techdraw, @@ -558,6 +561,7 @@ def getSVG(source, scale=scale, linewidth=svgSymbolLineWidth, fontsize=fontsize, + linespacing=linespacing, fillstyle="none", direction=direction, color=lineColor, diff --git a/src/Mod/Arch/Resources/translations/Arch.ts b/src/Mod/Arch/Resources/translations/Arch.ts index 814351a9e8..96c914ae42 100644 --- a/src/Mod/Arch/Resources/translations/Arch.ts +++ b/src/Mod/Arch/Resources/translations/Arch.ts @@ -2336,39 +2336,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + This window has no defined opening - - - + + + Get selected edge - + Unable to create component - + Window elements - + Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected @@ -2376,9 +2376,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove @@ -2387,7 +2387,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add @@ -2401,50 +2401,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit - + Create/update component - + Base 2D object - - + + Wires - + Components - + Create new component - + Name - + Type @@ -2452,56 +2452,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness - + Offset - + Hinge - + Opening mode - - + + + default - + If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge - - + + Invert opening direction - - + + Invert hinge position @@ -3338,93 +3338,93 @@ Floor creation aborted. - + Create Section Plane - + Toggle Cutview - + Section plane settings - + Remove highlighted objects from the list above - + Add selected - + Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: - + Section plane placement: - + Rotate X - + Rotates the plane along the X axis - + Rotate Y - + Rotates the plane along the Y axis - + Rotate Z - + Rotates the plane along the Z axis - + Resize - + Resizes the plane to fit the objects in the list above - + Center - + Centers the plane on the objects in the list above @@ -3961,7 +3961,7 @@ Building creation aborted. - + The shape of this object @@ -3982,7 +3982,7 @@ Building creation aborted. - + The line width of this object @@ -4559,7 +4559,7 @@ Building creation aborted. - + The number of the wire that defines the hole. A value of 0 means automatic @@ -5385,7 +5385,7 @@ Building creation aborted. - + The placement of this object @@ -5605,79 +5605,79 @@ Building creation aborted. - + The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane - + The display height of this section plane - + The size of the arrows of this section plane - + The transparency of this object - - + + Show the cut in the 3D view - + The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view - + The name of the font - + The size of the text font @@ -6503,12 +6503,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane - + Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_be.ts b/src/Mod/Arch/Resources/translations/Arch_be.ts index ff56f17b35..9c62a3d294 100644 --- a/src/Mod/Arch/Resources/translations/Arch_be.ts +++ b/src/Mod/Arch/Resources/translations/Arch_be.ts @@ -2419,39 +2419,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Вышыня падаконніку - + This window has no defined opening Акно не мае пэўнага спосабу адкрыцця - - - + + + Get selected edge Атрымаць абранае рабро - + Unable to create component Немагчыма стварыць кампанент - + Window elements Элементы акна - + Hole wire Ломаная лінія адтуліны - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Колькасць ломаных ліній, які вызначае адтуліны ў аб'екце вузла. Калі 0, аўтаматычна прыме самую вялікую ломаную лінію - + Pick selected Выбраць абранае @@ -2459,9 +2459,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Выдаліць @@ -2470,7 +2470,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Дадаць @@ -2484,50 +2484,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Змяніць - + Create/update component Стварыць/абнавіць кампанент - + Base 2D object Асноўны двухмерны аб'ект - - + + Wires Ломаныя лініі - + Components Кампаненты - + Create new component Стварыць новы кампанент - + Name Назва - + Type Тып @@ -2535,56 +2535,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Таўшчыня - + Offset Зрушэнне - + Hinge Шарнір - + Opening mode Рэжым адкрыцця - - + + + default + першапачаткова - + If this is checked, the default Frame value of this window will be added to the value entered here Калі птушка, першапачатковае значэнне каркасу для акна будзе дададзена да зададзенага значэння - + If this is checked, the default Offset value of this window will be added to the value entered here Калі птушка, першапачатковае значэнне зрушэння для акна будзе дададзена да зададзенага значэння - + Press to retrieve the selected edge Націсніце, каб атрымаць абранае рабро - - + + Invert opening direction Змяніць напрамак адкрыцця - - + + Invert hinge position Перавярнуць становішча шарніру @@ -3429,93 +3429,93 @@ Floor creation aborted. Перасек - + Create Section Plane Стварыць плоскасць перасеку - + Toggle Cutview Пераключыць плоскасць перасеку - + Section plane settings Налады плоскасці перасеку - + Remove highlighted objects from the list above Выдаляе выдзеленыя аб'екты з прыведзенага вышэй спісу - + Add selected Дадаць абранае - + Add selected object(s) to the scope of this section plane Дадае абраныя аб'екты ў вобласць дзеяння плоскасці перасеку - + Objects seen by this section plane: Аб'екты, якія бачныя плоскасці перасеку: - + Section plane placement: Размяшчэнне плоскасці перасеку: - + Rotate X Паварот па X - + Rotates the plane along the X axis Верціць плоскасць наўздоўж восі X - + Rotate Y Паварот па Y - + Rotates the plane along the Y axis Верціць плоскасць наўздоўж восі Y - + Rotate Z Паварот па Z - + Rotates the plane along the Z axis Верціць плоскасць наўздоўж восі Z - + Resize Змяніць памер - + Resizes the plane to fit the objects in the list above Змяняе памер плоскасці па памеру аб'ектаў з прыведзенага вышэй спісу - + Center Па цэнтры - + Centers the plane on the objects in the list above Цэнтруе плоскасць па аб'ектах з прыведзенага вышэй спісу @@ -4060,7 +4060,7 @@ Building creation aborted. - + The shape of this object Фігура аб'екту @@ -4081,7 +4081,7 @@ Building creation aborted. - + The line width of this object Шырыня лініі аб'екту @@ -4658,7 +4658,7 @@ Building creation aborted. Паказвае знакі адкрыцця вышыні, калі яны маюцца - + The number of the wire that defines the hole. A value of 0 means automatic Колькасць ломаных ліній, якая вызначае адтуліну. Значэнне 0 азначае - аўтаматычна @@ -5484,7 +5484,7 @@ Building creation aborted. - + The placement of this object Размяшчэнне аб'екту @@ -5704,79 +5704,79 @@ Building creation aborted. Фігура арматуры - + The objects that must be considered by this section plane. Empty means the whole document. Аб'екты, якія павінны быць разгледжаны на плоскасці перасеку. Пусты азначае ўвесь дакумент. - + If false, non-solids will be cut too, with possible wrong results. Калі false, то несуцэльныя целы таксама будуць выразаныя, што можа прывесці да няправільных вынікаў. - + If True, resulting views will be clipped to the section plane area. Калі True, выніковыя выгляды будуць абрэзаныя да вобласці плоскасці перасеку. - + If true, the color of the objects material will be used to fill cut areas. Калі true, колер матэрыялу аб'ектаў будзе ўжывацца для запаўнення выразаных участкаў. - + Geometry further than this value will be cut off. Keep zero for unlimited. Геаметрыя, якая перавышае гэтае значэнне, будзе абрэзана. Пакіньце 0, каб зняць абмежаванне. - + The display length of this section plane Даўжыня адлюстравання плоскасці перасеку - + The display height of this section plane Вышыня адлюстравання плоскасці перасеку - + The size of the arrows of this section plane Памер стрэлак плоскасці перасеку - + The transparency of this object Празрыстасць аб'екту - - + + Show the cut in the 3D view Паказаць перасек у трохмерным прадстаўленні - + The color of this object Колер аб'екту - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) Адлегласць паміж плоскасцю разрэзу і фактычным разрэзам выгляду (пакіньце гэтае значэнне вельмі малым, але не нуль) - + Show the label in the 3D view Паказаць метку ў трохмерным прадстаўленні - + The name of the font Назва шрыфту - + The size of the text font Памер шрыфту тэксту @@ -6602,12 +6602,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Плоскасць перасеку - + Creates a section plane object, including the selected objects Стварае аб'ект плоскасці перасеку, які ўключае абраныя аб'екты diff --git a/src/Mod/Arch/Resources/translations/Arch_ca.ts b/src/Mod/Arch/Resources/translations/Arch_ca.ts index 4782564f70..06ff9a2963 100644 --- a/src/Mod/Arch/Resources/translations/Arch_ca.ts +++ b/src/Mod/Arch/Resources/translations/Arch_ca.ts @@ -2378,39 +2378,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component No s'ha pogut crear el component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Tria el seleccionat @@ -2418,9 +2418,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Elimina @@ -2429,7 +2429,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Afegeix @@ -2443,50 +2443,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Edita - + Create/update component Crea/actualitza el component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Components - + Create new component Crea un component nou - + Name Nom - + Type Tipus @@ -2494,56 +2494,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Gruix - + Offset Equidistancia (ofset) - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3388,93 +3388,93 @@ Floor creation aborted. Secció - + Create Section Plane Crea un pla de secció - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Afegeix el seleccionat - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Centre - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4019,7 +4019,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4040,7 +4040,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4617,7 +4617,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5443,7 +5443,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5663,79 +5663,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6561,12 +6561,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_cs.ts b/src/Mod/Arch/Resources/translations/Arch_cs.ts index 1639bd7ead..ea23787daa 100644 --- a/src/Mod/Arch/Resources/translations/Arch_cs.ts +++ b/src/Mod/Arch/Resources/translations/Arch_cs.ts @@ -2410,39 +2410,39 @@ Je-li Run = 0, pak se běh vypočítá tak, aby výška byla stejná jako relati Výška parapetu - + This window has no defined opening Toto okno nemá žádné definované otevření - - - + + + Get selected edge Získat vybranou hranu - + Unable to create component Nepodařilo se vytvořit díl - + Window elements Prvky okna - + Hole wire Otvor drátu - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Číslo drátu, který definuje otvor v hostitelském objektu. Hodnota nuly automaticky převezme největší drát - + Pick selected Vybrat vybrané @@ -2450,9 +2450,9 @@ Je-li Run = 0, pak se běh vypočítá tak, aby výška byla stejná jako relati - + - + Remove Odstranit @@ -2461,7 +2461,7 @@ Je-li Run = 0, pak se běh vypočítá tak, aby výška byla stejná jako relati - + Add Přidat @@ -2475,50 +2475,50 @@ Je-li Run = 0, pak se běh vypočítá tak, aby výška byla stejná jako relati - + - + Edit Upravit - + Create/update component Vytvořit/aktualizovat díl - + Base 2D object Základní 2D objekt - - + + Wires Dráty - + Components Komponenty - + Create new component Vytvořit nový díl - + Name Jméno - + Type Typ @@ -2526,56 +2526,56 @@ Je-li Run = 0, pak se běh vypočítá tak, aby výška byla stejná jako relati - + Thickness Tloušťka - + Offset Odstup - + Hinge Závěs - + Opening mode Režim otevírání - - + + + default + výchozí - + If this is checked, the default Frame value of this window will be added to the value entered here Je-li zaškrtnuto, výchozí hodnota rámu tohoto okna bude přidána k hodnotě zadané zde - + If this is checked, the default Offset value of this window will be added to the value entered here Je-li zaškrtnuto, výchozí hodnota odsazení tohoto okna bude přidána k hodnotě zadané zde - + Press to retrieve the selected edge Stisknutím načíst vybraný okraj - - + + Invert opening direction Obrátit směr otevírání - - + + Invert hinge position Otočit polohu závěsů @@ -3420,93 +3420,93 @@ Floor creation aborted. Výběr - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Přidat vybrané - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Na střed - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4051,7 +4051,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4072,7 +4072,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4649,7 +4649,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic Počet drátů definujících otvor. Je-li 0, je hodnota vypočtena automaticky @@ -5475,7 +5475,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5695,79 +5695,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. Objekty, které musí být v této rovině řezu zohledněny. Prázdné znamená celý dokument. - + If false, non-solids will be cut too, with possible wrong results. Pokud nepravda, ne-objemová tělesa budou také ořezána s možnými chybnými výsledky. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6593,12 +6593,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_de.ts b/src/Mod/Arch/Resources/translations/Arch_de.ts index 05bf9f95c9..cdbc31d72f 100644 --- a/src/Mod/Arch/Resources/translations/Arch_de.ts +++ b/src/Mod/Arch/Resources/translations/Arch_de.ts @@ -2379,39 +2379,39 @@ Wenn Länge = 0 dann wird die Länge so berechnet, dass die Höhe gleich dem rel Fensterbankhöhe - + This window has no defined opening Das Fenster hat keine definierte Öffnung - - - + + + Get selected edge Ausgewählte Kante erhalten - + Unable to create component Komponente konnte nicht erstellt werden - + Window elements Fensterelemente - + Hole wire Kantenzug - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Die Nummer des Kantenzuges der das Loch im Host-Objekt definiert. Der Wert Null wählt automatisch den größten Kantenzug aus - + Pick selected Ausgewähltes wählen @@ -2419,9 +2419,9 @@ Wenn Länge = 0 dann wird die Länge so berechnet, dass die Höhe gleich dem rel - + - + Remove Entfernen @@ -2430,7 +2430,7 @@ Wenn Länge = 0 dann wird die Länge so berechnet, dass die Höhe gleich dem rel - + Add Hinzufügen @@ -2444,50 +2444,50 @@ Wenn Länge = 0 dann wird die Länge so berechnet, dass die Höhe gleich dem rel - + - + Edit Bearbeiten - + Create/update component Erstelle / aktualisiere Komponente - + Base 2D object 2D Basisobjekt - - + + Wires Kantenzüge - + Components Komponenten - + Create new component Neue Komponente erstellen - + Name Name - + Type Typ @@ -2495,56 +2495,56 @@ Wenn Länge = 0 dann wird die Länge so berechnet, dass die Höhe gleich dem rel - + Thickness Dicke - + Offset Versatz - + Hinge Scharnier - + Opening mode Öffnungsmodus - - + + + default + Standard - + If this is checked, the default Frame value of this window will be added to the value entered here Falls aktiviert, wird der Standard Rahmenwert dieses Fensters zu dem hier eingegebenen Wert hinzugefügt - + If this is checked, the default Offset value of this window will be added to the value entered here Falls aktiviert, wird der Standard Versatzwert dieses Fensters zu dem hier eingegebenen Wert addiert - + Press to retrieve the selected edge Drücken, um die ausgewählte Kante zu erhalten - - + + Invert opening direction Öffnungsrichtung umkehren - - + + Invert hinge position Scharnierposition umkehren @@ -3386,93 +3386,93 @@ Geschoß-Erstellung abgebrochen. Abschnitt - + Create Section Plane Schnittebene erzeugen - + Toggle Cutview Schnittansicht umschalten - + Section plane settings Einstellungen Schnittebene - + Remove highlighted objects from the list above Markierte Objekte aus der obigen Liste entfernen - + Add selected Ausgewähltes hinzufügen - + Add selected object(s) to the scope of this section plane Ausgewählte Objekte zum Geltungsbereich dieser Schnittebene hinzufügen - + Objects seen by this section plane: Objekte, die von dieser Schnittebene gesehen werden: - + Section plane placement: Platzierung der Schnittebene: - + Rotate X Drehen X - + Rotates the plane along the X axis Rotiert die Ebene um die X-Achse - + Rotate Y Drehen Y - + Rotates the plane along the Y axis Rotiert die Ebene um die Y-Achse - + Rotate Z Drehen Z - + Rotates the plane along the Z axis Rotiert die Ebene um die Z-Achse - + Resize Größe ändern - + Resizes the plane to fit the objects in the list above Ändert die Ausdehnung der Ebene, sodass alle Objekte der obigen Liste darauf passen - + Center Zentrum - + Centers the plane on the objects in the list above Zentriert die Ebene gemäß den Objekten in obiger Liste @@ -4017,7 +4017,7 @@ Gebäudeerstellung abgebrochen. - + The shape of this object Die Form dieses Objekts @@ -4038,7 +4038,7 @@ Gebäudeerstellung abgebrochen. - + The line width of this object Die Linienbreite dieses Objekts @@ -4615,7 +4615,7 @@ Gebäudeerstellung abgebrochen. Zeige Elevationsöffnungssymbole, falls verfügbar - + The number of the wire that defines the hole. A value of 0 means automatic Die Nummer des Kantenzuges, die das Loch definieren. Der Wert 0 bedeutet automatisch @@ -5441,7 +5441,7 @@ Gebäudeerstellung abgebrochen. - + The placement of this object Die Positionierung dieses Objekts @@ -5661,79 +5661,79 @@ Gebäudeerstellung abgebrochen. Form von Bewehrung - + The objects that must be considered by this section plane. Empty means the whole document. Die Objekte, die von dieser Schnittebene berücksichtigt werden müssen. Leer bedeutet das ganze Dokument. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. Wenn wahr, werden die entstehenden Ansichten durch den Bereich der Schnittebene begrenzt. - + If true, the color of the objects material will be used to fill cut areas. Wenn wahr, wird die Farbe des Objektmaterials verwendet, um Schnittflächen zu füllen. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane Die Anzeigelänge dieser Sektionsebene - + The display height of this section plane Die Anzeigehöhe dieser Sektionsebene - + The size of the arrows of this section plane Die Größe der Pfeile dieser Sektionsebene - + The transparency of this object Die Transparenz dieses Objekts - - + + Show the cut in the 3D view Schnitt in der 3D-Ansicht anzeigen - + The color of this object Die Farbe dieses Objekts - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) Die Entfernung zwischen der Schnitt-Ebene und der tatsächlichen Anzeige-Ebene (nutze einen sehr kleinen Wert, aber nicht 0) - + Show the label in the 3D view Beschriftung in der 3D-Ansicht anzeigen - + The name of the font Der Name der Schriftart - + The size of the text font Die Größe der Textschriftart @@ -6559,12 +6559,12 @@ Gebäudeerstellung abgebrochen. Arch_SectionPlane - + Section Plane Schnittebene - + Creates a section plane object, including the selected objects Erstellt eine Schnittebene, einschließlich der ausgewählten Objekte diff --git a/src/Mod/Arch/Resources/translations/Arch_el.qm b/src/Mod/Arch/Resources/translations/Arch_el.qm index 52f49e6255..1d2b0495af 100644 Binary files a/src/Mod/Arch/Resources/translations/Arch_el.qm and b/src/Mod/Arch/Resources/translations/Arch_el.qm differ diff --git a/src/Mod/Arch/Resources/translations/Arch_el.ts b/src/Mod/Arch/Resources/translations/Arch_el.ts index 54ea4bab98..858bc156ae 100644 --- a/src/Mod/Arch/Resources/translations/Arch_el.ts +++ b/src/Mod/Arch/Resources/translations/Arch_el.ts @@ -359,7 +359,7 @@ Leave blank to use all objects from the document BimServer URL: - BimServer URL: + BimServer URL: @@ -374,7 +374,7 @@ Leave blank to use all objects from the document Keep me logged in across FreeCAD sessions - Keep me logged in across FreeCAD sessions + Να παραμείνω συνδεδεμένος σε όλες τις συνεδρίες FreeCAD @@ -384,12 +384,12 @@ Leave blank to use all objects from the document IFC properties editor - IFC properties editor + Επεξεργαστής ιδιοτήτων IFC IFC UUID: - IFC UUID: + IFC UUID: @@ -721,7 +721,7 @@ Leave blank to use all objects from the document IFC version - IFC version + Έκδοση IFC @@ -731,12 +731,12 @@ Leave blank to use all objects from the document IFC4 - IFC4 + IFC4 IFC2X3 - IFC2X3 + IFC2X3 @@ -1103,7 +1103,7 @@ instead of the FreeCAD web workbench IFC import - IFC import + Εισαγωγή IFC @@ -2407,39 +2407,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Διαλέξτε τα επιλεγμένα @@ -2447,9 +2447,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Αφαίρεση @@ -2458,7 +2458,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Προσθήκη @@ -2472,50 +2472,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Επεξεργασία - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Στοιχεία - + Create new component Create new component - + Name Όνομα - + Type Τύπος @@ -2523,56 +2523,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Πάχος - + Offset Μετατοπίστε - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3417,93 +3417,93 @@ Floor creation aborted. Τομή - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Προσθήκη επιλεγμένων - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Κέντρο - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4048,7 +4048,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4069,7 +4069,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4646,7 +4646,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5472,7 +5472,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5692,79 +5692,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6590,12 +6590,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_es-AR.ts b/src/Mod/Arch/Resources/translations/Arch_es-AR.ts index 5b22fbb6c0..78c9dd885e 100644 --- a/src/Mod/Arch/Resources/translations/Arch_es-AR.ts +++ b/src/Mod/Arch/Resources/translations/Arch_es-AR.ts @@ -2403,39 +2403,39 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu Altura del travesaño - + This window has no defined opening Esta ventana no tiene una apertura definida - - - + + + Get selected edge Obtener arista seleccionada - + Unable to create component No es posible crear el componente - + Window elements Elementos de ventana - + Hole wire Agujero de alambre - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire El número del alambre que define un agujero en el objeto huésped. Un valor de cero adoptará automáticamente el alambre más grande - + Pick selected Elegir lo seleccionado @@ -2443,9 +2443,9 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu - + - + Remove Eliminar @@ -2454,7 +2454,7 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu - + Add Agregar @@ -2468,50 +2468,50 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu - + - + Edit Editar - + Create/update component Crear/actualizar componente - + Base 2D object Objeto base 2D - - + + Wires Alambres - + Components Componentes - + Create new component Crear nuevo componente - + Name Nombre - + Type Tipo @@ -2519,56 +2519,56 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu - + Thickness Espesor - + Offset Desfase - + Hinge Bisagra - + Opening mode Modo de apertura - - + + + default + por defecto - + If this is checked, the default Frame value of this window will be added to the value entered here Si se marca esta opción, el valor predeterminado del marco de esta ventana se agregará al valor ingresado aquí - + If this is checked, the default Offset value of this window will be added to the value entered here Si se marca esta opción, el valor predeterminado de offset de esta ventana se agregará al valor ingresado aquí - + Press to retrieve the selected edge Presione para recuperar la arista seleccionada - - + + Invert opening direction Invertir la dirección de apertura - - + + Invert hinge position Invertir la posición de la bisagra @@ -3413,93 +3413,93 @@ Creación de planta cancelada. Corte - + Create Section Plane Crear el plano de sección - + Toggle Cutview Alternar vista de corte - + Section plane settings Ajustes de plano de sección - + Remove highlighted objects from the list above Eliminar los objetos resaltados de la lista anterior - + Add selected Agregar selección - + Add selected object(s) to the scope of this section plane Añadir objeto(s) seleccionado al ámbito de este plano de sección - + Objects seen by this section plane: Objetos vistos por esta sección del plano: - + Section plane placement: Ubicación de plano de sección: - + Rotate X Rotar X - + Rotates the plane along the X axis Rota el plano a lo largo del eje X - + Rotate Y Rotar Y - + Rotates the plane along the Y axis Rota el plano a lo largo del eje Y - + Rotate Z Rotar Z - + Rotates the plane along the Z axis Rota el plano a lo largo del eje Z - + Resize Redimensionar - + Resizes the plane to fit the objects in the list above Redimensiona el plano para encajar los objetos en la lista anterior - + Center Centro - + Centers the plane on the objects in the list above Centra el plano en los objetos de la lista anterior @@ -4044,7 +4044,7 @@ Creación de construcción cancelada. - + The shape of this object La forma de este objeto @@ -4065,7 +4065,7 @@ Creación de construcción cancelada. - + The line width of this object El ancho de línea de este objeto @@ -4642,7 +4642,7 @@ Creación de construcción cancelada. Muestra los símbolos de apertura de la elevación si están disponibles - + The number of the wire that defines the hole. A value of 0 means automatic El número del alambre que define el agujero. Un valor de 0 significa automático @@ -5468,7 +5468,7 @@ Creación de construcción cancelada. - + The placement of this object La posición de este objeto @@ -5688,79 +5688,79 @@ Creación de construcción cancelada. Forma del refuerzo - + The objects that must be considered by this section plane. Empty means the whole document. Los objetos que deben ser considerados por este plano de sección. Vacío significa todo el documento. - + If false, non-solids will be cut too, with possible wrong results. Si es falso, los objetos no sólidos también se cortarán, con posibles resultados equivocados. - + If True, resulting views will be clipped to the section plane area. Si es verdadero, las vistas resultantes se verán acopladas al área de plano de sección. - + If true, the color of the objects material will be used to fill cut areas. Si es verdadero, el color del material de los objetos se utilizará para llenar las áreas cortadas. - + Geometry further than this value will be cut off. Keep zero for unlimited. La geometría más allá de este valor será cortada. Mantener en cero para ilimitado. - + The display length of this section plane El tamaño de pantalla de este plano de sección - + The display height of this section plane La altura de la pantalla de este plano de sección - + The size of the arrows of this section plane El tamaño de las flechas de este plano de sección - + The transparency of this object La transparencia de este objeto - - + + Show the cut in the 3D view Mostrar el corte en la vista 3D - + The color of this object El color de este objeto - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) La distancia entre el plano de corte y la vista actual de corte (mantener esto un valor muy pequeño, pero no cero) - + Show the label in the 3D view Mostrar la etiqueta en la vista 3D - + The name of the font El nombre de la fuente - + The size of the text font El tamaño de la fuente de texto @@ -6586,12 +6586,12 @@ Creación de construcción cancelada. Arch_SectionPlane - + Section Plane Plano de sección - + Creates a section plane object, including the selected objects Crea un objeto plano de sección, incluyendo los objetos seleccionados diff --git a/src/Mod/Arch/Resources/translations/Arch_es-ES.ts b/src/Mod/Arch/Resources/translations/Arch_es-ES.ts index b1b6a561df..3e9347fe55 100644 --- a/src/Mod/Arch/Resources/translations/Arch_es-ES.ts +++ b/src/Mod/Arch/Resources/translations/Arch_es-ES.ts @@ -2403,39 +2403,39 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu Altura del travesaño - + This window has no defined opening Esta ventana no tiene una apertura definida - - - + + + Get selected edge Obtener arista seleccionada - + Unable to create component No es posible crear el componente - + Window elements Elementos de ventana - + Hole wire Agujero de alambre - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire El número del alambre que define un agujero en el objeto huésped. Un valor de cero adoptará automáticamente el alambre más grande - + Pick selected Elegir lo seleccionado @@ -2443,9 +2443,9 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu - + - + Remove Quitar @@ -2454,7 +2454,7 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu - + Add Añadir @@ -2468,50 +2468,50 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu - + - + Edit Editar - + Create/update component Crear/actualizar componente - + Base 2D object Objeto base 2D - - + + Wires Alambres - + Components Componentes - + Create new component Crear nuevo componente - + Name Nombre - + Type Tipo @@ -2519,56 +2519,56 @@ Si Distancia = 0 entonces la distancia es calcula de forma que la altura sea igu - + Thickness Espesor - + Offset Desplazamiento - + Hinge Bisagra - + Opening mode Modo de apertura - - + + + default + por defecto - + If this is checked, the default Frame value of this window will be added to the value entered here Si se marca esta opción, el valor predeterminado del marco de esta ventana se agregará al valor ingresado aquí - + If this is checked, the default Offset value of this window will be added to the value entered here Si se marca esta opción, el valor predeterminado de offset de esta ventana se agregará al valor ingresado aquí - + Press to retrieve the selected edge Presione para recuperar la arista seleccionada - - + + Invert opening direction Invertir la dirección de apertura - - + + Invert hinge position Invertir la posición de la bisagra @@ -3413,93 +3413,93 @@ Creación de planta cancelada. Sección - + Create Section Plane Crear el plano de sección - + Toggle Cutview Alternar vista de corte - + Section plane settings Ajustes de plano de sección - + Remove highlighted objects from the list above Eliminar los objetos resaltados de la lista anterior - + Add selected Añadir la selección - + Add selected object(s) to the scope of this section plane Añadir objeto(s) seleccionado al ámbito de este plano de sección - + Objects seen by this section plane: Objetos vistos por esta sección del plano: - + Section plane placement: Ubicación de plano de sección: - + Rotate X Rotar X - + Rotates the plane along the X axis Rota el plano a lo largo del eje X - + Rotate Y Rotar Y - + Rotates the plane along the Y axis Rota el plano a lo largo del eje Y - + Rotate Z Rotar Z - + Rotates the plane along the Z axis Rota el plano a lo largo del eje Z - + Resize Redimensionar - + Resizes the plane to fit the objects in the list above Redimensiona el plano para encajar los objetos en la lista anterior - + Center Centro - + Centers the plane on the objects in the list above Centra el plano en los objetos de la lista anterior @@ -4044,7 +4044,7 @@ Creación de construcción cancelada. - + The shape of this object La forma de este objeto @@ -4065,7 +4065,7 @@ Creación de construcción cancelada. - + The line width of this object El ancho de línea de este objeto @@ -4642,7 +4642,7 @@ Creación de construcción cancelada. Muestra los símbolos de apertura de la elevación si están disponibles - + The number of the wire that defines the hole. A value of 0 means automatic El número del alambre que define el agujero. Un valor de 0 significa automático @@ -5468,7 +5468,7 @@ Creación de construcción cancelada. - + The placement of this object La posición de este objeto @@ -5688,79 +5688,79 @@ Creación de construcción cancelada. Forma del refuerzo - + The objects that must be considered by this section plane. Empty means the whole document. Los objetos que deben ser considerados por este plano de sección. Vacío significa todo el documento. - + If false, non-solids will be cut too, with possible wrong results. Si es falso, los objetos no sólidos también se cortarán, con posibles resultados equivocados. - + If True, resulting views will be clipped to the section plane area. Si es verdadero, las vistas resultantes se verán acopladas al área de plano de sección. - + If true, the color of the objects material will be used to fill cut areas. Si es verdadero, el color del material de los objetos se utilizará para llenar las áreas cortadas. - + Geometry further than this value will be cut off. Keep zero for unlimited. La geometría más allá de este valor será cortada. Mantener en cero para ilimitado. - + The display length of this section plane El tamaño de pantalla de este plano de sección - + The display height of this section plane La altura de la pantalla de este plano de sección - + The size of the arrows of this section plane El tamaño de las flechas de este plano de sección - + The transparency of this object La transparencia de este objeto - - + + Show the cut in the 3D view Mostrar el corte en la vista 3D - + The color of this object El color de este objeto - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) La distancia entre el plano de corte y la vista actual de corte (mantener esto un valor muy pequeño, pero no cero) - + Show the label in the 3D view Mostrar la etiqueta en la vista 3D - + The name of the font El nombre de la fuente - + The size of the text font El tamaño de la fuente de texto @@ -6586,12 +6586,12 @@ Creación de construcción cancelada. Arch_SectionPlane - + Section Plane Plano de sección - + Creates a section plane object, including the selected objects Crea un objeto plano de sección, incluyendo los objetos seleccionados diff --git a/src/Mod/Arch/Resources/translations/Arch_eu.ts b/src/Mod/Arch/Resources/translations/Arch_eu.ts index 519380fb69..1d99f670f0 100644 --- a/src/Mod/Arch/Resources/translations/Arch_eu.ts +++ b/src/Mod/Arch/Resources/translations/Arch_eu.ts @@ -2409,39 +2409,39 @@ Distantzia = 0 bada, orduan distantzia kalkulatzen da altuera profil erlatiboare Leiho-barrenaren altuera - + This window has no defined opening Leiho honek ez du irekierarik definituta - - - + + + Get selected edge Hartu hautatutako ertza - + Unable to create component Ezin izan da osagaia sortu - + Window elements Leiho-elementuak - + Hole wire Zulo-alanbrea - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Ostalari-objektuan zulo bat definitzen duen alanbrearen zenbakia. Zero balioak alanbrerik luzeena hartuko du automatikoki - + Pick selected Hartu hautatua @@ -2449,9 +2449,9 @@ Distantzia = 0 bada, orduan distantzia kalkulatzen da altuera profil erlatiboare - + - + Remove Kendu @@ -2460,7 +2460,7 @@ Distantzia = 0 bada, orduan distantzia kalkulatzen da altuera profil erlatiboare - + Add Gehitu @@ -2474,50 +2474,50 @@ Distantzia = 0 bada, orduan distantzia kalkulatzen da altuera profil erlatiboare - + - + Edit Editatu - + Create/update component Sortu/eguneratu osagaia - + Base 2D object 2D oinarri-objektua - - + + Wires Alanbreak - + Components Osagaiak - + Create new component Sortu osagai berria - + Name Izena - + Type Mota @@ -2525,56 +2525,56 @@ Distantzia = 0 bada, orduan distantzia kalkulatzen da altuera profil erlatiboare - + Thickness Lodiera - + Offset Desplazamendua - + Hinge Gontza - + Opening mode Irekitze modua - - + + + default + lehenetsia - + If this is checked, the default Frame value of this window will be added to the value entered here Hau markatuta badago, leiho honen markoaren balio lehenetsia hemen sartutako balioari gehituko zaio - + If this is checked, the default Offset value of this window will be added to the value entered here Hau markatuta badago, leiho honen desplazamenduaren balio lehenetsia hemen sartutako balioari gehituko zaio - + Press to retrieve the selected edge Sakatu hautatutako ertza atzitzeko - - + + Invert opening direction Alderantzikatu irekitze-norabidea - - + + Invert hinge position Alderantzikatu gontzaren posizioa @@ -3419,93 +3419,93 @@ Solairuaren sorrera utzi egin da. Sekzioa - + Create Section Plane Sortu ebakidura-planoa - + Toggle Cutview Txandakatu mozte-bista - + Section plane settings Sekzio-planoaren ezarpenak - + Remove highlighted objects from the list above Kendu nabarmendutako objektuak goiko zerrendatik - + Add selected Gehitu hautatuak - + Add selected object(s) to the scope of this section plane Gehitu hautatutako objektua(k) sekzio-plano honen esparrura - + Objects seen by this section plane: Sekzio-plano honek ikusten dituen objektuak: - + Section plane placement: Sekzio-planoaren kokapena: - + Rotate X Biratu X - + Rotates the plane along the X axis Planoa X ardatzean biratzen du - + Rotate Y Biratu Y - + Rotates the plane along the Y axis Planoa Y ardatzean biratzen du - + Rotate Z Biratu Z - + Rotates the plane along the Z axis Planoa Z ardatzean biratzen du - + Resize Aldatu tamaina - + Resizes the plane to fit the objects in the list above Planoa goiko zerrendako objektuekin doitzeko biratzen du - + Center Zentroa - + Centers the plane on the objects in the list above Planoa goiko zerrendako objektuetan zentratzen du @@ -4050,7 +4050,7 @@ Eraikinaren sorrera utzi egin da. - + The shape of this object Objektu honen forma @@ -4071,7 +4071,7 @@ Eraikinaren sorrera utzi egin da. - + The line width of this object Objektu honen lerro-zabalera @@ -4648,7 +4648,7 @@ Eraikinaren sorrera utzi egin da. Erakutsi garaiera-irekiguneen ikurrak, erabilgarri badaude - + The number of the wire that defines the hole. A value of 0 means automatic Zuloa definitzen duen alanbrearen zenbakia. 0 balioak automatikoa esan nahi du @@ -5474,7 +5474,7 @@ Eraikinaren sorrera utzi egin da. - + The placement of this object Objektu honen kokapena @@ -5694,79 +5694,79 @@ Eraikinaren sorrera utzi egin da. Armadura-barraren forma - + The objects that must be considered by this section plane. Empty means the whole document. Sekzio-plano honek kontuan hartu behar diren objektuak. Hutsik badago, dokumentu osoa hartuko da. - + If false, non-solids will be cut too, with possible wrong results. Gezurra bada, solidoak ez direnak ere moztuko dira, eta emaitzak okerrak izan daitezke. - + If True, resulting views will be clipped to the section plane area. Egia bada, emaitzako bistak sekzio-planoaren areara moztuko dira. - + If true, the color of the objects material will be used to fill cut areas. Egia bada, objektuen materialaren kolorea mozte-areak betetzeko erabiliko da. - + Geometry further than this value will be cut off. Keep zero for unlimited. Balio honetaz haratago dagoen geometria moztu egingo da. Ezarri zero mugagabea izan dadin. - + The display length of this section plane Sekzio-plano honen bistaratze-luzera - + The display height of this section plane Sekzio-plano honen bistaratze-altuera - + The size of the arrows of this section plane Sekzio-plano honen gezien tamaina - + The transparency of this object Objektu honen gardentasuna - - + + Show the cut in the 3D view Erakutsi moztea 3D bistan - + The color of this object Objektu honen kolorea - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) Mozte-planoaren eta uneko bistaren moztearen arteko distantzia (balio horrek oso txikia izan behar du, baina ez zero) - + Show the label in the 3D view Erakutsi etiketa 3D bistan - + The name of the font Letra-tipoaren izena - + The size of the text font Testuaren letra-tamaina @@ -6592,12 +6592,12 @@ Eraikinaren sorrera utzi egin da. Arch_SectionPlane - + Section Plane Sekzio-planoa - + Creates a section plane object, including the selected objects Sekzio-plano bat sortzen du, hautatutako objektuak barne hartuz diff --git a/src/Mod/Arch/Resources/translations/Arch_fi.ts b/src/Mod/Arch/Resources/translations/Arch_fi.ts index f1f063ef07..176dd00276 100644 --- a/src/Mod/Arch/Resources/translations/Arch_fi.ts +++ b/src/Mod/Arch/Resources/translations/Arch_fi.ts @@ -2411,39 +2411,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Valitse valittu @@ -2451,9 +2451,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Poista @@ -2462,7 +2462,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Lisää @@ -2476,50 +2476,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Muokkaa - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Osat - + Create new component Luo uusi komponentti - + Name Nimi - + Type Tyyppi @@ -2527,56 +2527,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Paksuus - + Offset Siirtymä - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3421,93 +3421,93 @@ Floor creation aborted. Leikkaus - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Lisää valitut - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Keskikohta - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4052,7 +4052,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4073,7 +4073,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4650,7 +4650,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5476,7 +5476,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5696,79 +5696,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6594,12 +6594,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_fr.qm b/src/Mod/Arch/Resources/translations/Arch_fr.qm index 06541144b2..fb22fadb28 100644 Binary files a/src/Mod/Arch/Resources/translations/Arch_fr.qm and b/src/Mod/Arch/Resources/translations/Arch_fr.qm differ diff --git a/src/Mod/Arch/Resources/translations/Arch_fr.ts b/src/Mod/Arch/Resources/translations/Arch_fr.ts index 8884b2b449..c3082fd251 100644 --- a/src/Mod/Arch/Resources/translations/Arch_fr.ts +++ b/src/Mod/Arch/Resources/translations/Arch_fr.ts @@ -1091,7 +1091,7 @@ instead of the FreeCAD web workbench Line color - Couleur de ligne + Couleur des lignes @@ -2377,39 +2377,39 @@ Si Course = 0 alors la course est calculée de façon à ce que la hauteur du pr Hauteur d'allège - + This window has no defined opening Cette fenêtre n'a pas d'ouverture définie - - - + + + Get selected edge Obtenir l’arête sélectionnée - + Unable to create component Impossible de créer le composant - + Window elements Éléments de la fenêtre - + Hole wire Ligne de l'emplacement - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Le nombre de lignes qui définit une ouverture dans l'objet hôte. Une valeur de zéro adoptera automatiquement la ligne la plus grande - + Pick selected Choisir la sélection @@ -2417,9 +2417,9 @@ Si Course = 0 alors la course est calculée de façon à ce que la hauteur du pr - + - + Remove Supprimer @@ -2428,7 +2428,7 @@ Si Course = 0 alors la course est calculée de façon à ce que la hauteur du pr - + Add Ajouter @@ -2442,50 +2442,50 @@ Si Course = 0 alors la course est calculée de façon à ce que la hauteur du pr - + - + Edit Éditer - + Create/update component Créer/mettre à jour le composant - + Base 2D object Objet 2D de base - - + + Wires Polylignes - + Components Composants - + Create new component Créer un nouveau composant - + Name Nom - + Type Type @@ -2493,56 +2493,56 @@ Si Course = 0 alors la course est calculée de façon à ce que la hauteur du pr - + Thickness Épaisseur - + Offset Décalage - + Hinge Charnière - + Opening mode Mode d’ouverture - - + + + default + défaut - + If this is checked, the default Frame value of this window will be added to the value entered here Si cette case est cochée, la valeur par défaut du cadre de cette fenêtre s’ajoutera à la valeur entrée ici - + If this is checked, the default Offset value of this window will be added to the value entered here Si cette case est cochée, la valeur par défaut du décalage de cette fenêtre s’ajoutera à la valeur entrée ici - + Press to retrieve the selected edge Appuyer sur pour récupérer l’arête sélectionnée - - + + Invert opening direction Inverser la direction d'ouverture - - + + Invert hinge position Inverser la position de la charnière @@ -3387,93 +3387,93 @@ La création du niveau est abandonnée. Coupe - + Create Section Plane Créer un plan de coupe - + Toggle Cutview Basculer le plan de coupe - + Section plane settings Paramètres du plan de coupe - + Remove highlighted objects from the list above Supprimer les objets en surbrillance de la liste ci-dessus - + Add selected Ajouter la sélection - + Add selected object(s) to the scope of this section plane Ajouter un(des) objet(s) sélectionné(s) au champ d'application de ce plan de coupe - + Objects seen by this section plane: Objets vus dans ce plan de coupe : - + Section plane placement: Emplacement du plan de coupe : - + Rotate X Faire pivoter autour de l'axe X - + Rotates the plane along the X axis Fait pivoter le plan le long de l'axe X - + Rotate Y Faire pivoter autour de l'axe Y - + Rotates the plane along the Y axis Fait pivoter le plan le long de l'axe Y - + Rotate Z Faire pivoter autour de l'axe Z - + Rotates the plane along the Z axis Fait pivoter le plan le long de l'axe Z - + Resize Redimensionner - + Resizes the plane to fit the objects in the list above Redimensionne le plan pour l'adapter aux objets de la liste ci-dessus - + Center Centrer - + Centers the plane on the objects in the list above Centre le plan sur les objets de la liste ci-dessus @@ -4018,7 +4018,7 @@ La création du bâtiment est abandonnée. - + The shape of this object La forme de cet objet @@ -4039,7 +4039,7 @@ La création du bâtiment est abandonnée. - + The line width of this object L'épaisseur de la ligne de cet objet @@ -4616,7 +4616,7 @@ La création du bâtiment est abandonnée. Affiche les symboles des ouvertures en élévation s’ils sont disponibles - + The number of the wire that defines the hole. A value of 0 means automatic Le numéro du tracé qui définit le trou. Une valeur de 0 signifie automatique @@ -5442,7 +5442,7 @@ La création du bâtiment est abandonnée. - + The placement of this object L'emplacement de cet objet @@ -5662,79 +5662,79 @@ La création du bâtiment est abandonnée. Forme de l'armature - + The objects that must be considered by this section plane. Empty means the whole document. Les objets qui doivent être considérés par ce plan de coupe. Vide signifie l'ensemble du document. - + If false, non-solids will be cut too, with possible wrong results. Si mis à faux, les éléments non pleins seront également coupés, avec de possibles résultats erronés. - + If True, resulting views will be clipped to the section plane area. Si mis à vrai, les vues résultantes seront restreintes à la zone du plan de coupe. - + If true, the color of the objects material will be used to fill cut areas. Si mis à vrai, la couleur des objets sera utilisée pour remplir des zones coupées. - + Geometry further than this value will be cut off. Keep zero for unlimited. La géométrie située au-delà de cette valeur sera coupée. Laisser zéro pour illimité. - + The display length of this section plane La longueur d'affichage de ce plan de coupe - + The display height of this section plane La hauteur d'affichage de ce plan de coupe - + The size of the arrows of this section plane La taille des flèches de ce plan de coupe - + The transparency of this object La transparence de cet objet - - + + Show the cut in the 3D view Montrer la coupe dans la vue 3D - + The color of this object La couleur de cet objet - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) La distance entre le plan de coupe et de la vue réelle coupé (cela garde une valeur très faible mais pas nulle) - + Show the label in the 3D view Afficher le libellé dans la vue 3D - + The name of the font Le nom de la police - + The size of the text font La taille de la police de texte @@ -6560,12 +6560,12 @@ La création du bâtiment est abandonnée. Arch_SectionPlane - + Section Plane Plan de coupe - + Creates a section plane object, including the selected objects Créer un plan de coupe incluant les objets sélectionnés diff --git a/src/Mod/Arch/Resources/translations/Arch_gl.ts b/src/Mod/Arch/Resources/translations/Arch_gl.ts index 0e11c045ac..061c286c16 100644 --- a/src/Mod/Arch/Resources/translations/Arch_gl.ts +++ b/src/Mod/Arch/Resources/translations/Arch_gl.ts @@ -2411,39 +2411,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Elixir o escolmado @@ -2451,9 +2451,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Rexeitar @@ -2462,7 +2462,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Engadir @@ -2476,50 +2476,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Editar - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Compoñentes - + Create new component Create new component - + Name Nome - + Type Tipo @@ -2527,56 +2527,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Grosor - + Offset Separación - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3421,93 +3421,93 @@ Floor creation aborted. Sección - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Engadir escolma - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Centro - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4052,7 +4052,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4073,7 +4073,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4650,7 +4650,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5476,7 +5476,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5696,79 +5696,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6594,12 +6594,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_hr.ts b/src/Mod/Arch/Resources/translations/Arch_hr.ts index 24d08e5c80..c13f08fd96 100644 --- a/src/Mod/Arch/Resources/translations/Arch_hr.ts +++ b/src/Mod/Arch/Resources/translations/Arch_hr.ts @@ -2440,41 +2440,41 @@ Ako je Run = 0, tada se proračun izračunava tako da je visina jednaka relativn Visina prozorske klupčice - + This window has no defined opening Ovaj prozor nema definiran otvor - - - + + + Get selected edge Zadrži odabrani rub - + Unable to create component Nije moguće stvoriti komponentu - + Window elements Elementi prozora - + Hole wire Šuplja žica - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Broj žice ruba koji definira rupu u glavnom objektu. Vrijednost nula će automatski prihvatiti najdužu žicu ruba - + Pick selected Pokupi odabrano @@ -2482,9 +2482,9 @@ Ako je Run = 0, tada se proračun izračunava tako da je visina jednaka relativn - + - + Remove Ukloni @@ -2493,7 +2493,7 @@ Ako je Run = 0, tada se proračun izračunava tako da je visina jednaka relativn - + Add Dodaj @@ -2507,50 +2507,50 @@ Ako je Run = 0, tada se proračun izračunava tako da je visina jednaka relativn - + - + Edit Uredi - + Create/update component Napravi/osvježi komponentu - + Base 2D object Osnovni 2D objekt - - + + Wires Žice - + Components Komponente - + Create new component Izradi novu komponentu - + Name Ime - + Type Tip @@ -2558,58 +2558,58 @@ Ako je Run = 0, tada se proračun izračunava tako da je visina jednaka relativn - + Thickness Debljina - + Offset Pomak - + Hinge Šarka - + Opening mode Način otvaranja - - + + + default + zadano - + If this is checked, the default Frame value of this window will be added to the value entered here Ako je to označeno, zadana vrijednost nosača prozora će biti dodana vrijednosti upisanoj ovdje - + If this is checked, the default Offset value of this window will be added to the value entered here Ako je to označeno, zadana vrijednost pomaka prozora će biti dodana vrijednosti upisanoj ovdje - + Press to retrieve the selected edge Kliknite da biste dohvatili odabrani rub - - + + Invert opening direction Obrnuti smjer otvaranja - - + + Invert hinge position Preokrenite položaj šarke @@ -3458,93 +3458,93 @@ Stvaranje etaže prekinuto. Odjeljak - + Create Section Plane Napravi ravninu presjeka - + Toggle Cutview Uključi/isključi pogled prereza - + Section plane settings Postavke presjeka ravni - + Remove highlighted objects from the list above Ukloni istaknute objekte sa liste iznad - + Add selected Dodaj odabrano - + Add selected object(s) to the scope of this section plane Dodajte odabrane objekte u područje ovog presjeka ravni - + Objects seen by this section plane: Objekti viđeni sa ovog presjeka ravni: - + Section plane placement: Položaj presjeka ravni: - + Rotate X Rotiraj X - + Rotates the plane along the X axis Rotiraj ravninu uzduž X osi - + Rotate Y Rotiraj Y - + Rotates the plane along the Y axis Rotiraj ravninu uzduž Y osi - + Rotate Z Rotiraj Z - + Rotates the plane along the Z axis Rotiraj ravninu uzduž Z osi - + Resize Promjena veličine - + Resizes the plane to fit the objects in the list above Promijeni veličinu ravnine radi postavljanja objekata na gornji popis - + Center Središte - + Centers the plane on the objects in the list above Centrira ravninu na objekte na gornjem popisu @@ -4093,7 +4093,7 @@ Stvaranje zgrade prekinuto. - + The shape of this object Oblik ovog objekta @@ -4115,7 +4115,7 @@ Stvaranje zgrade prekinuto. - + The line width of this object Širina linije ovog objekta @@ -4710,7 +4710,7 @@ Stvaranje zgrade prekinuto. Pokažite simbole visine otvaranja ako su dostupni - + The number of the wire that defines the hole. A value of 0 means automatic Broj profila koji definiraju otvore. Vrijednost 0 je podrazumijevana @@ -5542,7 +5542,7 @@ Stvaranje zgrade prekinuto. - + The placement of this object polozaj ovih objekta @@ -5762,81 +5762,81 @@ Stvaranje zgrade prekinuto. Oblik čelične armature - + The objects that must be considered by this section plane. Empty means the whole document. Objekti koji se razmatraju po ravnini rezanja. Prazno znači čitav dokument. - + If false, non-solids will be cut too, with possible wrong results. Ako je netočno, ne krute tvari će se rezati također, s moguće lošim rezultatom. - + If True, resulting views will be clipped to the section plane area. Ako je istinito, rezultirajući pogledi bit će izrezani na područje ravnine presjeka. - + If true, the color of the objects material will be used to fill cut areas. Ako je istinito, boja predmeta materijala upotrijebit će se za popunjavanje izreznih područja. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometrija koja je veća od ove vrijednosti bit će odrezana. Zadržite nulu za neograničeno. - + The display length of this section plane Dužina prikaza ove presječne ravnine - + The display height of this section plane Visina prikaza ove presječne ravnine - + The size of the arrows of this section plane Veličina strelica ove presječne ravnine - + The transparency of this object Prozirnost ovog objekta - - + + Show the cut in the 3D view Prikaži rez u 3D pogledu - + The color of this object Boja ovog objekta - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) Udaljenost između ravnine rezanja i aktualnog pogleda rezanja (mala vrijednost ali ne nula) - + Show the label in the 3D view Prikaži oznaku u 3D pogledu - + The name of the font Ime pisma - + The size of the text font Veličina pisma teksta @@ -6666,12 +6666,12 @@ Stvaranje zgrade prekinuto. Arch_SectionPlane - + Section Plane Ravnina presjeka - + Creates a section plane object, including the selected objects Stvori objekt ravnina presjeka sa odabranim objektima diff --git a/src/Mod/Arch/Resources/translations/Arch_hu.ts b/src/Mod/Arch/Resources/translations/Arch_hu.ts index 899ec72b30..64d07ac12a 100644 --- a/src/Mod/Arch/Resources/translations/Arch_hu.ts +++ b/src/Mod/Arch/Resources/translations/Arch_hu.ts @@ -2411,39 +2411,39 @@ Ha Futás = 0, akkor a futás kiszámítása úgy történik, hogy a magasság m Könyöklő magassága - + This window has no defined opening Ennek az ablakban nincs meghatározva a nyitása - - - + + + Get selected edge Kiválasztott élt kapja - + Unable to create component Nem sikerült létrehozni egy összetevőt - + Window elements Ablak elemek - + Hole wire Drótháló furat - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire A hordozó tárgyon lévő furat meghatározásához használt drótháló száma. A nulla értékkel automatikusan a legnagyobb dróthálót fogadja el - + Pick selected Véletlenszerűen kiválasztott @@ -2451,9 +2451,9 @@ Ha Futás = 0, akkor a futás kiszámítása úgy történik, hogy a magasság m - + - + Remove Törlés @@ -2462,7 +2462,7 @@ Ha Futás = 0, akkor a futás kiszámítása úgy történik, hogy a magasság m - + Add Hozzáad @@ -2476,50 +2476,50 @@ Ha Futás = 0, akkor a futás kiszámítása úgy történik, hogy a magasság m - + - + Edit Szerkesztés - + Create/update component Létrehozni/frissíteni összetevőt - + Base 2D object Alap 2D tárgy - - + + Wires Drótvázak - + Components Összetevők - + Create new component Új összetevő létrehozásához - + Name Név - + Type Típus @@ -2527,56 +2527,56 @@ Ha Futás = 0, akkor a futás kiszámítása úgy történik, hogy a magasság m - + Thickness Vastagság - + Offset Eltolás - + Hinge Zsanér - + Opening mode Nyitás módja - - + + + default + alapértelmezett - + If this is checked, the default Frame value of this window will be added to the value entered here Ha ez be van jelölve, az ablak keret alapérték hozzáadódik az itt megadott értékhez - + If this is checked, the default Offset value of this window will be added to the value entered here Ha ez be van jelölve, az ablak eltolás alapérték hozzáadódik az itt megadott értékhez - + Press to retrieve the selected edge Nyomja meg a kiválasztott él lekéréséhez - - + + Invert opening direction Nyitásirány megfordítása - - + + Invert hinge position Zsanér pozíció megfordítása @@ -3421,93 +3421,93 @@ Szint létrehozása megszakítva. Szakasz - + Create Section Plane Szakasz sík létrehozása - + Toggle Cutview Kivágási nézet kapcsolása - + Section plane settings Metszősík beállítások - + Remove highlighted objects from the list above Kijelölt tárgyak eltávolítása a fenti listából - + Add selected Kiválasztott hozzáadása - + Add selected object(s) to the scope of this section plane Kijelölt tárgy(ak) hozzáadása a metszősík hatóköréhez - + Objects seen by this section plane: Ezzel a metszősíkkal látható tárgyak: - + Section plane placement: Metszősík elhelyezése: - + Rotate X Forgatás X - + Rotates the plane along the X axis Sík forgatása az X tengely körül - + Rotate Y Forgatás Y - + Rotates the plane along the Y axis Sík forgatása az Y tengely körül - + Rotate Z Forgatás Z - + Rotates the plane along the Z axis Sík forgatása a Z tengely körül - + Resize Átméretezés - + Resizes the plane to fit the objects in the list above Sík átméretezése a fenti listában szereplő tárgyakra - + Center Középre - + Centers the plane on the objects in the list above Sík középpontja a fenti listában szereplő tárgyakon @@ -4052,7 +4052,7 @@ Building creation aborted. - + The shape of this object Ennek a tárgynak az alakja @@ -4073,7 +4073,7 @@ Building creation aborted. - + The line width of this object Ennek a tárgynak a vonalvastagsága @@ -4650,7 +4650,7 @@ Building creation aborted. Kijelzi a magassági nyitó szintek szimbólumait, ha rendelkezésre állnak - + The number of the wire that defines the hole. A value of 0 means automatic A furatokat meghatározó dróthálók száma. A 0 érték azt jelenti, hogy automatikus @@ -5476,7 +5476,7 @@ Building creation aborted. - + The placement of this object Ennek az tárgynak az elhelyezése @@ -5696,79 +5696,79 @@ Building creation aborted. Betonacél alakja - + The objects that must be considered by this section plane. Empty means the whole document. Tárgy a metszés nézethez. Üresen hagyva az egész dokumentumot jelenti. - + If false, non-solids will be cut too, with possible wrong results. Ha hamis, nem szilárd testeket is elvág, lehetséges rossz eredménnyel. - + If True, resulting views will be clipped to the section plane area. Ha az érték Igaz, a rendszer az eredményül kapott nézeteket a metszősík területére levágja. - + If true, the color of the objects material will be used to fill cut areas. Az elemhez tartozó anyag színének használata metszeti kitöltésként. - + Geometry further than this value will be cut off. Keep zero for unlimited. Az értéknél távolabbi geometria megszakad. Tartsd nullán, akkor korlátlan. - + The display length of this section plane A metszősík megjelenítési hossza - + The display height of this section plane A metszősík megjelenítési magassága - + The size of the arrows of this section plane Metszősík nyilainak a nagysága - + The transparency of this object Ennek a tárgynak az átláthatósága - - + + Show the cut in the 3D view A vágás 3D-s nézetének megjelenítése - + The color of this object Ennek a tárgynak a színe - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) A tényleges vágás és a kivágási sík közötti távolság (hagyja nagyon kis méretűre, de ne legyen nulla) - + Show the label in the 3D view A címke megjelenítése 3D nézetben - + The name of the font Betűtípus neve - + The size of the text font A betűtípus mérete @@ -6594,12 +6594,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Rész sík - + Creates a section plane object, including the selected objects Létrehoz egy szakasz sík tárgyat, beleértve a kijelölt tárgyakat diff --git a/src/Mod/Arch/Resources/translations/Arch_id.ts b/src/Mod/Arch/Resources/translations/Arch_id.ts index d274dd71fe..a272967cc8 100644 --- a/src/Mod/Arch/Resources/translations/Arch_id.ts +++ b/src/Mod/Arch/Resources/translations/Arch_id.ts @@ -2405,39 +2405,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Pilih yang dipilih @@ -2445,9 +2445,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Menghapus @@ -2456,7 +2456,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Menambahkan @@ -2470,50 +2470,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Edit - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Komponen - + Create new component Create new component - + Name Nama - + Type Jenis @@ -2521,56 +2521,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Thickness - + Offset Mengimbangi - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3415,93 +3415,93 @@ Floor creation aborted. Bagian - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Tambahkan yang dipilih - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Pusat - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4046,7 +4046,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4067,7 +4067,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4644,7 +4644,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5470,7 +5470,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5690,79 +5690,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6588,12 +6588,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_it.ts b/src/Mod/Arch/Resources/translations/Arch_it.ts index efd5b04836..cecbb00ff1 100644 --- a/src/Mod/Arch/Resources/translations/Arch_it.ts +++ b/src/Mod/Arch/Resources/translations/Arch_it.ts @@ -2397,39 +2397,39 @@ Se Base = 0 allora la Base viene calcolata in modo che l'altezza sia la stessa d Altezza soglia - + This window has no defined opening Questa finestra non ha alcuna apertura definita - - - + + + Get selected edge Ottieni il bordo selezionato - + Unable to create component Impossibile creare il componente - + Window elements Elementi della finestra - + Hole wire Contorno del foro - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Il numero del contorno che definisce un foro nell'oggetto ospite. Il valore zero adotta automaticamente il contorno più grande - + Pick selected Usa selezionata @@ -2437,9 +2437,9 @@ Se Base = 0 allora la Base viene calcolata in modo che l'altezza sia la stessa d - + - + Remove Rimuovi @@ -2448,7 +2448,7 @@ Se Base = 0 allora la Base viene calcolata in modo che l'altezza sia la stessa d - + Add Aggiungi @@ -2462,50 +2462,50 @@ Se Base = 0 allora la Base viene calcolata in modo che l'altezza sia la stessa d - + - + Edit Modifica - + Create/update component Crea/aggiorna componente - + Base 2D object Oggetto 2D di base - - + + Wires Polilinee - + Components Componenti - + Create new component Crea un nuovo componente - + Name Nome - + Type Tipo @@ -2513,56 +2513,56 @@ Se Base = 0 allora la Base viene calcolata in modo che l'altezza sia la stessa d - + Thickness Spessore - + Offset Offset - + Hinge Cerniera - + Opening mode Modalità di apertura - - + + + default + predefinito - + If this is checked, the default Frame value of this window will be added to the value entered here Se è selezionato, il valore Frame predefinito di questa finestra viene aggiunto al valore inserito qui - + If this is checked, the default Offset value of this window will be added to the value entered here Se è selezionato, il valore Offset predefinito di questa finestra viene aggiunto al valore inserito qui - + Press to retrieve the selected edge Premere per recuperare il bordo selezionato - - + + Invert opening direction Inverti direzione di apertura - - + + Invert hinge position Inverti posizione cerniera @@ -3407,93 +3407,93 @@ Creazione del Piano interrotta. Seziona - + Create Section Plane Crea Piano di Sezione - + Toggle Cutview Toggle Cutview - + Section plane settings Impostazioni piano sezione - + Remove highlighted objects from the list above Rimuovi gli oggetti evidenziati dalla lista precedente - + Add selected Aggiungi selezionato - + Add selected object(s) to the scope of this section plane Aggiungi oggetto(i) selezionato(i) allo spazio di questo piano sezione - + Objects seen by this section plane: Oggetti visti da questo piano di sezione: - + Section plane placement: Posizione del piano di sezione: - + Rotate X Ruota X - + Rotates the plane along the X axis Ruota il piano lungo l'asse X - + Rotate Y Ruota Y - + Rotates the plane along the Y axis Ruota il piano lungo l'asse Y - + Rotate Z Ruota Z - + Rotates the plane along the Z axis Ruota il piano lungo l'asse Z - + Resize Ridimensiona - + Resizes the plane to fit the objects in the list above Ridimensiona il piano per adattare gli oggetti nella lista precedente - + Center Centro - + Centers the plane on the objects in the list above Centra il piano sugli oggetti nella lista precedente @@ -4038,7 +4038,7 @@ Creazione Edificio interrotta. - + The shape of this object La forma di questo oggetto @@ -4059,7 +4059,7 @@ Creazione Edificio interrotta. - + The line width of this object Lo spessore della linea di questo oggetto @@ -4636,7 +4636,7 @@ Creazione Edificio interrotta. Mostra i simboli di apertura di elevazione se possibile - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5462,7 +5462,7 @@ Creazione Edificio interrotta. - + The placement of this object Il posizionamento di questo oggetto @@ -5682,79 +5682,79 @@ Creazione Edificio interrotta. Forma del tondino - + The objects that must be considered by this section plane. Empty means the whole document. Gli oggetti che devono essere considerati da questo piano di sezione. Vuoto significa tutto il documento. - + If false, non-solids will be cut too, with possible wrong results. Se falso, verranno tagliati anche i non solidi, con possibili risultati sbagliati. - + If True, resulting views will be clipped to the section plane area. Se vero, le visualizzazioni risultanti verranno ritagliate nell'area di piano della sezione. - + If true, the color of the objects material will be used to fill cut areas. Se vero, il colore del materiale degli oggetti verrà utilizzato per riempire le aree tagliate. - + Geometry further than this value will be cut off. Keep zero for unlimited. La geometria oltre a questo valore verrà tagliata. Mantieni zero per un valore illimitato. - + The display length of this section plane La lunghezza di visualizzazione di questo piano di sezione - + The display height of this section plane L'altezza di visualizzazione di questo piano di sezione - + The size of the arrows of this section plane La dimensione delle frecce di questo piano di sezione - + The transparency of this object La trasparenza di questo oggetto - - + + Show the cut in the 3D view Mostra il taglio nella vista 3D - + The color of this object Il colore di questo oggetto - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) La distanza tra il piano di taglio e la vista di taglio attuale (tenere questo un valore molto piccolo ma non zero) - + Show the label in the 3D view Mostra l'etichetta nella vista 3D - + The name of the font Il nome del carattere - + The size of the text font La dimensione del carattere di testo @@ -6580,12 +6580,12 @@ Creazione Edificio interrotta. Arch_SectionPlane - + Section Plane Piano di sezione - + Creates a section plane object, including the selected objects Crea un oggetto piano di sezione, includendo gli oggetti selezionati diff --git a/src/Mod/Arch/Resources/translations/Arch_ja.ts b/src/Mod/Arch/Resources/translations/Arch_ja.ts index 40a7711cab..36575c2a3b 100644 --- a/src/Mod/Arch/Resources/translations/Arch_ja.ts +++ b/src/Mod/Arch/Resources/translations/Arch_ja.ts @@ -2396,39 +2396,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected ピック選択 @@ -2436,9 +2436,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove 削除 @@ -2447,7 +2447,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add 追加 @@ -2461,50 +2461,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit 編集 - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components コンポーネント - + Create new component Create new component - + Name 名前 - + Type タイプ @@ -2512,56 +2512,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness 厚み - + Offset オフセット - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3406,93 +3406,93 @@ Floor creation aborted. セクション - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected 選択追加 - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center 中心 - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4037,7 +4037,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4058,7 +4058,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4635,7 +4635,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5461,7 +5461,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5681,79 +5681,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6579,12 +6579,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_ka.ts b/src/Mod/Arch/Resources/translations/Arch_ka.ts index 8a1ddd9b9d..35746104c8 100644 --- a/src/Mod/Arch/Resources/translations/Arch_ka.ts +++ b/src/Mod/Arch/Resources/translations/Arch_ka.ts @@ -2394,39 +2394,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela რაფის სიმაღლე - + This window has no defined opening ამ ფანჯარას არ გააჩნია განსაზღვრული ღიობი - - - + + + Get selected edge მონიშნული წიბოს მიღება - + Unable to create component კომპონენტის შექმნა შეუძლებელია - + Window elements ფანჯრის ელემენტები - + Hole wire ნახვრეტის პოლიხაზი - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire პოლიხაზების რაოდენობა, რომელიც განსაზღვრავს ხვრელს მასპინძელ ობიექტში. ნულის მნიშვნელობა ავტომატურად მიიღებს ყველაზე დიდ პოლიხაზს - + Pick selected მონიშნულის არჩევა @@ -2434,9 +2434,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove წაშლა @@ -2445,7 +2445,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add დამატება @@ -2459,50 +2459,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit ჩასწორება - + Create/update component კომპონენტის შექმნა/განახლება - + Base 2D object ბაზის 2D ობიექტი - - + + Wires პოლიხაზები - + Components კომპონენტები - + Create new component ახალი კომპონენტის შექმნა - + Name სახელი - + Type ტიპი @@ -2510,56 +2510,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness სისქე - + Offset წანაცვლება - + Hinge ანჯამა - + Opening mode გახსნის რეჟიმი - - + + + default + ნაგულისხმევი - + If this is checked, the default Frame value of this window will be added to the value entered here თუ ჩართულია, ამ ფანჯრის ნაგულისხმევი ჩარჩოს მნიშვნელობას დაემატება აქ მითითებული მნიშვნელობა - + If this is checked, the default Offset value of this window will be added to the value entered here თუ ეს ჩართულია, ამ ფანჯრის ნაგულისხმევი წანაცვლების მნიშვნელობას დაემატება აქ მითითებული მნიშვნელობა - + Press to retrieve the selected edge მონიშნული წიბოს მისაღებად დააწკაპუნეთ - - + + Invert opening direction ღიობის მიმართულების შებრუნება - - + + Invert hinge position ანჯამის მდებარეობის ამოყირავება @@ -3404,93 +3404,93 @@ Floor creation aborted. სექცია - + Create Section Plane ჭრილის შექმნა - + Toggle Cutview ჭრილის ხედის გადართვა - + Section plane settings ჭრილის მორგება - + Remove highlighted objects from the list above ამოიღეთ მონიშნული ობიექტები ზემოთ მოცემული სიიდან - + Add selected ყველა მონიშნული - + Add selected object(s) to the scope of this section plane მონიშნული ობიექტ(ებ)-ის ამ სექციის სიბრტყის კვეთის საზღვრებში ჩამატება - + Objects seen by this section plane: ობიექტების სია, რომლებიც ამ ჭრილიდან მოჩანს: - + Section plane placement: ჭრილის მდებარეობა: - + Rotate X შებრუნება X - + Rotates the plane along the X axis სიბრტყის X ღერძის გარშემო შემობრუნება - + Rotate Y შებრუნება Y - + Rotates the plane along the Y axis სიბრტყის Y ღერძის გარშემო შემობრუნება - + Rotate Z შებრუნება Z - + Rotates the plane along the Z axis სიბრტყის Z ღერძის გარშემო შემობრუნება - + Resize ზომის შეცვლა - + Resizes the plane to fit the objects in the list above სიბრტყის ზომის შეცვლა ზემოთ ჩამოთვლილ ობიექტებში ჩასატევად - + Center ცენტრი - + Centers the plane on the objects in the list above სიბრტყის ზემოთ მოცემულ სიაში არსებულ ობიექტებზე დაცენტრება @@ -4035,7 +4035,7 @@ Building creation aborted. - + The shape of this object ამ ობიექტის ფორმა @@ -4056,7 +4056,7 @@ Building creation aborted. - + The line width of this object ამ ობიექტის ხაზის სიგანე @@ -4639,7 +4639,7 @@ Building creation aborted. მათი არსებობის შემთხვევაში სიმაღლის ღიობების სიმბოლოების ჩვენება - + The number of the wire that defines the hole. A value of 0 means automatic პოლიხაზების რაოდენობა, რომელიც განსაზღვრავს ხვრელს. მნიშვნელობა 0 ნიშნავს ავტომატურს @@ -5465,7 +5465,7 @@ Building creation aborted. - + The placement of this object ობიექტის განლაგება @@ -5685,79 +5685,79 @@ Building creation aborted. არმატურის ფორმა - + The objects that must be considered by this section plane. Empty means the whole document. ობიექტები, რომლებიც უნდა ჩანდეს ამ სიბრტყით კვეთაში. ცარიელი ნიშნავს მთელ დოკუმენტს. - + If false, non-solids will be cut too, with possible wrong results. თუ გამორთულია, არა-მყარი სხეულებიც გაიკვეთება, შესაძლო არასწორი შედეგებით. - + If True, resulting views will be clipped to the section plane area. თუ ჩართულია, ნაჩვენები ხედები სექციის სიბრტყეში ამოიჭრება. - + If true, the color of the objects material will be used to fill cut areas. თუ ჩართულია, ობიექტის მასალის ფერი გამოყენებული იქნება კვეთების შესავსებად. - + Geometry further than this value will be cut off. Keep zero for unlimited. ამ წერტილის შემდეგ არსებული გეომეტრია მოიჭრება. ულიმიტო ჭრისთვის დატოვეთ ნულოვანი. - + The display length of this section plane ამ სიბრტყის კვეთის სიგრძის ჩვენება - + The display height of this section plane ამ სიბრტყის კვეთის სიმაღლის ჩვენება - + The size of the arrows of this section plane ამ ჭრილში ისრების ზომა - + The transparency of this object ამ ობიექტის გამჭვირვალობა - - + + Show the cut in the 3D view კვეთის 3D ხედში ჩვენება - + The color of this object ამ ობიექტის ფერი - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) მანძილი სიბრტყის კვეთასა და ნამდვილ სიბრტყის კვეთას შორის (გქონდეთ ძალიან მცირე მნიშვნელობა, მაგრამ არა ნული) - + Show the label in the 3D view ჭდის 3D ხედში ჩვენება - + The name of the font ფონტის სახელი - + The size of the text font ფონტის ზომა @@ -6583,12 +6583,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane ჭრილი - + Creates a section plane object, including the selected objects ქმნის სიბრტყით კვეთის ობიექტს მონიშნული ობიექტების ჩათვლით diff --git a/src/Mod/Arch/Resources/translations/Arch_ko.ts b/src/Mod/Arch/Resources/translations/Arch_ko.ts index bec959d7a9..d2441aaf97 100644 --- a/src/Mod/Arch/Resources/translations/Arch_ko.ts +++ b/src/Mod/Arch/Resources/translations/Arch_ko.ts @@ -2411,39 +2411,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected 선택 @@ -2451,9 +2451,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove 제거 @@ -2462,7 +2462,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add 추가하기 @@ -2476,50 +2476,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit 편집 - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Components - + Create new component Create new component - + Name 이름 - + Type 유형 @@ -2527,56 +2527,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness 두께 - + Offset 오프셋 - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3421,93 +3421,93 @@ Floor creation aborted. 단면 - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected 선택한 항목 추가 - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center 센터 - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4052,7 +4052,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4073,7 +4073,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4650,7 +4650,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5476,7 +5476,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5696,79 +5696,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6594,12 +6594,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_nl.ts b/src/Mod/Arch/Resources/translations/Arch_nl.ts index 1149320759..f62b1b81d2 100644 --- a/src/Mod/Arch/Resources/translations/Arch_nl.ts +++ b/src/Mod/Arch/Resources/translations/Arch_nl.ts @@ -2404,39 +2404,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening Dit raam heeft geen gedefiniëerde opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Kies geselecteerde @@ -2444,9 +2444,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Verwijderen @@ -2455,7 +2455,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Toevoegen @@ -2469,50 +2469,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Bewerken - + Create/update component Maak/update onderdeel - + Base 2D object Base 2D object - - + + Wires Draden - + Components Onderdelen - + Create new component Maak een nieuw onderdeel - + Name Naam - + Type Type @@ -2520,56 +2520,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Dikte - + Offset Verschuiving - + Hinge Hinge - + Opening mode Opening mode - - + + + default + standaard - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3414,93 +3414,93 @@ Floor creation aborted. Deel - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Voeg geselecteerde toe - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotatie X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotatie Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotatie Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Formaat wijzigen - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Middelpunt - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4045,7 +4045,7 @@ Building creation aborted. - + The shape of this object De vorm van dit object @@ -4066,7 +4066,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4643,7 +4643,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5469,7 +5469,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5689,79 +5689,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object De kleur van dit object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font De naam van het lettertype - + The size of the text font De grootte van het lettertype @@ -6587,12 +6587,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_pl.ts b/src/Mod/Arch/Resources/translations/Arch_pl.ts index 06883c2367..8ffe5e3e79 100644 --- a/src/Mod/Arch/Resources/translations/Arch_pl.ts +++ b/src/Mod/Arch/Resources/translations/Arch_pl.ts @@ -2421,39 +2421,39 @@ Jeśli Rozpiętość = 0, wówczas Rozpiętość jest obliczana tak, aby wysoko Wysokość parapetu - + This window has no defined opening To okno nie ma określonego sposobu otwierania - - - + + + Get selected edge Pobierz wybraną krawędź - + Unable to create component Nie można utworzyć komponentu - + Window elements Elementy okna - + Hole wire Szkielet otworu - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Numer polilinii definiującej otwór w obiekcie nadrzędnym. Wartość zero automatycznie przyjmie najdłuższą polilinię - + Pick selected Wybierz zaznaczone @@ -2461,9 +2461,9 @@ Jeśli Rozpiętość = 0, wówczas Rozpiętość jest obliczana tak, aby wysoko - + - + Remove Usuń @@ -2472,7 +2472,7 @@ Jeśli Rozpiętość = 0, wówczas Rozpiętość jest obliczana tak, aby wysoko - + Add Dodaj @@ -2486,50 +2486,50 @@ Jeśli Rozpiętość = 0, wówczas Rozpiętość jest obliczana tak, aby wysoko - + - + Edit Edytuj - + Create/update component Utwórz/uaktualnij komponent - + Base 2D object Podstawowy obiekt 2D - - + + Wires Polilinie - + Components Komponenty - + Create new component Utwórz nowy komponent - + Name Nazwa - + Type Typ @@ -2537,56 +2537,56 @@ Jeśli Rozpiętość = 0, wówczas Rozpiętość jest obliczana tak, aby wysoko - + Thickness Grubość - + Offset Odsunięcie - + Hinge Zawias - + Opening mode Rodzaj otwierania - - + + + default + domyślny - + If this is checked, the default Frame value of this window will be added to the value entered here Jeśli to pole jest zaznaczone, domyślna wartość ramki dla tego okna zostanie dodana do wartości wprowadzonej tutaj - + If this is checked, the default Offset value of this window will be added to the value entered here Jeśli to pole jest zaznaczone, domyślna wartość odsunięcia tego okna zostanie dodana do wartości wprowadzonej tutaj - + Press to retrieve the selected edge Naciśnij, aby odzyskać wybraną krawędź - - + + Invert opening direction Odwróć kierunek otwierania - - + + Invert hinge position Odwróć pozycję zawiasów @@ -3431,93 +3431,93 @@ Tworzenie piętra zostało przerwane. Przekrój - + Create Section Plane Utwórz płaszczyznę przekroju - + Toggle Cutview Przełącz przekrój - + Section plane settings Ustawienia płaszczyzny przekroju - + Remove highlighted objects from the list above Usuń podświetlone obiekty z powyższej listy - + Add selected Dodaj zaznaczone - + Add selected object(s) to the scope of this section plane Dodaj wybrany obiekt(y) do zakresu tej płaszczyzny sekcji - + Objects seen by this section plane: Obiekty widoczene w tej płaszczyźnie przekroju: - + Section plane placement: Umiejscowienie płaszczyzny przekroju: - + Rotate X Obróć X - + Rotates the plane along the X axis Obraca płaszczyznę wokół osi X - + Rotate Y Obróć Y - + Rotates the plane along the Y axis Obraca płaszczyznę wokół osi Y - + Rotate Z Obróć Z - + Rotates the plane along the Z axis Obraca płaszczyznę wokół osi Z - + Resize Zmień rozmiar - + Resizes the plane to fit the objects in the list above Zmień rozmiar płaszczyzny, aby dopasować obiekty z powyższej listy - + Center Środek - + Centers the plane on the objects in the list above Wyśrodkuje płaszczyznę na obiektach znajdujących się powyżej @@ -4062,7 +4062,7 @@ Tworzenie budynku zostało przerwane. - + The shape of this object Kształt tego obiektu @@ -4083,7 +4083,7 @@ Tworzenie budynku zostało przerwane. - + The line width of this object Szerokość linii tego obiektu @@ -4660,7 +4660,7 @@ Tworzenie budynku zostało przerwane. Wyświetl symbole pokazujące rzędne, jeśli są dostępne - + The number of the wire that defines the hole. A value of 0 means automatic Numer polilinii definiującej otwór. Wartość 0 oznacza automatyczny @@ -5486,7 +5486,7 @@ Tworzenie budynku zostało przerwane. - + The placement of this object Położenie tego obiektu @@ -5706,79 +5706,79 @@ Tworzenie budynku zostało przerwane. Kształt zbrojenia - + The objects that must be considered by this section plane. Empty means the whole document. Obiekty, które muszą być wzięte pod uwagę w tej płaszczyźnie przekroju. Wartość pusta oznacza cały dokument. - + If false, non-solids will be cut too, with possible wrong results. Jeśli ma wartość Fałsz, obiekty bez brył też będą cięte, z możliwością pojawienia się błędów. - + If True, resulting views will be clipped to the section plane area. Jeśli ma wartość Prawda, wynikowe widoki zostaną przycięte do obszaru płaszczyzny przekroju. - + If true, the color of the objects material will be used to fill cut areas. Jeśli parametr ma wartość Prawda, kolor materiału obiektu zostanie użyty do wypełnienia powierzchni przekroju. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometria znajdująca się dalej niż ta wartość zostanie przycięta. Zachowaj zero dla braku ograniczeń. - + The display length of this section plane Wyświetlana długość tej płaszczyzny przekroju - + The display height of this section plane Wyświetlana wysokość tej płaszczyzny przekroju - + The size of the arrows of this section plane Rozmiar strzałek tej płaszczyzny przekroju - + The transparency of this object Przezroczystość tego obiektu - - + + Show the cut in the 3D view Pokaż linię cięcia w oknie widoku 3D - + The color of this object Kolor tego obiektu - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) Odległość między płaszczyzną cięcia i rzeczywistym widokiem cięcia (zachowaj bardzo małą wartość, ale nie zerową) - + Show the label in the 3D view Pokaż etykietę w oknie widoku 3D - + The name of the font Nazwa czcionki - + The size of the text font Rozmiar czcionki @@ -6604,12 +6604,12 @@ Tworzenie budynku zostało przerwane. Arch_SectionPlane - + Section Plane Płaszczyzna przekroju - + Creates a section plane object, including the selected objects Tworzy obiekt płaszczyzny przekroju, zawierający wybrane obiekty diff --git a/src/Mod/Arch/Resources/translations/Arch_pt-BR.qm b/src/Mod/Arch/Resources/translations/Arch_pt-BR.qm index d5f6d3763f..fc030aeb00 100644 Binary files a/src/Mod/Arch/Resources/translations/Arch_pt-BR.qm and b/src/Mod/Arch/Resources/translations/Arch_pt-BR.qm differ diff --git a/src/Mod/Arch/Resources/translations/Arch_pt-BR.ts b/src/Mod/Arch/Resources/translations/Arch_pt-BR.ts index 787d77eb06..a4582dcac2 100644 --- a/src/Mod/Arch/Resources/translations/Arch_pt-BR.ts +++ b/src/Mod/Arch/Resources/translations/Arch_pt-BR.ts @@ -2383,39 +2383,39 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per Altura do peitoril - + This window has no defined opening Essa janela não tem abertura definida - - - + + + Get selected edge Usar a aresta selecionada - + Unable to create component Não é possível criar componente - + Window elements Elementos da janela - + Hole wire Arame para o furo - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire O número do arame que define um furo no objeto hospedeiro. Um valor de zero selecionará automaticamente o maior arame - + Pick selected Usar seleção @@ -2423,9 +2423,9 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per - + - + Remove Remover @@ -2434,7 +2434,7 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per - + Add Adicionar @@ -2448,50 +2448,50 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per - + - + Edit Editar - + Create/update component Criar/atualizar um componente - + Base 2D object Objeto base 2D - - + + Wires Arames - + Components Componentes - + Create new component Criar um novo componente - + Name Nome - + Type Tipo @@ -2499,56 +2499,56 @@ Se a extensão = 0, ela será calculada de modo que a altura seja a mesma do per - + Thickness Espessura - + Offset Deslocamento - + Hinge Dobradiça - + Opening mode Modo de abertura - - + + + default + padrão - + If this is checked, the default Frame value of this window will be added to the value entered here Se isto estiver marcado, o valor padrão do quadro desta janela será adicionado ao valor inserido aqui - + If this is checked, the default Offset value of this window will be added to the value entered here Se isto estiver marcado, o valor de deslocamento padrão desta janela será adicionado ao valor inserido aqui - + Press to retrieve the selected edge Pressione para recuperar a aresta selecionada - - + + Invert opening direction Inverter direção de abertura - - + + Invert hinge position Inverter posição da articulação @@ -3385,93 +3385,93 @@ Floor creation aborted. Seção - + Create Section Plane Criar um plano de corte - + Toggle Cutview Alternar Vista de Corte - + Section plane settings Configurações do plano de corte - + Remove highlighted objects from the list above Remover objetos destacados da lista acima - + Add selected Adicionar selecionados - + Add selected object(s) to the scope of this section plane Adicionar objeto(s) selecionado(s) ao escopo deste plano de secção - + Objects seen by this section plane: Objetos vistos por este plano de corte: - + Section plane placement: Localização deste plano de corte: - + Rotate X Rotação X - + Rotates the plane along the X axis Rotacionar o plano ao longo do eixo X - + Rotate Y Rotação Y - + Rotates the plane along the Y axis Rotacionar o plano ao longo do eixo Y - + Rotate Z Rotação Z - + Rotates the plane along the Z axis Rotacionar o plano ao longo do eixo Z - + Resize Redimensionar - + Resizes the plane to fit the objects in the list above Redimensiona o plano para que os objetos da lista acima caibam - + Center Centro - + Centers the plane on the objects in the list above Centraliza o plano na lista de objetos acima @@ -4010,7 +4010,7 @@ Criação de edifício abortada. - + The shape of this object A forma deste objeto @@ -4031,7 +4031,7 @@ Criação de edifício abortada. - + The line width of this object A largura da linha deste objeto @@ -4545,17 +4545,17 @@ Criação de edifício abortada. The width of this window - The width of this window + A largura desta janela The height of this window - The height of this window + A altura desta janela The normal direction of this window - The normal direction of this window + A direção normal desta janela @@ -4608,7 +4608,7 @@ Criação de edifício abortada. Mostra símbolos de abertura em elevação se disponível - + The number of the wire that defines the hole. A value of 0 means automatic O número do arame que define o furo. Um valor de 0 significa automática @@ -5434,7 +5434,7 @@ Criação de edifício abortada. - + The placement of this object The placement of this object @@ -5654,79 +5654,79 @@ Criação de edifício abortada. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6552,12 +6552,12 @@ Criação de edifício abortada. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_pt-PT.ts b/src/Mod/Arch/Resources/translations/Arch_pt-PT.ts index 6d2a51a934..dbe693f82c 100644 --- a/src/Mod/Arch/Resources/translations/Arch_pt-PT.ts +++ b/src/Mod/Arch/Resources/translations/Arch_pt-PT.ts @@ -2403,39 +2403,39 @@ Se executar = 0, então a execução é calculada de modo que a altura seja a me Altura do peitoril - + This window has no defined opening Essa janela não tem abertura definida - - - + + + Get selected edge Usar aresta selecionada - + Unable to create component Não é possível criar componente - + Window elements Elementos da janela - + Hole wire Fio de buraco - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire O número do traço que define um furo no objeto. Um valor de zero selecionará automaticamente o traço maior - + Pick selected Usar seleção @@ -2443,9 +2443,9 @@ Se executar = 0, então a execução é calculada de modo que a altura seja a me - + - + Remove Remover @@ -2454,7 +2454,7 @@ Se executar = 0, então a execução é calculada de modo que a altura seja a me - + Add Adicionar @@ -2468,50 +2468,50 @@ Se executar = 0, então a execução é calculada de modo que a altura seja a me - + - + Edit Editar - + Create/update component Criar/atualizar componente - + Base 2D object Objeto base 2D - - + + Wires Wires - + Components Componentes - + Create new component Criar novo componente - + Name Nome - + Type Tipo @@ -2519,56 +2519,56 @@ Se executar = 0, então a execução é calculada de modo que a altura seja a me - + Thickness Espessura - + Offset Deslocamento paralelo - + Hinge Hinge - + Opening mode Modo de abertura - - + + + default + padrão - + If this is checked, the default Frame value of this window will be added to the value entered here Se isto estiver marcado, o valor padrão da moldura desta janela será adicionado ao valor inserido aqui - + If this is checked, the default Offset value of this window will be added to the value entered here Se isto estiver marcado, o valor de deslocamento padrão desta janela será adicionado ao valor inserido aqui - + Press to retrieve the selected edge Pressione para recuperar a aresta selecionada - - + + Invert opening direction Inverter direção de abertura - - + + Invert hinge position Invert hinge position @@ -3413,93 +3413,93 @@ Criação de piso abortada. Secção - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Adicionar selecionados - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Centro - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4044,7 +4044,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4065,7 +4065,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4642,7 +4642,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5468,7 +5468,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5688,79 +5688,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6586,12 +6586,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_ro.ts b/src/Mod/Arch/Resources/translations/Arch_ro.ts index c902386970..fd8fde808b 100644 --- a/src/Mod/Arch/Resources/translations/Arch_ro.ts +++ b/src/Mod/Arch/Resources/translations/Arch_ro.ts @@ -2410,39 +2410,39 @@ Dacă rulează = 0, atunci rularea este calculată astfel încât înălțimea s Înălțime de umplere - + This window has no defined opening Această fereastră nu are o deschidere definită - - - + + + Get selected edge Obține marginea selectată - + Unable to create component Imposibil de creat componenta - + Window elements Elemente fereastră - + Hole wire Gaura firului - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Numărul de fir care defineşte o gaură în obiectul gazdă. O valoare de zero va adopta automat firul cel mai mare - + Pick selected Choix sélectionné @@ -2450,9 +2450,9 @@ Dacă rulează = 0, atunci rularea este calculată astfel încât înălțimea s - + - + Remove Elimină @@ -2461,7 +2461,7 @@ Dacă rulează = 0, atunci rularea este calculată astfel încât înălțimea s - + Add Adaugă @@ -2475,50 +2475,50 @@ Dacă rulează = 0, atunci rularea este calculată astfel încât înălțimea s - + - + Edit Editare - + Create/update component Crează/actualizează componenta - + Base 2D object Obiectul 2D de bază - - + + Wires Fir - + Components Componente - + Create new component Creează o componentă nouă - + Name Nume - + Type Tip @@ -2526,56 +2526,56 @@ Dacă rulează = 0, atunci rularea este calculată astfel încât înălțimea s - + Thickness Grosime - + Offset Compensare - + Hinge Balama - + Opening mode Mod de deschidere - - + + + default + implicit - + If this is checked, the default Frame value of this window will be added to the value entered here În cazul în care acest lucru este verificat, valoarea de cadru implicită a acestei ferestre va fi adăugată la valoarea introdusă aici - + If this is checked, the default Offset value of this window will be added to the value entered here În cazul în care acest lucru este bifat, valoarea implicită Offset a acestei ferestre va fi adăugată la valoarea introdusă aici - + Press to retrieve the selected edge Apăsați pentru a prelua marginea selectată - - + + Invert opening direction Inversează direcția de zoom - - + + Invert hinge position Inverseaza pozitia balamalei @@ -3420,93 +3420,93 @@ Crearea etajelor a fost întreruptă. Secţiune - + Create Section Plane Creați planul de secțiune - + Toggle Cutview Comută Cutview - + Section plane settings Setări plan secţiune - + Remove highlighted objects from the list above Elimină obiectele evidențiate din lista de mai sus - + Add selected Adaugă Selecția - + Add selected object(s) to the scope of this section plane Adăugați obiectul/obiectele selectate la domeniul de aplicare al acestui plan de secțiune - + Objects seen by this section plane: Obiecte vizualizate în acest plan de secțiune: - + Section plane placement: Amplasare plan de secțiune: - + Rotate X Rotire X - + Rotates the plane along the X axis Rotește planul de-a lungul axei X - + Rotate Y Rotire Y - + Rotates the plane along the Y axis Rotește planul de-a lungul axei Y - + Rotate Z Rotire Z - + Rotates the plane along the Z axis Rotește planul de-a lungul axei Z - + Resize Redimensionare - + Resizes the plane to fit the objects in the list above Redimensionează planul pentru a se potrivi obiectelor din lista de mai sus - + Center Centru - + Centers the plane on the objects in the list above Centrează planul pe obiectele din lista de mai sus @@ -4051,7 +4051,7 @@ Crearea de construcții a fost întreruptă. - + The shape of this object Forma acestui obiect @@ -4072,7 +4072,7 @@ Crearea de construcții a fost întreruptă. - + The line width of this object Lățimea liniei acestui obiect @@ -4649,7 +4649,7 @@ Crearea de construcții a fost întreruptă. Arată simbolurile de deschidere a planului dacă este disponibil - + The number of the wire that defines the hole. A value of 0 means automatic Numărul de fir care definește gaura. O valoare de 0 înseamnă automat @@ -5475,7 +5475,7 @@ Crearea de construcții a fost întreruptă. - + The placement of this object Plasarea acestui obiect @@ -5695,79 +5695,79 @@ Crearea de construcții a fost întreruptă. Forma de bară - + The objects that must be considered by this section plane. Empty means the whole document. Obiectele care trebuie luate în considerare de acest plan de secțiune. Golire înseamnă tot documentul. - + If false, non-solids will be cut too, with possible wrong results. Dacă sunt false, non-solide vor fi tăiate, de asemenea, cu posibile rezultate greșite. - + If True, resulting views will be clipped to the section plane area. Dacă este adevărat, vizualizările rezultate vor fi oprite în zona planului de secțiune. - + If true, the color of the objects material will be used to fill cut areas. Dacă este adevărat, culoarea materialului obiectelor va fi folosit pentru a umple zonele de tăiere. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometria va fi întreruptă mai mult decât această valoare. Păstrați zero pentru nelimitat. - + The display length of this section plane Lungimea de afişare a acestui plan de secţiune - + The display height of this section plane Înălțimea de afișare a acestui plan de secțiune - + The size of the arrows of this section plane Dimensiunea săgeţilor acestui plan de secţiune - + The transparency of this object Transparența acestui obiect - - + + Show the cut in the 3D view Arată tăietura în vizualizarea 3D - + The color of this object Culoarea acestui obiect - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) Distanța dintre planul de tăiere și punctul de vedere real (păstrează o valoare foarte mică, dar nu zero) - + Show the label in the 3D view Arată eticheta în vizualizarea 3D - + The name of the font Numele fontului - + The size of the text font Dimensiunea fontului de text @@ -6593,12 +6593,12 @@ Crearea de construcții a fost întreruptă. Arch_SectionPlane - + Section Plane Plan de secțiune - + Creates a section plane object, including the selected objects Creează un obiect secţiune plan de obiect, inclusiv obiectele selectate diff --git a/src/Mod/Arch/Resources/translations/Arch_ru.ts b/src/Mod/Arch/Resources/translations/Arch_ru.ts index 36f043a0dd..62d06e94b0 100644 --- a/src/Mod/Arch/Resources/translations/Arch_ru.ts +++ b/src/Mod/Arch/Resources/translations/Arch_ru.ts @@ -2389,39 +2389,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Высота подоконника - + This window has no defined opening Это окно не имеет определённого проёма - - - + + + Get selected edge Выбрать край - + Unable to create component Невозможно создать компонент - + Window elements Элементы окна - + Hole wire Направляющая отверстия - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Число направляющих, которое определяет отверстие в основном объекте. При нулевом значении автоматически принимается самая большая направляющая - + Pick selected Указать выбранное @@ -2429,9 +2429,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Удалить @@ -2440,7 +2440,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Добавить @@ -2454,50 +2454,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Редактировать - + Create/update component Создать/обновить компонент - + Base 2D object Базовый 2D-объект - - + + Wires Направляющие - + Components Компоненты - + Create new component Создать новый компонент - + Name Название - + Type Тип @@ -2505,56 +2505,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Толщина - + Offset Смещение - + Hinge Петли - + Opening mode Способ открывания - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here Если этот флажок установлен, для этого окна будут добавлены значения рамы по умолчанию к введенному здесь значению - + If this is checked, the default Offset value of this window will be added to the value entered here Если флажок установлен, для этого окна будут добавлены значения смещения по умолчанию к введённому здесь значению - + Press to retrieve the selected edge Нажмите, чтобы поставить выделенный край - - + + Invert opening direction Обратить направление открытия - - + + Invert hinge position Обратить положение петель @@ -3399,93 +3399,93 @@ Floor creation aborted. Разрез (Сечение) - + Create Section Plane Создайте секущую плоскость - + Toggle Cutview Переключить вид (сечения) - + Section plane settings Настройки плоскости сечения - + Remove highlighted objects from the list above Удалите выделенные объекты из списка выше - + Add selected Добавить выбранное - + Add selected object(s) to the scope of this section plane Добавить выбранный объект(ы) в область этой плоскости сечения - + Objects seen by this section plane: Объекты, видимые этой плоскостью сечения: - + Section plane placement: Размещение плоскости сечения: - + Rotate X Повернуть по X - + Rotates the plane along the X axis Поворачивает плоскость вдоль оси X - + Rotate Y Повернуть по Y - + Rotates the plane along the Y axis Поворачивает плоскость вдоль оси Y - + Rotate Z Повернуть по Z - + Rotates the plane along the Z axis Поворачивает плоскость вдоль оси Z - + Resize Изменить размер - + Resizes the plane to fit the objects in the list above Изменяет плоскость по размеру объектов в списке - + Center Центр - + Centers the plane on the objects in the list above Центровать плоскость по объектам в списке @@ -4030,7 +4030,7 @@ Building creation aborted. - + The shape of this object Форма этого объекта @@ -4051,7 +4051,7 @@ Building creation aborted. - + The line width of this object Ширина линий этого объекта @@ -4628,7 +4628,7 @@ Building creation aborted. Показать символы показа фасада, если они доступны - + The number of the wire that defines the hole. A value of 0 means automatic Номер направляющей, определяющей отверстие. Значение 0 означает автоматическое @@ -5454,7 +5454,7 @@ Building creation aborted. - + The placement of this object Размещение объекта @@ -5674,79 +5674,79 @@ Building creation aborted. Форма арматуры - + The objects that must be considered by this section plane. Empty means the whole document. Объекты, которые должны быть видны на этой плоскости сечения. Пустой означает весь документ. - + If false, non-solids will be cut too, with possible wrong results. Если ложь, также будет сделано сечение нетвердотельных объектов. Возможно, с некорректным результатом. - + If True, resulting views will be clipped to the section plane area. Если True, то отображенные виды будут вырезаны в плоскость секции. - + If true, the color of the objects material will be used to fill cut areas. Если значение "true", то цвет материала объекта будет использоваться для заполнения разрезанных областей. - + Geometry further than this value will be cut off. Keep zero for unlimited. Геометрия больше этого значения будет обрезана. Значение ноль снимает ограничение. - + The display length of this section plane Размер отображения этой плоскости сечения - + The display height of this section plane Отображение высоты плоскости сечения - + The size of the arrows of this section plane Размер углов плоскости сечения - + The transparency of this object Прозрачность объекта - - + + Show the cut in the 3D view Показать сечение в окне 3D-просмотра - + The color of this object Цвет объекта - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) Расстояние между секущей плоскостью и сечением текущего вида(устанавливайте очень маленькое, но не нулевое значение) - + Show the label in the 3D view Отображение метки в представлении 3D - + The name of the font Название шрифта - + The size of the text font Размер шрифта текста @@ -6572,12 +6572,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Плоскость Сечения - + Creates a section plane object, including the selected objects Создаёт объект плоскости сечения, выбранных объектов diff --git a/src/Mod/Arch/Resources/translations/Arch_sl.ts b/src/Mod/Arch/Resources/translations/Arch_sl.ts index 701f6ec2a0..6084a994af 100644 --- a/src/Mod/Arch/Resources/translations/Arch_sl.ts +++ b/src/Mod/Arch/Resources/translations/Arch_sl.ts @@ -2410,39 +2410,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Višina okenske police - + This window has no defined opening To okno nima določenega odpiranja - - - + + + Get selected edge Dobi izbrani rob - + Unable to create component Sestavine ni mogoče ustvariti - + Window elements Deli oken - + Hole wire Črtovje preboja - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Številka črtovja, ki določa preboj v gostuječem predmetu. Pri vrednosti nič bo samodejno upoštevano največje črtovje - + Pick selected Izberi označeno @@ -2450,9 +2450,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Odstrani @@ -2461,7 +2461,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Dodaj @@ -2475,50 +2475,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Uredi - + Create/update component Ustvari/posodobi sestavno - + Base 2D object Izhodiščni 2D predmet - - + + Wires Črtovja - + Components Sestavine - + Create new component Ustvari novo sestavino - + Name Ime - + Type Vrsta @@ -2526,56 +2526,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Debelina - + Offset Odmik - + Hinge Tečaj - + Opening mode Način odpiranja - - + + + default + privzeto - + If this is checked, the default Frame value of this window will be added to the value entered here Če je to označeno, bo privzeta vrednost okvirja tega okna dodana vrednosti, vnešeni tukaj - + If this is checked, the default Offset value of this window will be added to the value entered here Če je to označeno, bo privzeta vrednost odmika tega okna dodana vrednosti, vnešeni tukaj - + Press to retrieve the selected edge Pritisnite da povrnete izbrani rob - - + + Invert opening direction Obrni smer odpiranja - - + + Invert hinge position Obrni položaj tečajev @@ -3420,93 +3420,93 @@ Ustvarjanje etaže prekinjeno. Presek - + Create Section Plane Ustvari prerezno ravnino - + Toggle Cutview Preklaplanje prereznega pogleda - + Section plane settings Nastavitve prerezne ravnine - + Remove highlighted objects from the list above Odstrani označene predmete z zgornjega seznama - + Add selected Dodaj izbrane - + Add selected object(s) to the scope of this section plane Dodaj izbrene predmete v območje te prerezne ravnine - + Objects seen by this section plane: Predmeti, vidni v prerezni ravnini: - + Section plane placement: Umestitev prerezne ravnine: - + Rotate X Sukaj po x - + Rotates the plane along the X axis Zasuka ravnino okrog osi X - + Rotate Y Sukaj po y - + Rotates the plane along the Y axis Zasuka ravnino okrog osi Y - + Rotate Z Sukaj po z - + Rotates the plane along the Z axis Zasuka ravnino okrog osi Z - + Resize Spremeni velikost - + Resizes the plane to fit the objects in the list above Prevelikosti ravnino tako, da se bo prilegla predmetom z zgornjega seznama - + Center Središče - + Centers the plane on the objects in the list above Usredini ravnino na predmete z zgornjega seznama @@ -4049,7 +4049,7 @@ Ustvarjanj stavbe prekinjeno. - + The shape of this object Oblika tega predmeta @@ -4070,7 +4070,7 @@ Ustvarjanj stavbe prekinjeno. - + The line width of this object Debelina črt tega predmeta @@ -4647,7 +4647,7 @@ Ustvarjanj stavbe prekinjeno. Prikazovanje oznak odprtin v pogledu, če so te razpoložljive - + The number of the wire that defines the hole. A value of 0 means automatic Število črtovij, ki določajo preboj. Če je 0, se vrednost samodejno izračuna @@ -5473,7 +5473,7 @@ Ustvarjanj stavbe prekinjeno. - + The placement of this object Postavitev tega predmeta @@ -5693,79 +5693,79 @@ Ustvarjanj stavbe prekinjeno. Oblika armature - + The objects that must be considered by this section plane. Empty means the whole document. Predmeti, ki morajo biti v tej prerezni ravnini zajeti. Prazno pomeni celoten dokument. - + If false, non-solids will be cut too, with possible wrong results. Če je napak, bodo prerezani tudi netelesni predmeti z možnostjo napačnih izidov. - + If True, resulting views will be clipped to the section plane area. Če drži, bodo dobljeni pogledi zamejeni s površino prerezne ravnine. - + If true, the color of the objects material will be used to fill cut areas. Če drži, bo za zapolnitev prerezanih ploskev uporabljena barva predmetove snovi. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometrija izven te vrednosti bo porezana. Za neomejenost pustite vrednost nič. - + The display length of this section plane Dolžina prikaza te prerezne ravnine - + The display height of this section plane Višina prikaza te prerezne ravnine - + The size of the arrows of this section plane Velikost puščic te prerezne ravnine - + The transparency of this object Prozornost tega predmeta - - + + Show the cut in the 3D view Prikaži prerez v 3D-pogledu - + The color of this object Barva tega predmeta - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) Razdalja med rezalno ravnino in ravnino vidnega polja (razdalja naj bo majhna, vendar ne nič) - + Show the label in the 3D view Prikaži oznako v 3D-pogledu - + The name of the font Naziv pisave - + The size of the text font Velikost pisave besedila @@ -6591,12 +6591,12 @@ Ustvarjanj stavbe prekinjeno. Arch_SectionPlane - + Section Plane Prerezna ravnina - + Creates a section plane object, including the selected objects Ustvari predmet prerezne ravnine, ki vključuje izbrane predmete diff --git a/src/Mod/Arch/Resources/translations/Arch_sr-CS.ts b/src/Mod/Arch/Resources/translations/Arch_sr-CS.ts index ddc358a0d0..100b8519db 100644 --- a/src/Mod/Arch/Resources/translations/Arch_sr-CS.ts +++ b/src/Mod/Arch/Resources/translations/Arch_sr-CS.ts @@ -2411,39 +2411,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Izaberi @@ -2451,9 +2451,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Ukloni @@ -2462,7 +2462,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Dodaj @@ -2476,50 +2476,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Uredi - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Komponente - + Create new component Create new component - + Name Ime - + Type Vrsta @@ -2527,56 +2527,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Debljina - + Offset Odmak - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3421,93 +3421,93 @@ Floor creation aborted. Presek - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Dodaj izbor - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Po sredini - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4052,7 +4052,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4073,7 +4073,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4650,7 +4650,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5476,7 +5476,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5696,79 +5696,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object Providnost ovog objekta - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6594,12 +6594,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_sr.ts b/src/Mod/Arch/Resources/translations/Arch_sr.ts index 6e58744009..89f9f4b9fb 100644 --- a/src/Mod/Arch/Resources/translations/Arch_sr.ts +++ b/src/Mod/Arch/Resources/translations/Arch_sr.ts @@ -2411,39 +2411,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Изабери @@ -2451,9 +2451,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Уклони @@ -2462,7 +2462,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Додај @@ -2476,50 +2476,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Уреди - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Компоненте - + Create new component Create new component - + Name Име - + Type Врста @@ -2527,56 +2527,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Дебљина - + Offset Одмак - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3421,93 +3421,93 @@ Floor creation aborted. Пресек - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Додај избор - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center По средини - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4052,7 +4052,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4073,7 +4073,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4650,7 +4650,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5476,7 +5476,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5696,79 +5696,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object Провидност овог објекта - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6594,12 +6594,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_sv-SE.ts b/src/Mod/Arch/Resources/translations/Arch_sv-SE.ts index f9af4073c8..41b544ce30 100644 --- a/src/Mod/Arch/Resources/translations/Arch_sv-SE.ts +++ b/src/Mod/Arch/Resources/translations/Arch_sv-SE.ts @@ -2409,39 +2409,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening Det här fönstret har ingen definierad öppning - - - + + + Get selected edge Get selected edge - + Unable to create component Kunde inte skapa komponent - + Window elements Fönsterelement - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Välj markering @@ -2449,9 +2449,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Ta bort @@ -2460,7 +2460,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Lägg till @@ -2474,50 +2474,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Redigera - + Create/update component Skapa/uppdatera komponent - + Base 2D object Base 2D object - - + + Wires Trådar - + Components Komponenter - + Create new component Skapa ny komponent - + Name Namn - + Type Typ @@ -2525,56 +2525,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Tjocklek - + Offset Offset - + Hinge Gångjärn - + Opening mode Opening mode - - + + + default + standard - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3419,93 +3419,93 @@ Floor creation aborted. Sektionering - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Lägg till markerad - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Storleksförändra - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Centrum - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4050,7 +4050,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4071,7 +4071,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4648,7 +4648,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5474,7 +5474,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5694,79 +5694,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6592,12 +6592,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_tr.ts b/src/Mod/Arch/Resources/translations/Arch_tr.ts index e4d4b781a2..31ad194eed 100644 --- a/src/Mod/Arch/Resources/translations/Arch_tr.ts +++ b/src/Mod/Arch/Resources/translations/Arch_tr.ts @@ -2407,39 +2407,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Seçilen çekme @@ -2447,9 +2447,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Kaldır @@ -2458,7 +2458,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Ekle @@ -2472,50 +2472,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Düzenle - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Bileşenler - + Create new component Create new component - + Name Isim - + Type Türü @@ -2523,56 +2523,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Kalınlık - + Offset Uzaklaşma - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3417,93 +3417,93 @@ Floor creation aborted. Kesişim - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Seçileni ekle - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Ortala - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4048,7 +4048,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4069,7 +4069,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4646,7 +4646,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5472,7 +5472,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5692,79 +5692,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6591,12 +6591,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_uk.ts b/src/Mod/Arch/Resources/translations/Arch_uk.ts index 709bc4f63f..630b96651c 100644 --- a/src/Mod/Arch/Resources/translations/Arch_uk.ts +++ b/src/Mod/Arch/Resources/translations/Arch_uk.ts @@ -2412,39 +2412,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Висота підвіконня - + This window has no defined opening Це вікно не має визначеного відкриття - - - + + + Get selected edge Отримати вибране ребро - + Unable to create component Не вдалося створити компонент - + Window elements Елементи вікна - + Hole wire Сітка отвору - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire Щільність сітки, що визначає отвір у хост-об'єкті. Значення нуля автоматично приймає найбільшу сітку - + Pick selected Вибрати вибране @@ -2452,9 +2452,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Вилучити @@ -2463,7 +2463,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Додати @@ -2477,50 +2477,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Редагувати - + Create/update component Створити/оновити компонент - + Base 2D object Базовий двовимірний об’єкт - - + + Wires Сітки - + Components Компоненти - + Create new component Створити новий компонент - + Name Назва - + Type Тип @@ -2528,56 +2528,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Товщина - + Offset Зсув - + Hinge Шарнір - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3422,93 +3422,93 @@ Floor creation aborted. Розріз - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Додати вибрані - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Центр - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4053,7 +4053,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4074,7 +4074,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4651,7 +4651,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5477,7 +5477,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5697,79 +5697,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. Якщо увімкнено, колір матеріалу, який буде використовуватися для заповнення розрізаних областей. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Показати позначки в 3D-вигляді - + The color of this object Колір цього об'єкта - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6595,12 +6595,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_val-ES.ts b/src/Mod/Arch/Resources/translations/Arch_val-ES.ts index 67e839ae99..e0666526ed 100644 --- a/src/Mod/Arch/Resources/translations/Arch_val-ES.ts +++ b/src/Mod/Arch/Resources/translations/Arch_val-ES.ts @@ -2380,39 +2380,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected Tria el seleccionat @@ -2420,9 +2420,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove Elimina @@ -2431,7 +2431,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add Afegir @@ -2445,50 +2445,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit Edita - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components Components - + Create new component Create new component - + Name Nom - + Type Tipus @@ -2496,56 +2496,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness Gruix - + Offset Separació - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -3390,93 +3390,93 @@ Floor creation aborted. Secció - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected Afig el seleccionat - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center Centre - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4021,7 +4021,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4042,7 +4042,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4619,7 +4619,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5445,7 +5445,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5665,79 +5665,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6563,12 +6563,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_zh-CN.ts b/src/Mod/Arch/Resources/translations/Arch_zh-CN.ts index 35902c9383..1f6fbb7c66 100644 --- a/src/Mod/Arch/Resources/translations/Arch_zh-CN.ts +++ b/src/Mod/Arch/Resources/translations/Arch_zh-CN.ts @@ -2392,39 +2392,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela 台体高度 - + This window has no defined opening 此窗口没有定义为打开 - - - + + + Get selected edge 获取选中的边缘 - + Unable to create component 无法创建组件 - + Window elements 窗口元素 - + Hole wire 孔线 - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire 线的数目在主体对象中定义一个孔。值为零时将自动采用最大线数 - + Pick selected 选取选定的 @@ -2432,9 +2432,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove 删除 @@ -2443,7 +2443,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add 添加 @@ -2457,50 +2457,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit 编辑 - + Create/update component 创建/更新组件 - + Base 2D object 基础2D对象 - - + + Wires 线框 - + Components 组件 - + Create new component 创建新组件 - + Name 名称 - + Type 类型 @@ -2508,56 +2508,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness 厚度 - + Offset 偏移 - + Hinge 铰链 - + Opening mode 开口模式 - - + + + default + 默认 - + If this is checked, the default Frame value of this window will be added to the value entered here 如果选中此项，此窗口的默认帧值将添加到这里输入的值 - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge 点击搜索选中的边 - - + + Invert opening direction 反转打开方向 - - + + Invert hinge position 反向铰链位置 @@ -3402,93 +3402,93 @@ Floor creation aborted. 截面 - + Create Section Plane Create Section Plane - + Toggle Cutview Toggle Cutview - + Section plane settings Section plane settings - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected 添加所选 - + Add selected object(s) to the scope of this section plane Add selected object(s) to the scope of this section plane - + Objects seen by this section plane: Objects seen by this section plane: - + Section plane placement: Section plane placement: - + Rotate X Rotate X - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y Rotate Y - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z Rotate Z - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize Resize - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center 中心 - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4033,7 +4033,7 @@ Building creation aborted. - + The shape of this object The shape of this object @@ -4054,7 +4054,7 @@ Building creation aborted. - + The line width of this object The line width of this object @@ -4631,7 +4631,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5457,7 +5457,7 @@ Building creation aborted. - + The placement of this object The placement of this object @@ -5677,79 +5677,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. The objects that must be considered by this section plane. Empty means the whole document. - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane The display length of this section plane - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view Show the label in the 3D view - + The name of the font The name of the font - + The size of the text font The size of the text font @@ -6575,12 +6575,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane Section Plane - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Arch/Resources/translations/Arch_zh-TW.qm b/src/Mod/Arch/Resources/translations/Arch_zh-TW.qm index f05d2a41f0..0d5d5a794c 100644 Binary files a/src/Mod/Arch/Resources/translations/Arch_zh-TW.qm and b/src/Mod/Arch/Resources/translations/Arch_zh-TW.qm differ diff --git a/src/Mod/Arch/Resources/translations/Arch_zh-TW.ts b/src/Mod/Arch/Resources/translations/Arch_zh-TW.ts index 740412e209..2c53d7529d 100644 --- a/src/Mod/Arch/Resources/translations/Arch_zh-TW.ts +++ b/src/Mod/Arch/Resources/translations/Arch_zh-TW.ts @@ -2398,39 +2398,39 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Sill height - + This window has no defined opening This window has no defined opening - - - + + + Get selected edge Get selected edge - + Unable to create component Unable to create component - + Window elements Window elements - + Hole wire Hole wire - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + Pick selected 挑選 @@ -2438,9 +2438,9 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Remove 移除 @@ -2449,7 +2449,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Add 新增 @@ -2463,50 +2463,50 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + - + Edit 編輯 - + Create/update component Create/update component - + Base 2D object Base 2D object - - + + Wires Wires - + Components 組件 - + Create new component Create new component - + Name 名稱 - + Type 類型 @@ -2514,56 +2514,56 @@ If Run = 0 then the run is calculated so that the height is the same as the rela - + Thickness 厚度 - + Offset 偏移複製 - + Hinge Hinge - + Opening mode Opening mode - - + + + default + default - + If this is checked, the default Frame value of this window will be added to the value entered here If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here If this is checked, the default Offset value of this window will be added to the value entered here - + Press to retrieve the selected edge Press to retrieve the selected edge - - + + Invert opening direction Invert opening direction - - + + Invert hinge position Invert hinge position @@ -2957,7 +2957,7 @@ If Run = 0 then the run is calculated so that the height is the same as the rela Rotation - Rotation + 旋轉 @@ -3408,93 +3408,93 @@ Floor creation aborted. 剖面 - + Create Section Plane 建立剖平面 - + Toggle Cutview 切換剖視圖 - + Section plane settings 剖面平面設定 - + Remove highlighted objects from the list above Remove highlighted objects from the list above - + Add selected 新增已選擇的 - + Add selected object(s) to the scope of this section plane 將選定的物件添加到此剖面平面的範圍中。 - + Objects seen by this section plane: 此剖面平面所看到的物件有： - + Section plane placement: 剖面平面位置： - + Rotate X 沿 X 軸旋轉 - + Rotates the plane along the X axis Rotates the plane along the X axis - + Rotate Y 沿 Y 軸旋轉 - + Rotates the plane along the Y axis Rotates the plane along the Y axis - + Rotate Z 沿 Z 軸旋轉 - + Rotates the plane along the Z axis Rotates the plane along the Z axis - + Resize 調整大小 - + Resizes the plane to fit the objects in the list above Resizes the plane to fit the objects in the list above - + Center 中心 - + Centers the plane on the objects in the list above Centers the plane on the objects in the list above @@ -4039,7 +4039,7 @@ Building creation aborted. - + The shape of this object 此物件的形狀 @@ -4060,7 +4060,7 @@ Building creation aborted. - + The line width of this object 此物件的線寬 @@ -4637,7 +4637,7 @@ Building creation aborted. Show elevation opening symbols if available - + The number of the wire that defines the hole. A value of 0 means automatic The number of the wire that defines the hole. A value of 0 means automatic @@ -5463,7 +5463,7 @@ Building creation aborted. - + The placement of this object 此物件所在位置 @@ -5683,79 +5683,79 @@ Building creation aborted. Shape of rebar - + The objects that must be considered by this section plane. Empty means the whole document. 此剖面平面所需考慮的物件。空表示整個文件。 - + If false, non-solids will be cut too, with possible wrong results. If false, non-solids will be cut too, with possible wrong results. - + If True, resulting views will be clipped to the section plane area. 若為 True，結果視圖將被剪裁為剖面平面區域內容。 - + If true, the color of the objects material will be used to fill cut areas. If true, the color of the objects material will be used to fill cut areas. - + Geometry further than this value will be cut off. Keep zero for unlimited. Geometry further than this value will be cut off. Keep zero for unlimited. - + The display length of this section plane 此剖面平面的顯示長度 - + The display height of this section plane The display height of this section plane - + The size of the arrows of this section plane The size of the arrows of this section plane - + The transparency of this object The transparency of this object - - + + Show the cut in the 3D view Show the cut in the 3D view - + The color of this object 此物件的顏色 - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) The distance between the cut plane and the actual view cut (keep this a very small value but not zero) - + Show the label in the 3D view 在 3D 視圖中顯示標籤 - + The name of the font 字型名稱 - + The size of the text font 字體大小 @@ -6052,22 +6052,22 @@ Building creation aborted. Draft creation tools - Draft creation tools + 草稿創建工具 Draft annotation tools - Draft annotation tools + 草稿註解工具 Draft modification tools - Draft modification tools + 草稿修改工具 Draft snap - Draft snap + 草稿鎖點 @@ -6581,12 +6581,12 @@ Building creation aborted. Arch_SectionPlane - + Section Plane 剖平面 - + Creates a section plane object, including the selected objects Creates a section plane object, including the selected objects diff --git a/src/Mod/Draft/App/CMakeLists.txt b/src/Mod/Draft/App/CMakeLists.txt index bbb414da7b..b9c902f5ac 100644 --- a/src/Mod/Draft/App/CMakeLists.txt +++ b/src/Mod/Draft/App/CMakeLists.txt @@ -1,7 +1,5 @@ if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH -D_CRT_SECURE_NO_WARNINGS) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif(MSVC) diff --git a/src/Mod/Draft/Resources/translations/Draft.ts b/src/Mod/Draft/Resources/translations/Draft.ts index 16222df385..dd71468ed8 100644 --- a/src/Mod/Draft/Resources/translations/Draft.ts +++ b/src/Mod/Draft/Resources/translations/Draft.ts @@ -717,6 +717,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file + + + Font files (*.ttf *.otf *.pfb) + + Form @@ -1452,74 +1457,74 @@ Note that this is not fully supported, and many object will be not editable with - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size - + The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) - + Preserve colors of faces during downgrade/upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) - + Preserve names of faces during downgrade/upgrade - + Drawing view line definitions - + Dashed line definition - - - + + + An SVG linestyle definition - + Dashdot line definition - + Dotted line definition @@ -1735,6 +1740,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + + + + Select a font file @@ -2752,21 +2762,21 @@ This might fail for post DXF R12 templates. - + Top - + Front - + Side @@ -3190,14 +3200,14 @@ or try saving to a lower DWG version. - + All Shapes must be coplanar - + Selected Shapes must define a plane @@ -4615,22 +4625,27 @@ The final angle will be the base angle plus this amount. - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + + + + ShapeString: string has no wires - + ShapeString: face creation failed for one character @@ -6870,52 +6885,57 @@ It is a list of strings; each element in the list will be displayed in its own l - + Text string - + Font file name - + Height of text - + Horizontal and vertical alignment - + Height reference used for justification - + Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size - + Inter-character spacing - + + Oblique (slant) angle + + + + Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_be.qm b/src/Mod/Draft/Resources/translations/Draft_be.qm index 98674f85fb..fa2a4a68bb 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_be.qm and b/src/Mod/Draft/Resources/translations/Draft_be.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_be.ts b/src/Mod/Draft/Resources/translations/Draft_be.ts index 97d8d86d46..c4a4e9bf5d 100644 --- a/src/Mod/Draft/Resources/translations/Draft_be.ts +++ b/src/Mod/Draft/Resources/translations/Draft_be.ts @@ -737,6 +737,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Файл шрыфту + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1488,74 +1493,74 @@ Note that this is not fully supported, and many object will be not editable with Іншае месцазнаходжанне шаблонаў SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Тут вы можаце паказаць каталог з карыстальніцкімі файламі SVG, што змяшчаюць вызначэнні <pattern>, якія будуць даданы да стандартных шаблонаў - + SVG pattern resolution Дазвол шаблону SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Дазвол шаблонаў для малявання чарцяжа. Першапачатковае значэнне 128. Больш высокія значэнні даюць лепшыя дазволы, больш нізкія значэнні паскараюць маляванне - + SVG pattern default size Першапачатковы памер шаблону SVG - + The default size for SVG patterns Першапачатковы памер для шаблонаў SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Праверце, калі вы жадаеце захаваць колеру граняў падчас аперацыі падзелу і аб'яднання (толькі пры падзелу граняў і зрабіць абалонку) - + Preserve colors of faces during downgrade/upgrade Захоўваць колеры граняў падчас падзелу/аб'яднання - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Праверце, калі вы жадаеце, каб назвы граняў вырабляліся ад зыходнай назвы аб'екта і наадварот пры выкананні падзел/аб'яднанне(толькі пры падзелу граняў і зрабіць абалонку) - + Preserve names of faces during downgrade/upgrade Захоўваць назвы граняў пры падзелу/аб'яднанні - + Drawing view line definitions Вызначэнне лініі ў выглядзе чарцяжа - + Dashed line definition Вызначэнне штрыхавой лініі - - - + + + An SVG linestyle definition Вызначэнне стыляў ліній у SVG - + Dashdot line definition Вызначэнне штрых-пункцірнай лініі - + Dotted line definition Вызначэнне пункцірнай лініі @@ -1755,12 +1760,12 @@ such as "Arial:Bold" Feet separator - Feet separator + Падзельнік для для адзінкі ступні Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Неабавязковая радок, які павінены адлюстроўвацца ў вымярэннях паміж значэннямі ў футах і цалях @@ -1774,6 +1779,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Абраць файл шрыфту @@ -2806,21 +2816,21 @@ This might fail for post DXF R12 templates. - + Top Зверху - + Front Спераду - + Side Бок @@ -3249,14 +3259,14 @@ or try saving to a lower DWG version. Паспрабуйце перамясціць файл DWG у шлях да каталогу без прабелаў і неангламоўных знакаў, альбо паспрабуйце захаваць у больш ранняй версіі DWG. - + All Shapes must be coplanar Усе фігуры павінны быць у адной плоскасці - + Selected Shapes must define a plane Абраныя фігуры павінны вызначаць плоскасць @@ -4682,22 +4692,27 @@ The final angle will be the base angle plus this amount. Налады сіметрыі: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - даданы ўласцівасці 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' і 'Fuse' + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type зменены тып уласцівасці 'Tracking' - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Контур радка: радок не мае ломаных ліній - + ShapeString: face creation failed for one character Контур радка: не атрымалася стварыць грань для аднаго знаку @@ -7022,52 +7037,57 @@ It is a list of strings; each element in the list will be displayed in its own l Спіс радкоў; кожны элемент у спісе будзе адлюстраваны асобнай лініяй. - + Text string Тэкставы радок - + Font file name Назва файла шрыфту - + Height of text Вышыня тэксту - + Horizontal and vertical alignment Гарызантальнае і вертыкальнае выраўноўванне - + Height reference used for justification Апорная вышыня, якая ўжываецца для абгрунтавання - + Keep left margin and leading white space when justification is left Пакінуць левае поле і пачатковы інтэрвал, калі выраўноўванне пакінута - + Scale to ensure cap height is equal to size Маштабаванне, каб пераканацца, што вышыня шапкі адпавядае яе памеру - + Inter-character spacing Міжрадковы інтэрвал - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Запоўніць літары гранямі - + Fuse faces if faces overlap, usually not required (can be very slow) Злучаць грані, калі грані перакрываюцца, звычайна не патрабуецца (можа быць вельмі павольным) diff --git a/src/Mod/Draft/Resources/translations/Draft_ca.qm b/src/Mod/Draft/Resources/translations/Draft_ca.qm index 37b3b231d0..0ce99be37a 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_ca.qm and b/src/Mod/Draft/Resources/translations/Draft_ca.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_ca.ts b/src/Mod/Draft/Resources/translations/Draft_ca.ts index 16993429b2..74ac25dbd1 100644 --- a/src/Mod/Draft/Resources/translations/Draft_ca.ts +++ b/src/Mod/Draft/Resources/translations/Draft_ca.ts @@ -736,6 +736,11 @@ Una matriu d'enllaç és més eficient quan es creen diverses còpies, però no Font file Fitxer de tipus de lletra + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1476,74 +1481,74 @@ Tingueu en compte que això no és totalment compatible i que molts objectes no Ubicació alternativa dels patrons SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Aquí podeu especificar un directori amb fitxers SVG personalitzats que continguin definicions <pattern> per afegir als patrons estàndard - + SVG pattern resolution Resolució de patró SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Resolució a la qual es dibuixaran els patrons. El valor per defecte és 128. Valors més alts donen resolucions millors, valors més baixos fan el dibuix més ràpid - + SVG pattern default size Mida predeterminada del patró SVG - + The default size for SVG patterns La mida predeterminada per als patrons SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Marcar si voleu preservar el color de les cares mentre s'estigui revertint o actualitzant (sols splitFaces i makeShell) - + Preserve colors of faces during downgrade/upgrade Preserva el color de les cares durant la downgrade/upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Marqueu això si voleu que els noms de les cares derivin del nom de l'objecte d'origen i viceversa quan s'estigui revertint o actualitzant (sols splitFaces i makeShell) - + Preserve names of faces during downgrade/upgrade Preserva el nom de les cares durant la reversió i l'actualització - + Drawing view line definitions Definicions de línia de vista de dibuix - + Dashed line definition Definició de la línia discontínua - - - + + + An SVG linestyle definition Una definició d'estil de línia SVG - + Dashdot line definition Dashdot definició de línia - + Dotted line definition Definició de la línia de punts @@ -1759,6 +1764,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Seleccioneu un fitxer de tipus de lletra @@ -2780,21 +2790,21 @@ This might fail for post DXF R12 templates. - + Top Planta - + Front Alçat - + Side Costat @@ -3220,14 +3230,14 @@ or try saving to a lower DWG version. Error durant la conversió DWG. Proveu de moure el fitxer DWG a un directori amb ruta sense espais ni caràcters no-anglesos, o proveu de desar-lo amb una versió DWG inferior. - + All Shapes must be coplanar Totes les Formes han de ser coplanars - + Selected Shapes must define a plane Les Formes seleccionades han de definir un pla @@ -4651,22 +4661,27 @@ L'angle final serà l'angle de base més aquesta quantitat. Paràmetre de simetria: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -6997,52 +7012,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Cadena de text - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_cs.qm b/src/Mod/Draft/Resources/translations/Draft_cs.qm index 4a353637bc..0c342ad7e4 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_cs.qm and b/src/Mod/Draft/Resources/translations/Draft_cs.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_cs.ts b/src/Mod/Draft/Resources/translations/Draft_cs.ts index 0e4a30d427..875a4afd0f 100644 --- a/src/Mod/Draft/Resources/translations/Draft_cs.ts +++ b/src/Mod/Draft/Resources/translations/Draft_cs.ts @@ -736,6 +736,11 @@ Spojené pole je efektivnější při vytváření více kopií, ale nemůže b Font file Soubor písem + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1486,74 +1491,74 @@ Všimněte si, že toto není plně podporováno a mnoho objektů nebude možno Alternativní umístění vzorů SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Zde můžete zadat adresář obsahující vlastní soubory SVG<pattern> definice, které mají být přidány do standardních vzorů - + SVG pattern resolution Rozlišení vzoru SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Rozlišení pro kreslení vzorů. Výchozí hodnota je 128. Vyšší hodnoty poskytují lepší rozlišení, nižší hodnoty zrychlují kreslení - + SVG pattern default size Výchozí velikost vzoru SVG - + The default size for SVG patterns Výchozí velikost pro vzory SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Zaškrtněte, pokud chcete zachovat barvy ploch během ponížení a povýšení (pouze pro splitFaces a makeShell) - + Preserve colors of faces during downgrade/upgrade Zachovat barvy ploch během ponížení/povýšení - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Zaškrtněte, chcete-li názvy ploch odvodit od názvu původního objektu a obráceně, když provádíte ponížení/povýšení (pouze pro splitFaces a makeShell) - + Preserve names of faces during downgrade/upgrade Zachovat jména ploch během ponížení/povýšení - + Drawing view line definitions Definice vykreslení čar - + Dashed line definition Definice přerušované čáry - - - + + + An SVG linestyle definition Definice SVG stylu čar - + Dashdot line definition Definice čerchované čáry - + Dotted line definition Definice tečkované čáry @@ -1769,6 +1774,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Vyberte soubor písma @@ -2803,21 +2813,21 @@ To může selhat u šablon post DXF R12. - + Top Horní - + Front Přední - + Side Strana @@ -3249,14 +3259,14 @@ Zkuste přesunout soubor DWG do cesty k adresáři bez mezer a neanglických zna nebo zkuste uložit do nižší verze DWG. - + All Shapes must be coplanar Všechny tvary musí být koplanární - + Selected Shapes must define a plane Vybrané tvary musí definovat rovinu @@ -4682,22 +4692,27 @@ Konečný úhel bude základní úhel plus tato hodnota. Parametr symetrie: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: řetězec nemá žádné dráty - + ShapeString: face creation failed for one character ShapeString: vytvoření obličeje se nezdařilo pro jeden znak @@ -7029,52 +7044,57 @@ It is a list of strings; each element in the list will be displayed in its own l Je to seznam řetězců; každý prvek v seznamu se zobrazí na vlastním řádku. - + Text string Textový řetězec - + Font file name Název souboru písma - + Height of text Výška textu - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Meziznakové mezery - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Vyplňte písmena tvářemi - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_de.qm b/src/Mod/Draft/Resources/translations/Draft_de.qm index 98b76b8ede..de84b935ed 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_de.qm and b/src/Mod/Draft/Resources/translations/Draft_de.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_de.ts b/src/Mod/Draft/Resources/translations/Draft_de.ts index 6ba8d03ac0..5abd027bbe 100644 --- a/src/Mod/Draft/Resources/translations/Draft_de.ts +++ b/src/Mod/Draft/Resources/translations/Draft_de.ts @@ -737,6 +737,11 @@ Eine Verknüpfungsanordnung ist effizienter, wenn mehrere Kopien erstellt werden Font file Schriftartendatei + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1487,74 +1492,74 @@ Beachten Sie, dass dies nicht vollständig unterstützt wird und viele Objekte m Ablageort alternativer SVG-Muster - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Hier kann ein Verzeichnis mit benutzerdefinierten SVG-Dateien angeben werden, das <pattern>-Definitionen enthält, die zu den Standardmustern hinzugefügt werden sollen - + SVG pattern resolution Auflösung des SVG-Musters - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Die Auflösung, um die Muster zu zeichnen. Standardwert ist 128. Höhere Werte geben bessere Auflösungen, niedrigere Werte machen das Zeichnen schneller - + SVG pattern default size Standardgröße des SVG-Musters - + The default size for SVG patterns Die Standardgröße für SVG-Muster - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Aktivieren Sie diese Option, wenn Sie die Farben von Flächen während des Downgrades und Upgrades beibehalten möchten (nur splitFaces und makeShell) - + Preserve colors of faces during downgrade/upgrade Flächenfarben beim Downgrade/Upgrade erhalten - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Aktivieren Sie diese Option, wenn Sie während eines Downgrade/Upgrade möchten, dass die Flächenbezeichnungen vom ursprünglichen Objektnamen und umgekehrt abgeleitet werden (nur splitFaces und makeShell) - + Preserve names of faces during downgrade/upgrade Flächenfarben beim Downgrade/Upgrade erhalten - + Drawing view line definitions Definition sichtbarer Linien der Zeichnung - + Dashed line definition Gestrichelte Linien-Definition - - - + + + An SVG linestyle definition Eine SVG-Linienart-Definition - + Dashdot line definition Strich-Punkt-Linien-Definition - + Dotted line definition Gepunktete-Linien-Definition @@ -1751,12 +1756,12 @@ such as "Arial:Bold" Feet separator - Feet separator + Fuß-Trennzeichen Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Eine optionale Zeichenkette, die zwischen die Fuß- und Zoll-Werte in Maßeinträgen eingefügt wird @@ -1770,6 +1775,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Wählen Sie eine Schriftartdatei aus @@ -2802,21 +2812,21 @@ Dies kann bei neueren als DXF R12 Vorlagen fehlschlagen. - + Top Oben - + Front Vorne - + Side Seite @@ -2940,7 +2950,7 @@ Deaktivieren um das Koordinatensystem der aktuellen Arbeitsebene zu verwenden Filled - Befüllt + Füllen @@ -3119,7 +3129,7 @@ Nicht verfügbar, wenn die Option "Primitive Teile verwenden" aktiviert ist Offset - Versetzen + Versatz @@ -3246,14 +3256,14 @@ or try saving to a lower DWG version. Versuchen Sie, die DWG-Datei in einen Verzeichnispfad ohne Leerzeichen und nicht-englische Zeichen zu verschieben oder versuchen Sie, in einer niedrigeren DWG-Version zu speichern. - + All Shapes must be coplanar Alle Formen müssen komplanar sein - + Selected Shapes must define a plane Ausgewählte Formen müssen eine Ebene definieren @@ -4470,7 +4480,7 @@ Der endgültige Winkel ist der Basiswinkel plus dieser Betrag. Polar array - Polare Anordnung + Polare Reihe @@ -4630,7 +4640,7 @@ Der endgültige Winkel ist der Basiswinkel plus dieser Betrag. Circular array - Kreisförmige Reihe + Kreisförmige Anordnung @@ -4678,22 +4688,27 @@ Der endgültige Winkel ist der Basiswinkel plus dieser Betrag. Symmetrie-Parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: Die Zeichenfolge hat keine Linien - + ShapeString: face creation failed for one character ShapeString: Flächenerstellung für ein Zeichen fehlgeschlagen @@ -6240,7 +6255,7 @@ Mit E oder Alt+Linksklick wird das Kontextmenü an unterstützten Knoten und Obj Circular array - Kreisförmige Anordnung + Kreisförmige Reihe @@ -6866,7 +6881,7 @@ Der resultierende Klon kann in jeder seiner drei Richtungen skaliert werden. Polar array - Polare Reihe + Polare Anordnung @@ -6924,7 +6939,7 @@ Beispielsweise können ausgewählte Objekte in eines zusammengefügt werden, ein Offset - Versatz + Versetzen @@ -7018,52 +7033,57 @@ It is a list of strings; each element in the list will be displayed in its own l Es ist eine Liste von Zeichenketten; jedes Element in der Liste wird in einer eigenen Zeile angezeigt. - + Text string Textzeichenkette - + Font file name Dateiname Schriftart - + Height of text Höhe des Textes - + Horizontal and vertical alignment - Horizontal and vertical alignment + Horizontale und vertikale Ausrichtung - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Zwischenzeichenabstand - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Buchstaben mit Flächen ausfüllen - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_el.qm b/src/Mod/Draft/Resources/translations/Draft_el.qm index 456ddb23bb..1b0a28ebcd 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_el.qm and b/src/Mod/Draft/Resources/translations/Draft_el.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_el.ts b/src/Mod/Draft/Resources/translations/Draft_el.ts index 062dfd4dcf..831d2fb294 100644 --- a/src/Mod/Draft/Resources/translations/Draft_el.ts +++ b/src/Mod/Draft/Resources/translations/Draft_el.ts @@ -735,6 +735,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Αρχείο γραμματοσειράς + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1221,17 +1226,17 @@ value by using the [ and ] keys while drawing PAT file: - PAT file: + Αρχείο PAT: pattern files (*.pat) - pattern files (*.pat) + αρχεία μοτίβου (*.pat) Pattern: - Pattern: + Μοτίβο: @@ -1484,74 +1489,74 @@ Note that this is not fully supported, and many object will be not editable with Εναλλακτική τοποθεσία μοτίβων SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Έλεγχος αυτού εάν θέλετε να διατηρήσετε τα χρώματα των όψεων ενώ γίνεται υποβάθμιση και αναβάθμιση (splitFaces και makeShell μόνο) - + Preserve colors of faces during downgrade/upgrade Διατήρηση χρωμάτων των όψεων κατά τη διάρκεια υποβάθμισης/αναβάθμισης - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Τσεκάρετε αν θέλετε τα ονόματα των όψεων να αντληθούν από το αρχικό όνομα του αντικειμένου και, αντιστρόφως, ενώ γίνεται downgrade/αναβάθμιση (splitFaces και makeShell μόνο) - + Preserve names of faces during downgrade/upgrade Διατήρηση ονομάτων των όψεων κατά τη διάρκεια υποβάθμισης/αναβάθμισης - + Drawing view line definitions Ορισμοί γραμμής προβολής σχεδίασης - + Dashed line definition Προσδιορισμός διακεκομμένης γραμμής - - - + + + An SVG linestyle definition Ένας ορισμός τύπου μορφοποίησης γραμμών SVG - + Dashdot line definition Προσδιορισμός της διακεκομμένης γραμμής από τελείες και παύλες - + Dotted line definition Προσδιορισμός της διακεκομμένης γραμμής από τελείες @@ -1625,7 +1630,7 @@ such as "Arial:Bold" Screen - Screen + Οθόνη @@ -1769,6 +1774,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Επιλέξτε ένα αρχείο γραμματοσειράς @@ -2428,17 +2438,17 @@ This might fail for post DXF R12 templates. LibreDWG - LibreDWG + LibreDWG ODA Converter - ODA Converter + Μετατροπέας ODA QCAD pro - QCAD pro + QCAD pro @@ -2603,7 +2613,7 @@ This might fail for post DXF R12 templates. Undo - Undo + Αναίρεση @@ -2803,21 +2813,21 @@ This might fail for post DXF R12 templates. - + Top Πάνω - + Front Εμπρόσθια - + Side Side @@ -2840,7 +2850,7 @@ This might fail for post DXF R12 templates. active command: - active command: + ενεργή εντολή: @@ -2850,7 +2860,7 @@ This might fail for post DXF R12 templates. X coordinate of next point - X coordinate of next point + Συντεταγμένη X του επόμενου σημείου @@ -2870,12 +2880,12 @@ This might fail for post DXF R12 templates. Y coordinate of next point - Y coordinate of next point + Συντεταγμένη Y του επόμενου σημείου Z coordinate of next point - Z coordinate of next point + Συντεταγμένη Ζ του επόμενου σημείου @@ -3249,14 +3259,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4682,22 +4692,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7023,52 +7038,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Text string - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_es-AR.qm b/src/Mod/Draft/Resources/translations/Draft_es-AR.qm index a00bc18f6b..7c73bf8fea 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_es-AR.qm and b/src/Mod/Draft/Resources/translations/Draft_es-AR.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_es-AR.ts b/src/Mod/Draft/Resources/translations/Draft_es-AR.ts index a56cd9ba59..774a22c761 100644 --- a/src/Mod/Draft/Resources/translations/Draft_es-AR.ts +++ b/src/Mod/Draft/Resources/translations/Draft_es-AR.ts @@ -736,6 +736,11 @@ Una matriz de enlaces es más eficiente al crear varias copias, pero no se puede Font file Archivo de fuente + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1485,74 +1490,74 @@ Tenga en cuenta que esto no es totalmente compatible, y muchos objetos no serán Ubicación alternativa de patrones SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Aquí puede especificar un directorio con archivos SVG personalizados que contienen <pattern> definiciones para agregar a los patrones normalizados - + SVG pattern resolution Resolución de patrón SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster La resolución para dibujar los patrones. El valor predeterminado es 128. Los valores más altos dan mejores resoluciones, los valores más bajos hacen que el dibujo sea más rápido - + SVG pattern default size Tamaño predeterminado del patrón SVG - + The default size for SVG patterns El tamaño predeterminado para los patrones SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Marque esto si desea preservar los colores de las caras mientras hace una descomposición y composición (solo dividirCaras y hacerCarcasa) - + Preserve colors of faces during downgrade/upgrade Preservar los colores de las caras durante el descomponer/componer - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Marque esto si desea que los nombres de las caras se deriven del nombre del objeto de origen y viceversa al hacer una descomposición/composición (solo dividirCaras y hacerCarcasa) - + Preserve names of faces during downgrade/upgrade Preservar los nombres de las caras durante el descomponer/componer - + Drawing view line definitions Definiciones de líneas de vista de Dibujo - + Dashed line definition Definición de línea discontinua - - - + + + An SVG linestyle definition Una definición de estilo de línea SVG - + Dashdot line definition Definición de línea de punto y trazo - + Dotted line definition Definición de línea punteada @@ -1752,12 +1757,12 @@ como "Arial: Negrita" Feet separator - Feet separator + Separador de pies Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Cadena opcional que aparecerá entre los valores de pies y pulgadas en las cotas @@ -1771,6 +1776,11 @@ como "Arial: Negrita" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Seleccione un archivo de fuente @@ -2803,21 +2813,21 @@ Esto podría fallar para la publicación de plantillas DXF R12. - + Top Superior - + Front Anterior - + Side Lado @@ -3247,14 +3257,14 @@ or try saving to a lower DWG version. Intente mover el archivo DWG a un directorio cuyo camino no contenga espacios ni caracteres no ingleses, o intente guardar a una versión DWG menor. - + All Shapes must be coplanar Todas las formas deben ser coplanares - + Selected Shapes must define a plane Las formas seleccionadas deben definir un plano @@ -4678,22 +4688,27 @@ The final angle will be the base angle plus this amount. Parámetro de simetría: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - añadidas propiedades 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' y 'Fuse' + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type Se cambió el tipo de propiedad 'Seguimiento' - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: la cadena no tiene aristas - + ShapeString: face creation failed for one character ShapeString: la creación de caras falló para un carácter @@ -7014,52 +7029,57 @@ It is a list of strings; each element in the list will be displayed in its own l Es un listado; donde cada elemento de la lista se mostrará en su propia línea. - + Text string Cadena de texto - + Font file name Nombre del archivo fuente - + Height of text Altura de texto - + Horizontal and vertical alignment Alineación horizontal y vertical - + Height reference used for justification Referencia de altura utilizada para la justificación - + Keep left margin and leading white space when justification is left Mantener el margen izquierdo y el espacio en blanco cuando se deje la justificación - + Scale to ensure cap height is equal to size Escala para asegurar que la altura del límite sea igual al tamaño - + Inter-character spacing Espaciado entre caracteres - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Rellena letras con caras - + Fuse faces if faces overlap, usually not required (can be very slow) Fusionar caras si se superponen, normalmente no es necesario (puede ser muy lento) diff --git a/src/Mod/Draft/Resources/translations/Draft_es-ES.qm b/src/Mod/Draft/Resources/translations/Draft_es-ES.qm index eec1fc4945..9c102d0545 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_es-ES.qm and b/src/Mod/Draft/Resources/translations/Draft_es-ES.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_es-ES.ts b/src/Mod/Draft/Resources/translations/Draft_es-ES.ts index 3bfb5e919f..f405655d46 100644 --- a/src/Mod/Draft/Resources/translations/Draft_es-ES.ts +++ b/src/Mod/Draft/Resources/translations/Draft_es-ES.ts @@ -736,6 +736,11 @@ Una matriz enlazada es más eficiente al crear múltiples copias, pero no pueden Font file Tipo de archivo de letra + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1487,74 +1492,74 @@ Tenga en cuenta que esto no es totalmente compatible, y muchos objetos no serán Ubicación alternativa de patrones SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Aquí puede especificar un directorio con archivos SVG personalizados que contienen <pattern> definiciones para agregar a los patrones normalizados - + SVG pattern resolution Resolución de patrón SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster La resolución para dibujar los patrones. El valor predeterminado es 128. Valores más altos dan mejores resoluciones, valores más bajos hacen que el dibujo sea más rápido - + SVG pattern default size Tamaño predeterminado del patrón SVG - + The default size for SVG patterns El tamaño predeterminado para los patrones SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Marque esto si desea preservar los colores de las caras mientras realiza una degradación y actualización (solo splitFaces y makeShell) - + Preserve colors of faces during downgrade/upgrade Preservar los colores de las caras durante el downgrade y upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Marque esto si desea que los nombres de las caras se deriven del nombre del objeto de origen y viceversa mientras realiza la degradación / actualización (solo splitFaces y makeShell) - + Preserve names of faces during downgrade/upgrade Preservar los colores de las caras durante el downgrade y upgrade - + Drawing view line definitions Vista de dibujo de definicion de linea - + Dashed line definition Definición de línea discontinua - - - + + + An SVG linestyle definition Una definición de estilo de línea SVG - + Dashdot line definition Definición de línea de punto y trazo - + Dotted line definition Definición de línea punteada @@ -1751,12 +1756,12 @@ such as "Arial:Bold" Feet separator - Feet separator + Separador de pies Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Cadena opcional que aparecerá entre los valores de pies y pulgadas en las cotas @@ -1770,6 +1775,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Seleccione un archivo de fuente @@ -2803,21 +2813,21 @@ This might fail for post DXF R12 templates. - + Top Planta - + Front Alzado - + Side Lado @@ -3247,14 +3257,14 @@ or try saving to a lower DWG version. Intente mover el archivo DWG a un directorio cuyo camino no contenga espacios ni caracteres no ingleses, o intente guardar a una versión DWG menor. - + All Shapes must be coplanar Todas las formas deben ser coplanares - + Selected Shapes must define a plane Las formas seleccionadas deben definir un plano @@ -4678,22 +4688,27 @@ The final angle will be the base angle plus this amount. Parámetro de simetría: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - añadidas propiedades 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' y 'Fuse' + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type Se cambió el tipo de propiedad 'Seguimiento' - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: la cadena no tiene aristas - + ShapeString: face creation failed for one character ShapeString: la creación de caras falló para un carácter @@ -7014,52 +7029,57 @@ It is a list of strings; each element in the list will be displayed in its own l Es un listado; donde cada elemento de la lista se mostrará en su propia línea. - + Text string Cadena de texto - + Font file name Nombre del archivo fuente - + Height of text Altura de texto - + Horizontal and vertical alignment Alineación horizontal y vertical - + Height reference used for justification Referencia de altura utilizada para la justificación - + Keep left margin and leading white space when justification is left Mantener el margen izquierdo y el espacio en blanco cuando se deje la justificación - + Scale to ensure cap height is equal to size Escala para asegurar que la altura del límite sea igual al tamaño - + Inter-character spacing Espaciado entre caracteres - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Rellena letras con caras - + Fuse faces if faces overlap, usually not required (can be very slow) Fusionar caras si se superponen, normalmente no es necesario (puede ser muy lento) diff --git a/src/Mod/Draft/Resources/translations/Draft_eu.qm b/src/Mod/Draft/Resources/translations/Draft_eu.qm index 98afe7d967..48f27c1a27 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_eu.qm and b/src/Mod/Draft/Resources/translations/Draft_eu.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_eu.ts b/src/Mod/Draft/Resources/translations/Draft_eu.ts index 99c53c8254..2f6ef06e25 100644 --- a/src/Mod/Draft/Resources/translations/Draft_eu.ts +++ b/src/Mod/Draft/Resources/translations/Draft_eu.ts @@ -736,6 +736,11 @@ Esteka-matrizea eraginkorragoa da kopia anitz sortzean, baina ezin da fusionatu. Font file Letra-tipoaren fitxategia + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1480,74 +1485,74 @@ Kontuan izan eragiketa horren euskarria ez dela osoa, eta zenbait objektu ez dir SVG ereduen kokaleku alternatiboa - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns <pattern> definizioak dituzten SVG fitxategi pertsonalizatuak dituen direktorio bat adierazi dezakezu hemen, horiek eredu estandarrei gehitzeko - + SVG pattern resolution SVG ereduaren bereizmena - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Ereduak marrazteko erabiliko den bereizmena. Balio lehenetsia 128 da. Balio altuagoek bereizmen hobeak ematen dituzte, balio baxuagoek marraztea azkartzen dute - + SVG pattern default size SVG ereduaren tamaina lehenetsia - + The default size for SVG patterns SVG ereduen tamaina lehenetsia - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Markatu hau aurpegien koloreak mantendu nahi badituzu zaharkitzean edo eguneratzean (splitFaces eta makeShell soilik) - + Preserve colors of faces during downgrade/upgrade Mantendu aurpegien koloreak zaharkitzean/eguneratzean - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Markatu hau aurpegien izenak jatorrizko objektuen izenetatik eratorri nahi badituzu, edo alderantziz, zaharkitzean edo eguneratzean (splitFaces eta makeShell soilik) - + Preserve names of faces during downgrade/upgrade Mantendu aurpegien izenak zaharkitzean/eguneratzean - + Drawing view line definitions Marrizki-bistaren lerro-definizioak - + Dashed line definition Marraz osatutako lerroen definizioa - - - + + + An SVG linestyle definition SVG lerro-estiloaren definizio bat - + Dashdot line definition Marra-puntuz osatutako lerroen definizioa - + Dotted line definition Puntuz osatutako lerroen definizioa @@ -1582,7 +1587,7 @@ such as "Arial:Bold" Font size - Letra-tamaina + Letra-tipoaren tamaina @@ -1744,12 +1749,12 @@ such as "Arial:Bold" Feet separator - Feet separator + Oinen bereizlea Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Kotetan oinen eta hazbeteen artean agertuko den aukerako katea @@ -1763,6 +1768,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Hautatu letra-tipo fitxategi bat @@ -2794,21 +2804,21 @@ Horrek huts egin dezake DXF R12 ondoko txantiloiekin. - + Top Goikoa - + Front Aurrekoa - + Side Aldea @@ -3240,14 +3250,14 @@ Saiatu DWG fitxategia zuriunerik gabeko eta ingelesezkoak ez diren karaktererik direktorio-bide batera, edo saiatu DGW bertsio zaharrago batean gordetzen. - + All Shapes must be coplanar Forma guztiek planokide izan behar dute - + Selected Shapes must define a plane Hautatutako formek plano bat definitu behar dute @@ -4673,22 +4683,27 @@ Amaierako angelua oinarriko angelua gehi kantitate hau izango da. Simetria-parametroa: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' eta'Fuse' propietateak gehitu dira + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type 'Tracking' propietate mota aldatu da - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Testu-forma: testuak ez du alanbrerik - + ShapeString: face creation failed for one character Testu-forma: aurpegiaren sorrerak huts egin du karaktere batengatik @@ -7021,52 +7036,57 @@ It is a list of strings; each element in the list will be displayed in its own l Kateen zerrenda bat da; zerrendako elementu bakoitza bere lerroan bistaratuko da. - + Text string Testu-katea - + Font file name Letra-tipoaren fitxategiaren izena - + Height of text Testuaren altuera - + Horizontal and vertical alignment Lerrokatze horizontal eta bertikala - + Height reference used for justification Justifikaziorako erabitako altuera-erreferentzia - + Keep left margin and leading white space when justification is left Mantendu ezkerreko marjina eta aurreko zuriunea justifikazioa ezkerrekoa denean - + Scale to ensure cap height is equal to size Eskalatu estalkiaren altuera bere tamainaren berdina izan dadin - + Inter-character spacing Karaktere arteko espazioa - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Bete letrak aurpegiekin - + Fuse faces if faces overlap, usually not required (can be very slow) Aurpegiak batzen ditu haiek gainjartzen badira, normalean ez da beharrezkoa (oso motela izan daiteke) diff --git a/src/Mod/Draft/Resources/translations/Draft_fi.qm b/src/Mod/Draft/Resources/translations/Draft_fi.qm index caa4f1cc82..5a8f38bf41 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_fi.qm and b/src/Mod/Draft/Resources/translations/Draft_fi.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_fi.ts b/src/Mod/Draft/Resources/translations/Draft_fi.ts index 75610db8f2..a76c1ebc14 100644 --- a/src/Mod/Draft/Resources/translations/Draft_fi.ts +++ b/src/Mod/Draft/Resources/translations/Draft_fi.ts @@ -737,6 +737,11 @@ Linkkimatriisi on tehokkaampi, kun luodaan useita kopioita, mutta sitä ei voi f Font file Fonttitiedosto + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1490,74 +1495,74 @@ Note that this is not fully supported, and many object will be not editable with Alternate SVG patterns location - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) - + Preserve colors of faces during downgrade/upgrade Preserve colors of faces during downgrade/upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) - + Preserve names of faces during downgrade/upgrade Preserve names of faces during downgrade/upgrade - + Drawing view line definitions Drawing view line definitions - + Dashed line definition Katkoviivan määritelmä - - - + + + An SVG linestyle definition An SVG linestyle definition - + Dashdot line definition pisteviivan määritelmä - + Dotted line definition Pilkutetun viivan määritelmä @@ -1754,12 +1759,12 @@ such as "Arial:Bold" Feet separator - Feet separator + Jalkamitan erotin Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Mitoissa näkyvä valinnainen merkkijono jalkojen ja tuumien välillä @@ -1773,6 +1778,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Valitse fonttitiedosto @@ -2807,21 +2817,21 @@ This might fail for post DXF R12 templates. - + Top Yläpuoli - + Front Etupuoli - + Side Side @@ -3253,14 +3263,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4686,22 +4696,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7033,52 +7048,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Tekstin merkkijono - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_fr.qm b/src/Mod/Draft/Resources/translations/Draft_fr.qm index 38f7dceef9..271a637d39 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_fr.qm and b/src/Mod/Draft/Resources/translations/Draft_fr.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_fr.ts b/src/Mod/Draft/Resources/translations/Draft_fr.ts index 3c6d93404b..233a645266 100644 --- a/src/Mod/Draft/Resources/translations/Draft_fr.ts +++ b/src/Mod/Draft/Resources/translations/Draft_fr.ts @@ -148,7 +148,7 @@ The color of lines and arrows - La couleur des lignes et flèches + La couleur des lignes et des flèches @@ -214,7 +214,7 @@ If it is checked it will show the unit next to the dimension value - Si cette case est cochée, l'unité sera indiquée à côté de la valeur de la dimension + Si cette case est cochée, l'unité sera indiquée à côté de la valeur de la dimension. @@ -258,7 +258,7 @@ If it is checked it will display the dimension line - Si cette case est cochée, la ligne des dimensions sera affichée + Si cette case est cochée, la ligne des dimensions sera affichée. @@ -423,7 +423,7 @@ Changer la direction de l’axe lui-même dans l’éditeur de propriété. If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. - Si coché, les objets résultants dans le réseau seront fusionnés s’ils se touchent. + Si cette case est cochée, les objets résultants dans le réseau seront fusionnés s’ils se touchent. Ceci ne fonctionne que si "Réseau lié" est désactivé. @@ -435,8 +435,8 @@ Ceci ne fonctionne que si "Réseau lié" est désactivé. If checked, the resulting object will be a "Link array" instead of a regular array. A Link array is more efficient when creating multiple copies, but it cannot be fused together. - Si coché, l'objet résultant sera un "Réseau lié" au lieu d'un réseau normal. -Un réseau lié est plus efficace lors de la création de plusieurs copies, mais il ne peut pas être fusionné. + Si cette case est cochée, l'objet résultant sera un "Réseau lié" au lieu d'un réseau normal. +Un réseau lié est plus efficace lors de la création de plusieurs copies mais il ne peut pas être fusionné. @@ -555,7 +555,7 @@ Les valeurs négatives se traduiront par des copies produites dans la direction If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. - Si coché, les objets résultants dans le réseau seront fusionnés s’ils se touchent. + Si cette case est cochée, les objets résultants dans le réseau seront fusionnés s’ils se touchent. Ceci ne fonctionne que si "Réseau lié" est désactivé. @@ -567,8 +567,8 @@ Ceci ne fonctionne que si "Réseau lié" est désactivé. If checked, the resulting object will be a "Link array" instead of a regular array. A Link array is more efficient when creating multiple copies, but it cannot be fused together. - Si coché, l'objet résultant sera un "Réseau lié" au lieu d'un réseau normal. -Un réseau lié est plus efficace lors de la création de plusieurs copies, mais il ne peut pas être fusionné. + Si la case est cochée, l'objet résultant sera un "Réseau lié" au lieu d'un réseau normal. +Un réseau lié est plus efficace lors de la création de plusieurs copies mais il ne peut pas être fusionné. @@ -652,7 +652,7 @@ Changer la direction de l’axe lui-même dans l’éditeur de propriété. If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. - Si coché, les objets résultants dans le réseau seront fusionnés s’ils se touchent. + Si cette case est cochée, les objets résultants dans le réseau seront fusionnés s’ils se touchent. Ceci ne fonctionne que si "Réseau lié" est désactivé. @@ -664,7 +664,7 @@ Ceci ne fonctionne que si "Réseau lié" est désactivé. If checked, the resulting object will be a "Link array" instead of a regular array. A Link array is more efficient when creating multiple copies, but it cannot be fused together. - Si coché, l'objet résultant sera un "Réseau lié" au lieu d'un réseau normal. + Si cette case est cochée, l'objet résultant sera un "Réseau lié" au lieu d'un réseau normal. Un réseau lié est plus efficace lors de la création de plusieurs copies mais il ne peut pas être fusionné. @@ -737,6 +737,11 @@ Un réseau lié est plus efficace lors de la création de plusieurs copies mais Font file Fichier de police + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -824,8 +829,7 @@ des boutons ci-dessus If this is selected, the working plane will be centered on the current view when pressing one of the buttons above - Si ceci est sélectionné, le plan de travail sera -centré sur la vue en cours en appuyant sur un + Si ceci est sélectionné, le plan de travail sera centré sur la vue en cours en appuyant sur un des boutons ci-dessus @@ -894,9 +898,8 @@ sera déplacé au centre de la vue The distance at which a point can be snapped to when approaching the mouse. You can also change this value by using the [ and ] keys while drawing - La distance à laquelle un point peut être aimanté -en approchant la souris. Vous pouvez également modifier cette valeur -en utilisant les touches [ et ] lors du dessin + Distance à laquelle un point peut être aimanté lorsqu'on approche la souris. +Vous pouvez également modifier cette valeur en utilisant les touches [ et ] pendant que vous dessinez. @@ -1142,7 +1145,7 @@ en utilisant les touches [ et ] lors du dessin Tick - Oblique + Cocher @@ -1295,7 +1298,8 @@ en utilisant les touches [ et ] lors du dessin The number of decimals in internal coordinates operations (for ex. 3 = 0.001). Values between 6 and 8 are usually considered the best trade-off among FreeCAD users. - Nombre de décimales pour les opérations internes sur les coordonnées (par ex. 3 = 0,001). Les valeurs entre 6 et 8 sont habituellement considérée comme le meilleurs compromis par les utilisateurs de FreeCAD. + Nombre de décimales pour les opérations internes sur les coordonnées (par ex. 3 = 0,001). +Les valeurs entre 6 et 8 sont habituellement considérée comme le meilleurs compromis par les utilisateurs de FreeCAD. @@ -1307,7 +1311,8 @@ en utilisant les touches [ et ] lors du dessin This is the value used by functions that use a tolerance. Values with differences below this value will be treated as same. This value will be obsoleted soon so the precision level above controls both. Ceci est la valeur utilisée par les fonction qui utilisent une tolérance. -Les valeurs ayant des différences inférieures à cette valeur sont considérées comme identiques. Cette valeur sera bientôt rendue obsolète afin que le niveau de précision ci-dessus les contrôle toutes deux. +Les valeurs ayant des différences inférieures à cette valeur sont considérées comme identiques. +Cette valeur sera bientôt rendue obsolète afin que le niveau de précision ci-dessus les contrôle toutes deux. @@ -1328,8 +1333,8 @@ Les valeurs ayant des différences inférieures à cette valeur sont considéré When drawing lines, set focus on Length instead of X coordinate. This allows to point the direction and type the distance. - Lors du dessin de lignes, définir l’accent sur la Longueur plutôt que sur les coordonnées X. -Ceci permet de pointer la direction et d’entrer la distance. + Lorsque vous dessinez des lignes, mettez l'accent sur la longueur plutôt que sur la coordonnée X. +Cela permet d'indiquer la direction et de saisir la distance. @@ -1351,7 +1356,8 @@ Si cette option est cochée, les objets de base seront sélectionnés à la plac If this option is set, when creating Draft objects on top of an existing face of another object, the "Support" property of the Draft object will be set to the base object. This was the standard behaviour before FreeCAD 0.19 - Si cette option est définie, lors de la création d'objets Draft sur une face existante d'un autre objet, la propriété "Support" de l'objet Draft sera définie selon l'objet de base. C'est la comportement standard avant FreeCAD 0.19 + Si cette option est activée, lors de la création d'objets Draft sur une face existante d'un autre objet, +la propriété "Support" de l'objet Draft sera définie sur l'objet de base. C'était le comportement standard avant FreeCAD 0.19. @@ -1362,7 +1368,8 @@ Si cette option est cochée, les objets de base seront sélectionnés à la plac If this is checked, objects will appear as filled by default. Otherwise, they will appear as wireframe - Si cette case est cochée, les objets apparaîtront comme rempli par défaut. Dans le cas contraire, ils apparaîtront comme filaire + Si cette case est cochée, les objets apparaîtront comme rempli par défaut. +Dans le cas contraire, ils apparaîtront comme filaire. @@ -1374,7 +1381,7 @@ Otherwise, they will appear as wireframe If this is checked, copy mode will be kept across command, otherwise commands will always start in no-copy mode Si cette case est cochée, le mode copie sera conservé après la commande, -sinon les commandes démarreront toujours en mode sans copie +sinon les commandes démarreront toujours en mode sans copie. @@ -1386,7 +1393,8 @@ sinon les commandes démarreront toujours en mode sans copie Force Draft Tools to create Part primitives instead of Draft objects. Note that this is not fully supported, and many object will be not editable with Draft Modifiers. Forcer les outils Draft à créer des primitives Part au lieu d'objets Draft. -Notez que ce n'est pas entièrement supporté et que de nombreux objets ne seront pas modifiables avec les modificateurs de Draft. +Notez que ce n'est pas entièrement supporté et que de nombreux objets +ne seront pas modifiables avec les modificateurs de Draft. @@ -1396,7 +1404,7 @@ Notez que ce n'est pas entièrement supporté et que de nombreux objets ne seron Prefix labels of Clones with: - Préfixer les étiquettes des Clones avec : + Préfixer les étiquettes des clones avec : @@ -1476,7 +1484,7 @@ Notez que ce n'est pas entièrement supporté et que de nombreux objets ne seron If checked, a widget indicating the current working plane orientation appears during drawing operations - Si coché, un widget indicant l’orientation actuelle du plan de travail apparaît au cours des opérations de dessin + Si la case est cochée, un widget indicant l’orientation en cours du plan de travail apparaît au cours des opérations de dessin. @@ -1486,77 +1494,77 @@ Notez que ce n'est pas entièrement supporté et que de nombreux objets ne seron Alternate SVG patterns location - Emplacement des motifs SVG alternatifs + Emplacement d'autres motifs SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Ici, vous pouvez indiquer un répertoire avec des fichiers SVG personnalisés contenant des définitions de <pattern> à ajouter aux motifs standards - + SVG pattern resolution Résolution des motifs SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster La résolution pour dessiner les patrons. La valeur par défaut est 128. Des valeurs plus élevées donnent de meilleures résolutions, des valeurs plus basses rendent le dessin plus rapide - + SVG pattern default size Taille par défaut des motifs SVG - + The default size for SVG patterns Taille par défaut des motifs SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Cocher cette case si vous souhaitez préserver les couleurs des faces lorsque vous désagrégez et agrégez (uniquement splitFaces et makeShell) - + Preserve colors of faces during downgrade/upgrade Préserver les couleurs des faces lorsque vous désagrégez/agrégez - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Cocher cette case si vous voulez que les noms des faces dérivent du nom de l'objet d'origine et vice versa lorsque vous désagrégez et agrégez (uniquement splitFaces et makeShell) - + Preserve names of faces during downgrade/upgrade Préserver les noms des faces lorsque vous désagrégez/agrégez - + Drawing view line definitions Définitions des lignes de la vue du dessin - + Dashed line definition Définition des lignes avec tirets - - - + + + An SVG linestyle definition - Une définition de style de ligne SVG + Définition du style des lignes au format SVG - + Dashdot line definition Définition des lignes en point-tirets - + Dotted line definition Définition des lignes en pointillés @@ -1594,7 +1602,7 @@ comme "Arial:Bold" Font size - Taille de la police + Taille de police @@ -1691,7 +1699,7 @@ comme "Arial:Bold" Tick - Cocher + Oblique @@ -1756,12 +1764,12 @@ comme "Arial:Bold" Feet separator - Feet separator + Séparateur pour les pieds (unité) Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Chaîne optionnelle à afficher entre les valeurs en pieds et en pouces pour les dimensions @@ -1775,6 +1783,11 @@ comme "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Sélectionnez un fichier de police @@ -1957,7 +1970,7 @@ Vous pouvez également le faire manuellement en installant l'atelier "dxf_librar If unchecked, texts and mtexts won't be imported - Si non coché, les textes et les mtexts ne seront pas importés + Si cette case n'est pas cochée, les textes/méta-textes ne seront pas importés. @@ -1967,7 +1980,7 @@ Vous pouvez également le faire manuellement en installant l'atelier "dxf_librar If unchecked, points won't be imported - Si non coché, les points ne seront pas importés + Si cette case n'est pas cochée, les points ne seront pas importés. @@ -1977,7 +1990,7 @@ Vous pouvez également le faire manuellement en installant l'atelier "dxf_librar If checked, paper space objects will be imported too - Si cette case est cochée, les objets de l'espace papier seront également importés + Si cette case est cochée, les objets de l'espace papier seront également importés. @@ -2113,7 +2126,7 @@ au lieu de la taille qu'ils ont dans le document DXF If this is checked, DXF layers will be imported as Draft Layers - Si cette case est cochée, les calques DXF seront importés sous forme de calques + Si cette case est cochée, les calques DXF seront importés sous forme de calques de Draft. @@ -2190,12 +2203,12 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. Snapping - Accrochage + Aimantation If this is checked, snapping is activated without the need to press the snap mod key - Si cette case est cochée, l’aimantation est activée sans avoir à presser la touche du mode aimantation + Si cette case est cochée, l’aimantation est activée sans avoir à presser la touche du mode aimantation. @@ -2236,12 +2249,12 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. Snap mod - Mode d'accrochage + Mode d'aimantation The snap modifier key - La touche de modification d'accrochage + La touche de modification d'aimantation @@ -2256,17 +2269,17 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. If checked, the Snap toolbar will be shown whenever you use snapping - Si coché, la barre d'outils sautillante s'affichera chaque fois que vous utiliserez l'accrochage + Si cette case est cochée, la barre d'outils d'aimantation s'affichera chaque fois que vous utiliserez l'aimantation. Show Draft Snap toolbar - Montrer la barre d'outils d'accrochage + Montrer la barre d'outils d'aimantation Hide Draft snap toolbar after use - Masquer la barre d'outils d'accrochage après emploi + Masquer la barre d'outils d'aimantation de Draft après emploi. @@ -2276,7 +2289,7 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. If checked, a grid will appear when drawing - Si cette case est cochée, une grille apparaîtra lors du dessin + Si cette case est cochée, une grille apparaîtra lors du dessin. @@ -2286,7 +2299,7 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. If checked, the Draft grid will always be visible when the Draft workbench is active. Otherwise only when using a command - Si coché, la grille de Draft s'affichera toujours lorsque l'atelier Draft sera actif. Sinon, uniquement en effectuant une commande + Si cette case est cochée, la grille de Draft s'affichera toujours lorsque l'atelier Draft sera actif. Sinon, elle ne sera visible que lors de l'utilisation d'une commande. @@ -2296,7 +2309,7 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. If checked, an additional border is displayed around the grid, showing the main square size in the bottom left border - Si coché, une bordure supplémentaire est affichée autour de la grille, montrant la taille du carré principal dans la bordure inférieure gauche + Si la case est cochée, une bordure supplémentaire est affichée autour de la grille, montrant la taille du carré principal dans la bordure inférieure gauche. @@ -2306,7 +2319,7 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. <html><head/><body><p>If checked, the outline of a human figure is displayed at the bottom left corner of the grid. This option is only effective if the BIM workbench is installed and if &quot;Show grid border&quot; option is enabled.</p></body></html> - <html><head/><body><p>Si coché, le contour d'une figure humaine est affiché en bas à gauche de la grille. Cette option n'est active que si l'atelier BIM est installé et si l'option &quot;Afficher la bordure de la grille&quot; est activée.</p></body></html> + <html><head/><body><p>Si cette case est cochée, le contour d'une figure humaine est affiché en bas à gauche de la grille. Cette option n'est active que si l'atelier BIM est installé et si l'option &quot;Afficher la bordure de la grille&quot; est activée.</p></body></html> @@ -2471,7 +2484,7 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. Relative - Relative + Relatif @@ -2591,7 +2604,7 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. Cycle Snap - Fréquence d'aimantation + Priorité d'aimantation @@ -2806,21 +2819,21 @@ Ceci peut échouer avec les modèles ultérieurs à DXF R12. - + Top Haut  - + Front Devant - + Side Côté @@ -2951,7 +2964,8 @@ Décocher pour utiliser le système de coordonnées du plan de travail Check this if the object should appear as filled, otherwise it will appear as wireframe. Not available if Draft preference option 'Use Part Primitives' is enabled - Cocher ceci si l'objet doit apparaître comme rempli, sinon il apparaîtra comme filaire. Non disponible si l'option de préférence de Draft "Utiliser les primitives de Part" est activée + Cocher ceci si l'objet doit apparaître comme rempli, sinon il apparaîtra comme filaire. +Non disponible si l'option de préférence de Draft "Utiliser les primitives de Part" est activée. @@ -2966,12 +2980,12 @@ Not available if Draft preference option 'Use Part Primitives' is enabled If checked, command will not finish until you press the command button again - Si coché, la commande ne se terminera pas avant que vous appuyez à nouveau sur le bouton de commande + Si cette case est cochée, la commande ne se terminera pas avant que vous appuyez à nouveau sur le bouton de commande. If checked, an OCC-style offset will be performed instead of the classic offset - Si cette case est cochée, un décalage de type OCC sera effectué au lieu du décalage classique + Si cette case est cochée, un décalage de type OCC sera effectué au lieu du décalage classique. @@ -3026,7 +3040,7 @@ Not available if Draft preference option 'Use Part Primitives' is enabled If checked, objects will be copied instead of moved. Preferences -> Draft -> Global copy mode to keep this mode in next commands - Coché, les objets seront copiés plutôt que déplacés. Préférences-> Draft -> Paramètres généraux -> Mode de copie globale pour garder ce mode dans les prochaines commandes + Si cette case est cochée, les objets seront copiés plutôt que déplacés. Préférences-> Draft -> Paramètres généraux -> Mode de copie globale pour garder ce mode dans les prochaines commandes. @@ -3036,7 +3050,7 @@ Not available if Draft preference option 'Use Part Primitives' is enabled If checked, subelements will be modified instead of entire objects - Coché, les sous-éléments seront modifiés plutôt que les objets en entier + Si cette case est cochée, les sous-éléments seront modifiés plutôt que les objets en entier. @@ -3250,14 +3264,14 @@ or try saving to a lower DWG version. Essayez de déplacer le fichier DWG vers un chemin de répertoire sans espaces ni caractères non-anglophones, ou essayez de sauvegarder vers une version inférieure de DWG. - + All Shapes must be coplanar Toutes les formes doivent être coplanaires - + Selected Shapes must define a plane Les formes sélectionnées doivent définir un plan @@ -4680,22 +4694,27 @@ L'angle final sera l'angle de base plus cette quantité. Paramètre de symétrie : - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - a ajouté les propriétés "Justification", "JustificationReference", "KeepLeftMargin", "ScaleToSize" et "Fusion" + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type a changé le type de la propriété "Tracking" - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Formes à partir de texte : la chaîne de caractères n'a pas de polylignes - + ShapeString: face creation failed for one character Formes à partir de texte : la création de face a échoué pour un caractère @@ -5614,12 +5633,12 @@ Installer l’extension de la bibliothèque dxf manuellement depuis le menu Outi Draw style - Style de dessin + Style de représentation Line color - Couleur de la ligne + Couleur des lignes @@ -7028,52 +7047,57 @@ It is a list of strings; each element in the list will be displayed in its own l Il s'agit d'une liste de chaînes de caractères ; chaque élément de la liste sera affiché sur sa propre ligne. - + Text string Chaîne de texte - + Font file name Nom du fichier de police - + Height of text Hauteur du texte - + Horizontal and vertical alignment Alignement horizontal et vertical - + Height reference used for justification Hauteur de référence utilisée pour justifier - + Keep left margin and leading white space when justification is left Garder la marge gauche et l'espace blanc principal lorsque la justification est à gauche - + Scale to ensure cap height is equal to size Échelle pour s'assurer que la hauteur de la majuscule est égale à la taille - + Inter-character spacing Espacement entre les caractères - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Remplir des lettres avec des faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fusionner les faces si les faces se chevauchent, généralement non nécessaire (peut être très lent) @@ -7618,12 +7642,14 @@ Cette propriété est en lecture seule, car le nombre dépend des points contenu If this is True, only solid geometry is handled. This overrides the base object's Only Solids property - Si ceci est vrai, seule la géométrie solide est prise en compte. Ceci écrase la propriété Solids uniquement de l'objet de base + Si ceci est vrai, seule la géométrie solide est prise en compte. +Ceci écrase la propriété Solids uniquement de l'objet de base. If this is True, the contents are clipped to the borders of the section plane, if applicable. This overrides the base object's Clip property - Si ceci est vrai, les contenus sont coupés aux bordures du plan de coupe, si possible. Ceci écrase la propriété Clip de l'objet de base + Si ceci est vrai, les contenus sont coupés aux bordures du plan de coupe, si possible. +Ceci écrase la propriété Clip de l'objet de base. @@ -7985,7 +8011,7 @@ des propriétés du "premier angle" et du "dernier angle". Force sync pattern placements even when array elements are expanded - Forcer le placement des motifs de synchronisation même lorsque les éléments du réseau sont étendus + Forcer le placement des motifs de synchronisation même lorsque les éléments du réseau sont étendus. @@ -8032,7 +8058,7 @@ des propriétés du "premier angle" et du "dernier angle". Line width - Largeur de ligne + Épaisseur de trait @@ -8057,7 +8083,7 @@ des propriétés du "premier angle" et du "dernier angle". If it is true, the objects contained within this layer will adopt the shape color of the layer - Si ceci est vrai, les objets contenus dans ce calque adopteront la couleur de forme du calque + Si ceci est vrai, les objets contenus dans ce calque adopteront la couleur de forme du calque. @@ -8102,7 +8128,7 @@ des propriétés du "premier angle" et du "dernier angle". Font size - Taille de police + Taille de la police diff --git a/src/Mod/Draft/Resources/translations/Draft_gl.qm b/src/Mod/Draft/Resources/translations/Draft_gl.qm index 2a0b3235c9..d033e28847 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_gl.qm and b/src/Mod/Draft/Resources/translations/Draft_gl.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_gl.ts b/src/Mod/Draft/Resources/translations/Draft_gl.ts index 8c89f1ae5b..a58b9e8e80 100644 --- a/src/Mod/Draft/Resources/translations/Draft_gl.ts +++ b/src/Mod/Draft/Resources/translations/Draft_gl.ts @@ -737,6 +737,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Ficheiro de fontes + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1490,74 +1495,74 @@ Note that this is not fully supported, and many object will be not editable with Alternate SVG patterns location - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Marca isto se queres preservar as cores das faces ao facer degradado e promover (splitFaces e makeShell só) - + Preserve colors of faces during downgrade/upgrade Preservar as cores das faces durante rebaixamento/actualización - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Marca isto se queres que os nomes da face ou derivados dende obxectos orixinais e viceversa, en degradados/promover (só splitFaces e makeShell) - + Preserve names of faces during downgrade/upgrade Preserva os nomes das faces durante o rebaixamento/actualización - + Drawing view line definitions Definicións da liña na vista de debuxo - + Dashed line definition Definición da liña descontinua - - - + + + An SVG linestyle definition SVG definición de estilo de liña - + Dashdot line definition Definición de liña a trazo e punto - + Dotted line definition Definición de liña de puntos @@ -1773,6 +1778,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Escolme un ficheiro de fontes @@ -2807,21 +2817,21 @@ This might fail for post DXF R12 templates. - + Top Enriba - + Front Fronte - + Side Lado @@ -3253,14 +3263,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4686,22 +4696,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7033,52 +7048,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Cadea de texto - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_hr.qm b/src/Mod/Draft/Resources/translations/Draft_hr.qm index 9a679bada1..b07e96da89 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_hr.qm and b/src/Mod/Draft/Resources/translations/Draft_hr.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_hr.ts b/src/Mod/Draft/Resources/translations/Draft_hr.ts index 2bb57ffd1e..e7d6e4f307 100644 --- a/src/Mod/Draft/Resources/translations/Draft_hr.ts +++ b/src/Mod/Draft/Resources/translations/Draft_hr.ts @@ -575,8 +575,7 @@ Negativne vrijednosti rezultirat će kopijom proizvedenom u negativnom smjeru. If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. Ako je označeno, rezultirajući objekti u matrici bit će spojeni ako se dodiruju. -Ovo djeluje samo ako je "Povezana matrica" isključen. - +Ovo djeluje samo ako je "Povezana matrica" isključen. @@ -588,8 +587,7 @@ Ovo djeluje samo ako je "Povezana matrica" isključen. If checked, the resulting object will be a "Link array" instead of a regular array. A Link array is more efficient when creating multiple copies, but it cannot be fused together. Ako je označeno, rezultirajući objekt bit će "Povezana matrica" umjesto uobičajenog polja. -Povezana matrica efikasnija je pri stvaranju više kopija, ali ne može ih se spojiti zajedno. - +Povezana matrica efikasnija je pri stvaranju više kopija, ali ne može ih se spojiti zajedno. @@ -677,7 +675,8 @@ Promijenite smjer same osi u uređivaču svojstava. If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. Ako je označeno, rezultirajući objekti u matrici bit će spojeni ako se dodiruju. -Ovo djeluje samo ako je "Povezana matrica" isključen. +Ovo djeluje samo ako je "Povezana matrica" isključen. + @@ -689,7 +688,8 @@ Ovo djeluje samo ako je "Povezana matrica" isključen. If checked, the resulting object will be a "Link array" instead of a regular array. A Link array is more efficient when creating multiple copies, but it cannot be fused together. Ako je označeno, rezultirajući objekt bit će "Povezana matrica" umjesto uobičajenog polja. -Povezana matrica efikasnija je pri stvaranju više kopija, ali ne može ih se spojiti zajedno. +Povezana matrica efikasnija je pri stvaranju više kopija, ali ne može ih se spojiti zajedno. + @@ -761,6 +761,11 @@ Povezana matrica efikasnija je pri stvaranju više kopija, ali ne može ih se sp Font file Datoteka pisma + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1532,76 +1537,76 @@ Imajte na umu da to nije u potpunosti podržano i mnogi objekti neće se moći u Položaj alternativnih SVG uzoraka - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Ovdje možete odrediti direktorij s prilagođenim SVG datotekama koje sadrže definicije <pattern> koje će se dodati standardnim uzorcima - + SVG pattern resolution Rezolucija SVG uzorka - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Razlučivost za crtanje uzoraka. Zadana vrijednost je 128. Više vrijednosti daju bolje rezolucije, a niže vrijednosti čine brže crtanje - + SVG pattern default size Zadana veličina SVG uzorka - + The default size for SVG patterns Zadana veličina za SVG uzorak - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Označite za očuvanje boje naličja za vrijeme vraćanja na staru verziju i nadogradnje (razdjeli lica i napravi samo ljuske) - + Preserve colors of faces during downgrade/upgrade Sačuvaj boje naličja za vrijeme vraćanja na staru verziju/nadogradnje - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Označite to ako želite da imena lica potječu iz izvornog imena objekta i obrnuto dok radite vraćanje na stariju verziju / nadogradnju (samo splitFaces i makeShell) - + Preserve names of faces during downgrade/upgrade Sačuvaj imena naličja za vrijeme vraćanja na staru verziju/nadogradnje - + Drawing view line definitions Definicije vidljivih linija crteža - + Dashed line definition Iscrtkana linija definicija - - - + + + An SVG linestyle definition SVG definicija stila linije - + Dashdot line definition Crtica-točka definicija linije - + Dotted line definition Točkasta linija definicija @@ -1820,6 +1825,11 @@ kao što su "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Odaberite datoteku pisma @@ -2871,21 +2881,21 @@ Ovo možda neće uspjeti za predloške DXF R12. - + Top Gore - + Front Ispred - + Side Strana @@ -3318,14 +3328,14 @@ Pokušajte premjestiti DWG datoteku na put direktorija bez razmaka i neengleskih ili pokušajte spremiti u nižu DWG verziju. - + All Shapes must be coplanar Svi oblici moraju biti komplanarni - + Selected Shapes must define a plane Odabrani oblici moraju definirati ravninu @@ -4757,22 +4767,27 @@ Konačni kut bit će osnovni kut plus ovaj iznos. Parametar simetrije: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Tekstualni Oblik: slova su bez linija - + ShapeString: face creation failed for one character Oblik-tekstom: stvaranje lica za jedan znak nije uspjelo @@ -7117,52 +7132,57 @@ It is a list of strings; each element in the list will be displayed in its own l To je niz tekstova; avaki element u listi će biti prikazan u vlastitoj liniji. - + Text string Slova riječi - + Font file name Ime datoteke pisma - + Height of text Visina teksta - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Unutrašnji razmak između znakova - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Ispunite slova sa površinama - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_hu.qm b/src/Mod/Draft/Resources/translations/Draft_hu.qm index 85bd505737..f17217276d 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_hu.qm and b/src/Mod/Draft/Resources/translations/Draft_hu.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_hu.ts b/src/Mod/Draft/Resources/translations/Draft_hu.ts index 7644a6e6c3..3f6cae8074 100644 --- a/src/Mod/Draft/Resources/translations/Draft_hu.ts +++ b/src/Mod/Draft/Resources/translations/Draft_hu.ts @@ -737,6 +737,11 @@ A elrendezés csatolás hatékonyabb több példány létrehozásakor, de nem eg Font file Betűtípusfájl + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1162,7 +1167,7 @@ módosíthatja rajzolás közben Arrow size - Nyíl mérete + Nyíl méret @@ -1491,74 +1496,74 @@ Ne feledje, hogy ez nem teljes mértékben támogatott, és sok tárgy nem szerk Alternatív SVG minták helye - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Itt megadhat egy könyvtárat egyéni SVG fájlokkal, amelyek <pattern> szabványos mintákhoz hozzáadandó definíciókat tartalmaznak - + SVG pattern resolution SVG minta felbontása - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster A felbontás a minta rajzolásához. Az alapértelmezett érték 128. A magasabb értékek jobb felbontást adnak, az alacsonyabb értékek gyorsabbak - + SVG pattern default size SVG minta alapértelmezett mérete - + The default size for SVG patterns Az SVG minták alapértelmezett mérete - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Jelölje be, ha meg szeretné őrizni a felületek színeit azok visszaállításánál és frissítésénél (csak splitFaces és makeShell) - + Preserve colors of faces during downgrade/upgrade Az felületi színek megőrzése visszaállítás/frissítés során - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Jelölje ezt, ha azt szeretné, hogy a felület nevek az objektum nevéből származzanak, és fordítva, a visszaállítás/frissítés esetén (csak splitFaces és makeShell) - + Preserve names of faces during downgrade/upgrade A felület neveinek megőrzése visszaállítás/frissítés során - + Drawing view line definitions Rajz nézet egyenes meghatározásai - + Dashed line definition Szaggatott egyenes meghatározása - - - + + + An SVG linestyle definition Egy SVG vonalstílus meghatározása - + Dashdot line definition Pont-vonal egyenes meghatározása - + Dotted line definition Pontozott egyenes meghatározása @@ -1758,12 +1763,12 @@ mint a " Arial: Dőlt " Feet separator - Feet separator + Lábleválasztó Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + A méretekben a láb és hüvelyk értékek között megjelenő választható karakterlánc @@ -1777,6 +1782,11 @@ mint a " Arial: Dőlt " + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Válasszon ki egy betűtípus fájlt @@ -2811,21 +2821,21 @@ Ez sikertelen lehet a DXF R12 utáni sablonokon. - + Top Felülnézet - + Front Elölnézet - + Side Oldal @@ -3257,14 +3267,14 @@ Próbáld meg áthelyezni a DWG fájlt szóközök és nem angol karakterek nél vagy próbáld meg alacsonyabb DWG verzióra menteni. - + All Shapes must be coplanar Minden alakzatnak együtt kell lennie - + Selected Shapes must define a plane A kijelölt alakzatoknak síkot kell meghatároznia @@ -4690,22 +4700,27 @@ A végső szög lesz az alapszög plusz ennek összege. Szimmetria paraméter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - az 'Igazolás', 'Referenciaigazolás', 'Balmargókmegtartása', 'Méretreigazítás' és a 'Igazítás' tulajdonságok kerültek hozzáadásra + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type a 'Nyomonkövetés' tulajdonság típusa megváltozott - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: A karakterláncnak nincsenek dróthálói - + ShapeString: face creation failed for one character Alak a szövegből: a felület létrehozása sikertelen az egyik karakter esetében @@ -7035,52 +7050,57 @@ It is a list of strings; each element in the list will be displayed in its own l Ez egy karakter lista; a lista minden eleme a saját sorában jelenik meg. - + Text string Szöveglánc - + Font file name Betűtípus fájl név - + Height of text Szöveg magassága - + Horizontal and vertical alignment Vízszintes és függőleges igazítás - + Height reference used for justification Az igazoláshoz használt magassági referencia - + Keep left margin and leading white space when justification is left A bal oldali margó és a vezető fehér tér megtartása, ha az igazítás balra van állítva - + Scale to ensure cap height is equal to size Méretezés annak biztosítására, hogy a kupak magassága megegyezzen a mérettel - + Inter-character spacing Karakterek közötti távolság - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Betűk kitöltése felületekkel - + Fuse faces if faces overlap, usually not required (can be very slow) Átlapolt felületek egyesítése, általában nem szükségesek (nagyon lassú lehet) @@ -8158,7 +8178,7 @@ Használja az 'arch' kifejezést amerikai US arch jelölésének kikényszerít Arrow size - Nyíl méret + Nyíl mérete diff --git a/src/Mod/Draft/Resources/translations/Draft_id.qm b/src/Mod/Draft/Resources/translations/Draft_id.qm index aebd1e833a..3b08b32120 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_id.qm and b/src/Mod/Draft/Resources/translations/Draft_id.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_id.ts b/src/Mod/Draft/Resources/translations/Draft_id.ts index 41c81a9234..a2d3584e6c 100644 --- a/src/Mod/Draft/Resources/translations/Draft_id.ts +++ b/src/Mod/Draft/Resources/translations/Draft_id.ts @@ -727,6 +727,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Font file + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -951,12 +956,12 @@ value by using the [ and ] keys while drawing Line width - Lebar garis + Tebal garis px - px + piksel @@ -1480,74 +1485,74 @@ Note that this is not fully supported, and many object will be not editable with Alternate SVG patterns location - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) - + Preserve colors of faces during downgrade/upgrade Preserve colors of faces during downgrade/upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) - + Preserve names of faces during downgrade/upgrade Preserve names of faces during downgrade/upgrade - + Drawing view line definitions Menggambar definisi garis tampilan - + Dashed line definition Definisi garis putus-putus - - - + + + An SVG linestyle definition Definisi SVG linestyle - + Dashdot line definition Dashdot baris definisi - + Dotted line definition Definisi garis putus-putus @@ -1582,7 +1587,7 @@ such as "Arial:Bold" Font size - Ukuran huruf + Ukuran fonta @@ -1763,6 +1768,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Pilih file font @@ -2797,21 +2807,21 @@ This might fail for post DXF R12 templates. - + Top Puncak - + Front Depan - + Side Side @@ -3243,14 +3253,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4676,22 +4686,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7023,52 +7038,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Text string - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_it.qm b/src/Mod/Draft/Resources/translations/Draft_it.qm index df74aa0e33..340fc64b73 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_it.qm and b/src/Mod/Draft/Resources/translations/Draft_it.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_it.ts b/src/Mod/Draft/Resources/translations/Draft_it.ts index 8711027d93..64570e0f53 100644 --- a/src/Mod/Draft/Resources/translations/Draft_it.ts +++ b/src/Mod/Draft/Resources/translations/Draft_it.ts @@ -737,6 +737,11 @@ Una serie di link è più efficiente quando si creano più copie, ma non può es Font file Font file + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1490,74 +1495,74 @@ Notare che questo non è completamente supportato, e molti oggetti non saranno m Percorso alternativo per i Motivi SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Qui puoi specificare una directory con file SVG personalizzati contenenti definizioni di <pattern> da aggiungere ai modelli standard - + SVG pattern resolution Risoluzione modelli di tratteggio - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster La risoluzione in cui disegnare i motivi. Il valore predefinito è 128. Valori maggiori danno risoluzioni migliori, valori minori rendono più veloce il disegno - + SVG pattern default size Dimensione predefinita del modello di tratteggio - + The default size for SVG patterns La dimensione predefinita dei modelli di tratteggio - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Selezionare questa opzione se si desidera mantenere i colori delle facce quando si fa il declassamento e o la promozione (solo splitFaces e makeShell) - + Preserve colors of faces during downgrade/upgrade Preserva i colori delle facce durante il declassamento e la promozione - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Selezionare questa opzione se si desidera che i nomi delle faccia siano derivati dal nome dell'oggetto di origine e viceversa quando si fa il declassamento e la promozione (solo splitFaces e makeShell) - + Preserve names of faces during downgrade/upgrade Preserva i nomi delle facce durante il declassamento e la promozione - + Drawing view line definitions Definizioni della visualizzazione delle linee del disegno - + Dashed line definition Definizione della linea a tratti - - - + + + An SVG linestyle definition Una definizione di stile delle linee nel formato SVG - + Dashdot line definition Definizione della linea tratto-punto - + Dotted line definition Definizione della linea punteggiata @@ -1774,6 +1779,11 @@ Può essere un nome di carattere come "Arial", uno stile predefinito come "sans" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Seleziona un file di font @@ -2808,21 +2818,21 @@ Questo potrebbe fallire per i modelli DXF dopo la versione R12. - + Top Dall'alto - + Front Di fronte - + Side Lato @@ -3251,14 +3261,14 @@ or try saving to a lower DWG version. Errore durante la conversione del DWG. Provare a spostare il file DWG in una cartella con nome senza spazi e caratteri particolari, o provare a salvare in una versione DWG precedente. - + All Shapes must be coplanar Tutte le Forme devono essere complanari - + Selected Shapes must define a plane Le Forme Selezionate devono definire un piano @@ -4681,22 +4691,27 @@ L'angolo finale sarà l'angolo base più questa quantità. Parametro simmetria: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Forma da testo: la stringa non ha polilinee - + ShapeString: face creation failed for one character ShapeString: creazione della faccia fallita per un carattere @@ -7025,52 +7040,57 @@ It is a list of strings; each element in the list will be displayed in its own l È una lista di stringhe; ogni elemento nella lista sarà visualizzato nella propria riga. - + Text string Stringa di testo - + Font file name Nome del font - + Height of text Altezza del testo - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Spaziatura tra i caratteri - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Riempi le lettere con le facce - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_ja.qm b/src/Mod/Draft/Resources/translations/Draft_ja.qm index 78f808188f..72259f7dae 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_ja.qm and b/src/Mod/Draft/Resources/translations/Draft_ja.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_ja.ts b/src/Mod/Draft/Resources/translations/Draft_ja.ts index a26f7aaf9d..2125e16832 100644 --- a/src/Mod/Draft/Resources/translations/Draft_ja.ts +++ b/src/Mod/Draft/Resources/translations/Draft_ja.ts @@ -737,6 +737,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file フォント ファイル + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1481,74 +1486,74 @@ Note that this is not fully supported, and many object will be not editable with 代替 SVG パターンの位置 - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns ここで標準パターンに追加する <pattern> 定義を含むカスタム SVG ファイルがあるディレクトリを指定できます。 - + SVG pattern resolution SVG パターンの解像度 - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster パターンを描画する解像度。デフォルト値は128です。値が大きいほど解像度が向上し、値が小さくなると描画が速くなります。 - + SVG pattern default size SVG パターンのデフォルトサイズ - + The default size for SVG patterns SVG パターンのデフォルトサイズ - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) ダウングレードやアップグレードで面の色を維持したい場合はチェック（splitFaces と makeShell のみ） - + Preserve colors of faces during downgrade/upgrade ダウングレード/アップグレードで面の色を維持 - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) 元となるオブジェクトの名前から面の名前をつけたい場合、ダウングレード/アップグレード実行（splitFaces と makeShell のみ）でその逆を行いたい場合はチェック - + Preserve names of faces during downgrade/upgrade ダウングレード/アップグレードで面の名前を維持 - + Drawing view line definitions ドローイング・ビュー・ラインの定義 - + Dashed line definition 破線の定義 - - - + + + An SVG linestyle definition SVGのラインスタイルの定義 - + Dashdot line definition 鎖線の定義 - + Dotted line definition 点線の定義 @@ -1765,6 +1770,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file フォントファイルを選択 @@ -2794,21 +2804,21 @@ This might fail for post DXF R12 templates. - + Top 上面図 - + Front 正面図 - + Side サイド @@ -3240,14 +3250,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4673,22 +4683,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7020,52 +7035,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string テキスト文字列 - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_ka.qm b/src/Mod/Draft/Resources/translations/Draft_ka.qm index 72dcd82c39..6930210730 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_ka.qm and b/src/Mod/Draft/Resources/translations/Draft_ka.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_ka.ts b/src/Mod/Draft/Resources/translations/Draft_ka.ts index 97be80d7f8..38ba1615a1 100644 --- a/src/Mod/Draft/Resources/translations/Draft_ka.ts +++ b/src/Mod/Draft/Resources/translations/Draft_ka.ts @@ -555,8 +555,8 @@ Negative values will result in copies produced in the negative direction. If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. - თუ ჩართულია, მოხდება მასივში მიღებული ობიექტების შერწყმა, თუ ისინი ერთმანეთს ეხებიან. -მუშაობს მხოლოდ მაშინ, თუ "ბმულის მასივი" გამორთულია. + თუ ჩართულია, მიღებული ობიექტები მასივში შეერთდება, თუ ისინი ერთმანეთს ეხებიან. +ეს მხოლოდ მაშინ მუშაობს, თუ "მასივების მიბმა" გამორთულია. @@ -573,7 +573,7 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Link array - ბმულების მასივი + მასივების მიბმა @@ -652,13 +652,13 @@ Change the direction of the axis itself in the property editor. If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. - თუ ჩართულია, მიღებული ობიექტები მასივში შეერთდება, თუ ისინი ერთმანეთს ეხებიან. -ეს მხოლოდ მაშინ მუშაობს, თუ "მასივების მიბმა" გამორთულია. + თუ ჩართულია, მოხდება მასივში მიღებული ობიექტების შერწყმა, თუ ისინი ერთმანეთს ეხებიან. +მუშაობს მხოლოდ მაშინ, თუ "ბმულის მასივი" გამორთულია. Fuse - შერწყმა + შეერთება @@ -670,7 +670,7 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Link array - მასივების მიბმა + ბმულების მასივი @@ -737,6 +737,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file ფონტის ფაილი + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -966,7 +971,7 @@ value by using the [ and ] keys while drawing px - px + პქს @@ -1082,7 +1087,7 @@ value by using the [ and ] keys while drawing Text spacing - სიმბოლოებს შორის დაშორება + ტექსტში დაშორებები @@ -1490,74 +1495,74 @@ Note that this is not fully supported, and many object will be not editable with SVG შაბლონების ალტერნატიული მდებარეობა - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns შეგიძლიათ მიუთითოთ საქაღალდე მორგებული SVG ფაილებით, რომლებიც შეიცავენ <pattern>-ის აღწერას, რომელიც სტანდარტულ შაბლონებს დაემატება - + SVG pattern resolution SVG შაბლონის გარჩევადობა - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster შაბლონების დახატვის გარჩევადობა. ნაგულისხმევი მნიშვნელობა 128-ა. მაღალი მნიშვნელობები იძლევა უკეთეს გარჩევადობას, ქვედა მნიშვნელობები აჩქარებს დახატვას - + SVG pattern default size SVG შაბლონების ნაგულისხმევი ზომა - + The default size for SVG patterns SVG შაბლონების ნაგულისხმევი ზომა - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) ჩართეთ, თუ გნებავთ გნებავთ შეინარჩუნოთ ზედაპირების ფერები გაყოფისა და გაერთიანების დროს (მხოლოდ splitFaces და makeShell) - + Preserve colors of faces during downgrade/upgrade დაშლა/შეერთებისას ზედაპირების ფერის შენარჩუნება - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) ჩართეთ, თუ გნებავთ, რომ განახლება/ვერსიის დაწევის ოპერაციის შესრულების დროს ზედაპირის სახელები ნაწარმოები იყოს მისი საწყისი ობიექტის სახელებიდან და პირიქით (მხოლოდ splitFaces და makeShell) - + Preserve names of faces during downgrade/upgrade დაშლა/აწყობისას ზედაპირების სახელების შენახვა - + Drawing view line definitions სახაზავი ხაზების განსაზღვრებები - + Dashed line definition პუნქტირიანი ხაზის განსაზღვრა - - - + + + An SVG linestyle definition SVG ხაზების სტილის აღწერა - + Dashdot line definition შტრიხპუნქტირიანი ხაზის აღწერა - + Dotted line definition წერტილებიანი ხაზისგანსაზთვრა @@ -1730,7 +1735,7 @@ such as "Arial:Bold" Text spacing - ტექსტში დაშორებები + სიმბოლოებს შორის დაშორება @@ -1755,12 +1760,12 @@ such as "Arial:Bold" Feet separator - Feet separator + ფუტების გამყოფი Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + არასავალდებული სტრიქონი, რომელიც ზომებში ფუტებსა და დუიმებს შრის გამოჩნდება @@ -1774,6 +1779,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file აირჩიეთ ფონტის ფაილი @@ -2805,21 +2815,21 @@ This might fail for post DXF R12 templates. - + Top თავზე - + Front წინა - + Side გვერდი @@ -3248,14 +3258,14 @@ or try saving to a lower DWG version. შეცდომა DWG-ის კონვერტაციის დროს. სცადეთ გადაიტანოთ DWG ფაილი დირექტორიაში სახელით ჰარეეების და არაინგლისური სიმბოლოების გარეშე, ან სცადეთ შენახვა DWG-ის ფორმატის უფრო ძველ ვერსიაში. - + All Shapes must be coplanar ყველა მოხაზულობა კომპლანარული უნდა იყოს - + Selected Shapes must define a plane მონიშნული მოხაზულობები სიბრტყეს უნდა აღწერდნენ @@ -4680,22 +4690,27 @@ The final angle will be the base angle plus this amount. სიმეტრიის პარამეტრი: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - დაემატა თვისებები 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type თვისების ტიპი 'ტრეკინგი' შეიცვალა - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: სტრიქონს პოლიხაზები არ გააჩნია - + ShapeString: face creation failed for one character ShapeString: ზედაპირის შექმნის შეცდომა ერთი სიმბოლოსთვის @@ -7024,52 +7039,57 @@ It is a list of strings; each element in the list will be displayed in its own l ეს არის სტრიქონების სია; ამ სიის თითოეული ელემენტი გამოჩნდება ახალ სტრიქონში. - + Text string ტექსტური სტრიქონი - + Font file name ფონტის ფაილის სახელი - + Height of text ტექსტის სიმაღლე - + Horizontal and vertical alignment ჰორიზონტალური და ვერტიკალური სწორება - + Height reference used for justification გასწორებისთვის გამოყენებული სიმაღლის მიმართვა - + Keep left margin and leading white space when justification is left მარცხენა საზღვრისა და დასაწყისში არსებული გამოტოვებების შენარჩუნება, როცა სწორება მარცხნივ ხდება - + Scale to ensure cap height is equal to size მასშტაბი დაფარვის სიმაღლის ზომასთან ტოლობაში დასარწმუნებლად - + Inter-character spacing სიმბოლოებს შორის დაცილება - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces სიმბოლოების ზედაპირებით შევსება - + Fuse faces if faces overlap, usually not required (can be very slow) ზედაპირების შერწყმა, თუ ისინი იკვეთებიან. ჩვეულებრივ, საჭირო არაა (შეიძლება ძალიან ნელი იყოს) diff --git a/src/Mod/Draft/Resources/translations/Draft_ko.qm b/src/Mod/Draft/Resources/translations/Draft_ko.qm index b8319d4368..29117faeae 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_ko.qm and b/src/Mod/Draft/Resources/translations/Draft_ko.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_ko.ts b/src/Mod/Draft/Resources/translations/Draft_ko.ts index aabefe5331..ebde0234ab 100644 --- a/src/Mod/Draft/Resources/translations/Draft_ko.ts +++ b/src/Mod/Draft/Resources/translations/Draft_ko.ts @@ -159,13 +159,13 @@ The distance the dimension line is additionally extended - The distance the dimension line is additionally extended + 치수선의 길이가 늘어 났습니다. The distance the extension lines are additionally extended beyond the dimension line - The distance the extension lines are additionally extended beyond the dimension line + 치수선 보조선들의 길이가 치수선 위치를 넘어 가도록 증가 되었습니다 @@ -176,7 +176,7 @@ The line spacing for multi-line texts and labels (relative to the font size) - The line spacing for multi-line texts and labels (relative to the font size) + 여러행 글자 또는 레이블에서 문자행들 간격(폰트 크기에 비례한 적용) @@ -203,12 +203,12 @@ A multiplier factor that affects the size of texts and markers - A multiplier factor that affects the size of texts and markers + 텍스트 나 마커 들의 크기 에 영향을 주는 축척계수 Scale multiplier - Scale multiplier + 축척 계수 @@ -247,7 +247,7 @@ The distance between the dimension text and the dimension line - The distance between the dimension text and the dimension line + 치수선과 치수문자 사이의 간격 @@ -293,7 +293,7 @@ Tick-2 - Tick-2 + 확인-2 @@ -303,7 +303,7 @@ Dimension details - Dimension details + 치수 상세 @@ -737,6 +737,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file 글꼴 파일 + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1143,7 +1148,7 @@ value by using the [ and ] keys while drawing Tick-2 - Tick-2 + 확인-2 @@ -1486,74 +1491,74 @@ Note that this is not fully supported, and many object will be not editable with 대체 SVG 패턴 위치 - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns 여기서 표준 패턴에 추가할 <패턴> 정의를 포함하는 사용자 정의 SVG 파일이 있는 디렉토리를 지정할 수 있습니다. - + SVG pattern resolution SVG 패턴 해상도 - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster 패턴을 그릴 해상도입니다. 기본값은 128입니다. 값이 클수록 해상도가 향상되고 값이 낮을수록 그리는 속도가 빨라집니다. - + SVG pattern default size SVG 패턴 기본 크기 - + The default size for SVG patterns SVG 패턴의 기본 크기 - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) 다운그레이드 및 업그레이드를 수행하는 동안 면의 색상을 유지하려면 이 항목을 선택합니다(splitFaces 및 makeShell만 해당). - + Preserve colors of faces during downgrade/upgrade Preserve colors of faces during downgrade/upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) - + Preserve names of faces during downgrade/upgrade Preserve names of faces during downgrade/upgrade - + Drawing view line definitions Drawing view line definitions - + Dashed line definition 점선 정의 - - - + + + An SVG linestyle definition SVG 라인 스타일 정의 - + Dashdot line definition 대시도트 선 정의 - + Dotted line definition 점선 정의 @@ -1690,7 +1695,7 @@ such as "Arial:Bold" Tick-2 - Tick-2 + 확인-2 @@ -1769,6 +1774,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file 글꼴 파일을 선택 @@ -2803,21 +2813,21 @@ DXF R12 이후 템플릿 에서는 실패할 수도 있습니다. - + Top 평면 - + Front 정면 - + Side Side @@ -3249,14 +3259,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4682,22 +4692,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7029,52 +7044,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Text string - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_nl.qm b/src/Mod/Draft/Resources/translations/Draft_nl.qm index ee4717fdfc..ddd091d6c7 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_nl.qm and b/src/Mod/Draft/Resources/translations/Draft_nl.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_nl.ts b/src/Mod/Draft/Resources/translations/Draft_nl.ts index 9a02cbdbf0..b9f9a0fe03 100644 --- a/src/Mod/Draft/Resources/translations/Draft_nl.ts +++ b/src/Mod/Draft/Resources/translations/Draft_nl.ts @@ -737,6 +737,11 @@ Een linkreeks is efficiënter bij het maken van meerdere kopieën, maar kan niet Font file Lettertypebestand + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1489,74 +1494,74 @@ Let op dat dit niet volledig ondersteund wordt en veel objecten niet bewerkt kun Alternatieve SVG-patronen locatie - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG-patroonresolutie - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster De resolutie om patronen in te tekenen. Standaardwaarde is 128. Hogere waarden geven betere resoluties, lagere waarden maken sneller tekenen mogelijk - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Vink dit aan als u de kleuren van de vlakken wilt behouden tijdens het downgraden en upgraden (alleen splitFaces en makeShell) - + Preserve colors of faces during downgrade/upgrade Behoud de kleuren van de vlakken tijdens het downgraden/upgraden - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Vink dit aan als u wilt dat de vlaknamen afgeleid worden van de oorspronkelijke objectnaam en andersom terwijl u downgradet/upgradet (alleen splitFaces en makeShell) - + Preserve names of faces during downgrade/upgrade Behoud de namen van de vlakken tijdens het downgraden/upgraden - + Drawing view line definitions Kijklijndefinities tekenen - + Dashed line definition Streepjeslijndefinitie - - - + + + An SVG linestyle definition Een SVG-lijnstijldefinitie - + Dashdot line definition Streepstiplijndefinitie - + Dotted line definition Stippelijndefinitie @@ -1753,7 +1758,7 @@ such as "Arial:Bold" Feet separator - Feet separator + Voet-scheidingsteken @@ -1772,6 +1777,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Kies een lettertypebestand @@ -2807,21 +2817,21 @@ Deze optie is alleen van toepassing als de BIM-werkbank is geïnstalleerd en als - + Top Boven - + Front Voorkant - + Side Zijde @@ -3251,14 +3261,14 @@ or try saving to a lower DWG version. Fout tijdens DWG-conversie. Probeer het DWG-bestand te verplaatsen naar een map zonder spaties en niet-dubieuze tekens of probeer op te slaan in een lagere DWG-versie. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4684,22 +4694,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - de eigenschappen "Uitlijning", "UitlijningsReferentie", "HoudLinkerMarge", "SchaalNaarMaat" en "Samenvoegen" zijn toegevoegd + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type type van eigenschap "Volgen" is gewijzigd - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7031,52 +7046,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Tekstreeks - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontale en verticale uitlijning - + Height reference used for justification Hoogte-referentie gebruikt voor uitlijning - + Keep left margin and leading white space when justification is left Behoud linker marge en eerste witte ruimte bij linker uitlijning - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_pl.qm b/src/Mod/Draft/Resources/translations/Draft_pl.qm index cfb5cac5bf..f9673057a3 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_pl.qm and b/src/Mod/Draft/Resources/translations/Draft_pl.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_pl.ts b/src/Mod/Draft/Resources/translations/Draft_pl.ts index b9333e6627..232b2bdc83 100644 --- a/src/Mod/Draft/Resources/translations/Draft_pl.ts +++ b/src/Mod/Draft/Resources/translations/Draft_pl.ts @@ -656,7 +656,7 @@ Działa to tylko wtedy, gdy opcja "Szyk łączy" jest nieaktywna. Fuse - Scal + Scalenie @@ -734,6 +734,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Plik czcionki + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -958,7 +963,7 @@ używając klawisza [ i ] podczas rysowania Line width - Szerokość linii + Szerekość linii @@ -1079,7 +1084,7 @@ używając klawisza [ i ] podczas rysowania Text spacing - Odstępy w tekście + Odstęp od tekstu @@ -1489,79 +1494,79 @@ pojawi się widżet wskazujący aktualną orientację płaszczyzny roboczejAlternatywna lokalizacja plików z wzorami SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Tutaj możesz zdefiniować lokalizację katalogu z niestandardowymi plikami SVG zawierającymi definicje <pattern>, które mają być dodane do standardowych wzorów - + SVG pattern resolution Rozdzielczość wzoru SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Rozdzielczość dla rysowania wzorów. Wartość domyślna to 128. Wyższe wartości dają lepszą rozdzielczość, niższe wartości umożliwiają szybsze rysowanie - + SVG pattern default size Domyślny rozmiar wzoru SVG - + The default size for SVG patterns Domyślny rozmiar dla wzorów SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Zaznacz to pole, jeśli chcesz, zachować kolory powierzchni podczas wykonywania operacji ulepsz / rozbij (tylko przy dzieleniu ściany i tworzeniu powłoki) - + Preserve colors of faces during downgrade/upgrade Zachowaj kolory powierzchni podczas ulepszania / rozbijania kształtu - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Zaznacz to pole, jeśli chcesz, aby nazwy powierzchni pochodziły od nazwy obiektu źródłowego i analogicznie podczas wykonywania operacji ulepsz / rozbij (tylko przy dzieleniu ściany i tworzeniu powłoki) - + Preserve names of faces during downgrade/upgrade Zachowaj nazwy powierzchni podczas ulepszania / rozbijania kształtu - + Drawing view line definitions Definicje linii w widoku rysunku - + Dashed line definition Definicja linii przerywanej - - - + + + An SVG linestyle definition Definicja stylu linii dla formatu SVG - + Dashdot line definition Definicja linii przerywanej, kreska kropka - + Dotted line definition Definicja linii kropkowanej @@ -1598,7 +1603,7 @@ lub rodziny, jak np. "Arial, Helvetica, sans" lub nazwa w stylu np. "Arial: Bold Font size - Rozmiar czcionki + Wielkość czcionki @@ -1736,7 +1741,7 @@ Domyślnie ustawiona jest na lewo, co jest standardem ISO. Text spacing - Odstęp od tekstu + Odstępy w tekście @@ -1763,12 +1768,12 @@ można wymusić pokazanie nowych wymiarów w tej jednostce. Feet separator - Feet separator + Separator dla jednostki stopa Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Opcjonalny ciąg znaków wyświetlany w wymiarach pomiędzy jednostkami stopy i cala @@ -1782,6 +1787,11 @@ można wymusić pokazanie nowych wymiarów w tej jednostce. + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Wybierz plik czcionki @@ -2438,7 +2448,7 @@ Te linie są grubsze niż normalne linie siatki. Automatic - Automatycznie + Automatyczna @@ -2818,21 +2828,21 @@ Te linie są grubsze niż normalne linie siatki. - + Top Od góry - + Front Od przodu - + Side Strona @@ -3264,14 +3274,14 @@ Spróbuj przenieść plik DWG do katalogu ze ścieżką bez spacji i znaków inn lub spróbuj zapisać do niższej wersji DWG. - + All Shapes must be coplanar Wszystkie kształty muszą być współpłaszczyznowe - + Selected Shapes must define a plane Wybrane kształty muszą definiować płaszczyznę @@ -4696,22 +4706,27 @@ Kąt końcowy będzie równy kątowi podstawowemu plus ta wartość.Parametr symetrii: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - dodano właściwości "Justowanie", "OdniesienieJustowania", "ZachowajLewyMargines", "SkalujDoRozmiaru" i "Scal" + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type zmieniono typ właściwości "Śledzenie" - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Kształt z tekstu: ciąg nie ma polilinii - + ShapeString: face creation failed for one character Kształt z tekstu: tworzenie ścianki nie powiodło się dla jednego ze znaków @@ -5564,7 +5579,7 @@ Proszę zainstalować dodatek bibliotek dxf ręcznie z narzędzi Menu -> Mene Uniform scaling - Jednolite skalowanie + Skalowanie ujednolicone @@ -5625,12 +5640,12 @@ Proszę zainstalować dodatek bibliotek dxf ręcznie z narzędzi Menu -> Mene Line width - Szerekość linii + Szerokość linii Draw style - Styl rysowania + Styl kreślenia @@ -6197,7 +6212,7 @@ CTRL, aby przyciągnąć, SHIFT, aby utworzyć wiązanie. Toggles the Draft grid on and off. - Włącza/wyłącza siatkę rysunku roboczego. + Włącza / wyłącza siatkę rysunku roboczego. @@ -7046,52 +7061,57 @@ It is a list of strings; each element in the list will be displayed in its own l Jest to lista ciągów znaków; każdy element na liście będzie wyświetlany w osobnej linii. - + Text string Ciąg znaków - + Font file name Nazwa pliku czcionki - + Height of text Wysokość tekstu - + Horizontal and vertical alignment Wyrównanie poziome i pionowe - + Height reference used for justification Wysokość odniesienia używana do justowania - + Keep left margin and leading white space when justification is left Po pozostawieniu justowania zachowaj lewy margines i początkową spację - + Scale to ensure cap height is equal to size Skaluj, aby upewnić się, że wysokość nasadki jest zgodna z rozmiarem - + Inter-character spacing Odstępy między znakami - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Wypełnij litery ścianami - + Fuse faces if faces overlap, usually not required (can be very slow) Łączenie ścian, jeśli zachodzą na siebie, zwykle nie jest wymagane (może być bardzo powolne) @@ -8050,7 +8070,7 @@ właściwości „Pierwszy kąt” i „Ostatni kąt”. Line width - Szerokość linii + Szerekość linii diff --git a/src/Mod/Draft/Resources/translations/Draft_pt-BR.qm b/src/Mod/Draft/Resources/translations/Draft_pt-BR.qm index 9258a63b08..b8df042e20 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_pt-BR.qm and b/src/Mod/Draft/Resources/translations/Draft_pt-BR.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_pt-BR.ts b/src/Mod/Draft/Resources/translations/Draft_pt-BR.ts index 1123a11cfd..96555da821 100644 --- a/src/Mod/Draft/Resources/translations/Draft_pt-BR.ts +++ b/src/Mod/Draft/Resources/translations/Draft_pt-BR.ts @@ -733,6 +733,11 @@ Uma rede de links é mais eficiente quando se criam várias cópias, mas não po Font file Arquivo de fonte + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1483,74 +1488,74 @@ Note que isto não é suportado por todas as ferramentas, e muitos objetos não Local alternativo para hachuras em SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Aqui você pode especificar um diretório com arquivos SVG personalizados contendo definições de <pattern> a serem adicionados às suas hachuras padrões - + SVG pattern resolution Resolução das hachuras em SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster A resolução para desenhar as hachuras. O valor padrão é 128. Valores mais altos dão melhores resoluções, valores mais baixos tornam o desenho mais rápido - + SVG pattern default size Tamanho padrão das hachuras em SVG - + The default size for SVG patterns O tamanho padrão dos padrões de hachura - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Marque isto se você deseja preservar as cores das faces ao fazer rebaixamento ou promoção (splitFaces e makeShell apenas) - + Preserve colors of faces during downgrade/upgrade Preservar as cores das faces durante rebaixamento/promoção - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Marque isto se você quer que os nomes de face sejam derivados do nome do objeto de origem e vice-versa, em rebaixos e promoções (splitFaces e makeShell apenas) - + Preserve names of faces during downgrade/upgrade Preservar os nomes das faces durante rebaixamento/promoção - + Drawing view line definitions Definições de linha de exibição do desenho - + Dashed line definition Definição de linha tracejada - - - + + + An SVG linestyle definition Uma definição de linha no formato SVG - + Dashdot line definition Definição de linha traço-ponto - + Dotted line definition Definição de linha pontilhada @@ -1747,12 +1752,12 @@ such as "Arial:Bold" Feet separator - Feet separator + Separador de pés Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + String opcional para aparecer entre os pés e polegadas valores em dimensões @@ -1766,6 +1771,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Selecione um arquivo de fonte @@ -2800,21 +2810,21 @@ Isto pode falhar para modelos DXF R12. - + Top Topo - + Front Frente - + Side Lateral @@ -3244,14 +3254,14 @@ or try saving to a lower DWG version. Tente mover o arquivo DWG para um caminho de diretório sem espaços e caracteres que não estejam em inglês, ou tente salvar em uma versão DWG inferior. - + All Shapes must be coplanar Todas as formas devem ser coplanares - + Selected Shapes must define a plane As formas selecionadas devem definir um plano @@ -4675,22 +4685,27 @@ The final angle will be the base angle plus this amount. Parâmetro de simetria: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - adicionado 'Justificativa', 'JustificaçãoReferência', 'ManterMargemEsquerda', 'EscalarAoTamanho' e 'Fuso' propriedades + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type alterado o tipo de propriedade 'Rastreamento' - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: O texto não contém arames - + ShapeString: face creation failed for one character FormaString: a criação de face falhou para um caractere @@ -7019,52 +7034,57 @@ It is a list of strings; each element in the list will be displayed in its own l É uma lista; cada elemento da lista será exibido em sua própria linha. - + Text string Texto - + Font file name Nome do arquivo de fonte - + Height of text Altura do texto - + Horizontal and vertical alignment Alinhamento horizontal e vertical - + Height reference used for justification Referência de altura usada para justificação - + Keep left margin and leading white space when justification is left Mantenha a margem esquerda e o espaço em branco quando a justificação for deixada - + Scale to ensure cap height is equal to size Escala para garantir que a altura máxima é igual ao tamanho - + Inter-character spacing Espaçamento entre caracteres - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Preencha as letras com faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fundir faces se as faces se sobrepõem, geralmente não é necessário (pode ser muito lento) diff --git a/src/Mod/Draft/Resources/translations/Draft_pt-PT.qm b/src/Mod/Draft/Resources/translations/Draft_pt-PT.qm index 2bddbd2c0e..7de9d2016b 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_pt-PT.qm and b/src/Mod/Draft/Resources/translations/Draft_pt-PT.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_pt-PT.ts b/src/Mod/Draft/Resources/translations/Draft_pt-PT.ts index 8684811cb7..3b92f6b573 100644 --- a/src/Mod/Draft/Resources/translations/Draft_pt-PT.ts +++ b/src/Mod/Draft/Resources/translations/Draft_pt-PT.ts @@ -737,6 +737,11 @@ Um "Link array" é mais eficiente ao criar várias cópias, mas não pode ser fu Font file Ficheiro de fontes + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1488,74 +1493,74 @@ Note that this is not fully supported, and many object will be not editable with Alternate SVG patterns location - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Marque isto, se desejar preservar as cores das faces ao despromover e promover (apenas splitFaces e makeShell) - + Preserve colors of faces during downgrade/upgrade Preservar as cores das faces durante a despromoção/promoção - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Marcar, se quer os nomes das face derivados do nome do objeto de origem e vice-versa, quando fizer despromover/promover (apenas splitFaces e makeShell) - + Preserve names of faces during downgrade/upgrade Preservar os nomes das face quando promover/despromover - + Drawing view line definitions Definições de linha para exibição do desenho - + Dashed line definition Definição de linha tracejada - - - + + + An SVG linestyle definition Uma definição de estilo de linha SVG - + Dashdot line definition Definição de linha DashDot - + Dotted line definition Definição de linha pontilhada (Dotted) @@ -1771,6 +1776,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Selecione um ficheiro de tipos @@ -2805,21 +2815,21 @@ This might fail for post DXF R12 templates. - + Top Topo - + Front Frente - + Side Side @@ -3250,14 +3260,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4683,22 +4693,27 @@ The final angle will be the base angle plus this amount. Parâmetro de simetria: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: O desenho não contém traços - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7030,52 +7045,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Cadeia de texto - + Font file name Font file name - + Height of text Altura do texto - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_ro.qm b/src/Mod/Draft/Resources/translations/Draft_ro.qm index a36cbec241..f0474cf4a1 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_ro.qm and b/src/Mod/Draft/Resources/translations/Draft_ro.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_ro.ts b/src/Mod/Draft/Resources/translations/Draft_ro.ts index 97985a4af3..c30b7ec2c9 100644 --- a/src/Mod/Draft/Resources/translations/Draft_ro.ts +++ b/src/Mod/Draft/Resources/translations/Draft_ro.ts @@ -737,6 +737,11 @@ O matrice înlănțuită este mai eficientă în crearea mai multor copii, dar a Font file Fișier de font + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1488,74 +1493,74 @@ Rețineți că aceasta nu este în întregime suportată și multe obiecte nu vo Locație alternativă a șabloanelor SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Aici puteți specifica un director cu fișiere SVG personalizate care conțin definiții de șabloane - <pattern> - care pot fi adăugate la modelele standard - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Rezoluția folosită pentru desenarea modelelor. Valoarea implicită este 128. Valorile mai mari oferă rezoluții mai bune, valori mai mici fac desenul mai rapid - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Bifați această casetă, dacă doriţi să păstraţi culorile fațetelor în timp ce faci downgrade-spargeți obiectul în obiecte mai simple şi upgrade - punând împreună obiectele selecționate într-unul singur (numai splitFaces şi makeShell) - + Preserve colors of faces during downgrade/upgrade Păstra culorile fațetelor în timpul downgrade/upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Bifați caseta dacă vreț ca numele fațetelor să derive din numele obiectului originar şi invers în timp ce faci downgrade/upgrade (splitFaces şi makeShell numai) - + Preserve names of faces during downgrade/upgrade Păstra numele fațetelor în timpul operațiunii de explozie/alăturarea (downgrade/upgrade) - + Drawing view line definitions Définitia liniei de desen - + Dashed line definition Definiția liniei punctate - - - + + + An SVG linestyle definition Une définition de style de ligne SVG - + Dashdot line definition Definiția liniei linie -punct - + Dotted line definition Definiție linie punctată @@ -1773,6 +1778,11 @@ sau "mono", sau o familie cum ar fi "Arial,Helvetica,sans", sau un nume şi un s + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Selectați un fișier font @@ -2807,21 +2817,21 @@ This might fail for post DXF R12 templates. - + Top Partea de sus - + Front Din față - + Side Latura @@ -3253,14 +3263,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4686,22 +4696,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7033,52 +7048,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Text - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_ru.qm b/src/Mod/Draft/Resources/translations/Draft_ru.qm index 2d74bb3be8..925f287c39 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_ru.qm and b/src/Mod/Draft/Resources/translations/Draft_ru.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_ru.ts b/src/Mod/Draft/Resources/translations/Draft_ru.ts index bb15b3b3fc..b9f5e6c821 100644 --- a/src/Mod/Draft/Resources/translations/Draft_ru.ts +++ b/src/Mod/Draft/Resources/translations/Draft_ru.ts @@ -46,7 +46,7 @@ New - Создать + Новый @@ -553,8 +553,8 @@ Negative values will result in copies produced in the negative direction. If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. - Если отмечено, то результирующие объекты в массиве будут слиты, если касаются друг друга. -Это работает только в том случае, если "Связь массивов" отключена. + Если флажок установлен, результирующие объекты в массиве будут сливаться, если они соприкасаются друг с другом. +Это работает только в том случае, если «массив ссылок» отключен. @@ -565,13 +565,13 @@ This only works if "Link array" is off. If checked, the resulting object will be a "Link array" instead of a regular array. A Link array is more efficient when creating multiple copies, but it cannot be fused together. - Если отмечено, результирующим объектом будет "Массив ссылок" вместо обычного массива. -Массив ссылок более эффективен при создании нескольких копий, но к нему нельзя применить операцию слияния. + Если флажок установлен, результирующий объект будет «массивом ссылок» вместо обычного массива. +Массив Link более эффективен при создании нескольких копий, но его нельзя объединить вместе. Link array - Массив из связанных объектов + Массив ссылок @@ -650,25 +650,25 @@ Change the direction of the axis itself in the property editor. If checked, the resulting objects in the array will be fused if they touch each other. This only works if "Link array" is off. - Если флажок установлен, результирующие объекты в массиве будут сливаться, если они соприкасаются друг с другом. -Это работает только в том случае, если «массив ссылок» отключен. + Если отмечено, то результирующие объекты в массиве будут слиты, если касаются друг друга. +Это работает только в том случае, если "Связь массивов" отключена. Fuse - Слияние + Объединение If checked, the resulting object will be a "Link array" instead of a regular array. A Link array is more efficient when creating multiple copies, but it cannot be fused together. - Если флажок установлен, результирующий объект будет «массивом ссылок» вместо обычного массива. -Массив Link более эффективен при создании нескольких копий, но его нельзя объединить вместе. + Если отмечено, результирующим объектом будет "Массив ссылок" вместо обычного массива. +Массив ссылок более эффективен при создании нескольких копий, но к нему нельзя применить операцию слияния. Link array - Массив ссылок + Массив из связанных объектов @@ -735,6 +735,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Файл шрифта + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1141,7 +1146,7 @@ value by using the [ and ] keys while drawing Tick-2 - Засечка-2 + Зацепление-2 @@ -1480,74 +1485,74 @@ Note that this is not fully supported, and many object will be not editable with Другое расположение SVG шаблонов - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Здесь вы можете указать каталог с пользовательскими SVG-файлами, содержащими определения <pattern>, которые будут добавлены к стандартным шаблонам - + SVG pattern resolution Разрешение шаблона SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Разрешение для рисования штриховки. Значение по умолчанию — 128. Большее значение даст лучшее разрешение, меньшее значение сделает отрисовку быстрее - + SVG pattern default size Размер шаблона SVG по умолчанию - + The default size for SVG patterns Размер по умолчанию для шаблонов SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Отметьте это если хотите предотвратить раскрашивание граней во время операций разделения и объединения (только для РазделитьГрани и СделатьОболочку) - + Preserve colors of faces during downgrade/upgrade Предотвратить раскрашивание граней при разделении/объединении - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Установите этот флажок, если хотите, чтобы имена граней были производными от имени исходного объекта и наоборот при выполнении операций разъединение/объединение (только для РазделитьГрани и Сделатьоболочку) - + Preserve names of faces during downgrade/upgrade Предотвратить названия граней при разделении/объединении - + Drawing view line definitions Настройки линий чертежа - + Dashed line definition Задание штриховой линии - - - + + + An SVG linestyle definition Определение стилей линий SVG - + Dashdot line definition Задание штрихпунктирной линии - + Dotted line definition Задание пунктирной линии @@ -1684,7 +1689,7 @@ such as "Arial:Bold" Tick-2 - Зацепление-2 + Засечка-2 @@ -1744,12 +1749,12 @@ such as "Arial:Bold" Feet separator - Feet separator + Разделитель цифр (для футов) Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Дополнительная строка, которая отображается между значениями футов и дюймов в размерах @@ -1763,6 +1768,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Выберите файл шрифта @@ -2791,21 +2801,21 @@ This might fail for post DXF R12 templates. - + Top Верх - + Front Спереди - + Side Сторона @@ -3234,14 +3244,14 @@ or try saving to a lower DWG version. Ошибка во время преобразования DWG. Попробуйте переместить файл DWG в путь к каталогу без пробелов и неанглийских символов или попробуйте сохранить его в более ранней версии DWG. - + All Shapes must be coplanar Все фигуры должны лежать в одной плоскости - + Selected Shapes must define a plane Выбранные фигуры должны определять плоскость @@ -4666,22 +4676,27 @@ The final angle will be the base angle plus this amount. Параметр симметрии: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - добавлены свойства «Justification», «JustificationReference», «KeepLeftMargin», «ScaleToSize» и «Fuse» + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type изменен тип свойства «Отслеживание» - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: строка не имеет направляющих - + ShapeString: face creation failed for one character Текст в кривую: ошибка при создании грани для одного символа @@ -5599,7 +5614,7 @@ from menu Tools -> Addon Manager Draw style - Стиль рисования + Стиль представления @@ -7006,52 +7021,57 @@ It is a list of strings; each element in the list will be displayed in its own l Список строк, каждая из которых будет отображена отдельной строкой. - + Text string Строка текста - + Font file name Имя файла шрифта - + Height of text Высота текста - + Horizontal and vertical alignment Горизонтальное и вертикальное выравнивание - + Height reference used for justification Эталон высоты, используемый для обоснования - + Keep left margin and leading white space when justification is left Сохраняйте левое поле и начальные пробелы, если остается выравнивание - + Scale to ensure cap height is equal to size Масштабирование для обеспечения соответствия высоты крышки ее размеру - + Inter-character spacing Межсимвольное расстояние - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Заполнить буквы гранями - + Fuse faces if faces overlap, usually not required (can be very slow) Слияние граней, если они пересекаются, обычно не требуется (может быть очень медленным) diff --git a/src/Mod/Draft/Resources/translations/Draft_sl.qm b/src/Mod/Draft/Resources/translations/Draft_sl.qm index 7443c4f1c2..3e4f98e4ed 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_sl.qm and b/src/Mod/Draft/Resources/translations/Draft_sl.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_sl.ts b/src/Mod/Draft/Resources/translations/Draft_sl.ts index 6b925e164a..eb195c456a 100644 --- a/src/Mod/Draft/Resources/translations/Draft_sl.ts +++ b/src/Mod/Draft/Resources/translations/Draft_sl.ts @@ -658,7 +658,7 @@ To deluje le, če je "Vezana razpostavitev" izključena. Fuse - Združi + Zlij @@ -737,6 +737,11 @@ Vezana razpostavitev je učinkovitejša pri ustvarjanju večjega števila dvojni Font file Datoteka pisave + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -966,7 +971,7 @@ risanjem spremenite s tipkama [ in ] px - px + sl. točk @@ -1162,7 +1167,7 @@ risanjem spremenite s tipkama [ in ] Arrow size - Velikost puščic + Velikost puščice @@ -1490,74 +1495,74 @@ Vedite, da ta možnost ni popolnoma podprta in da številnih predmetov ne bo mog Nadomestno mesto vzorcev SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Tukaj lahko navedete mapo z datotekami SVG po meri, ki vsebujejo določila <pattern>, katera bodo dodana med stalne vzorce - + SVG pattern resolution Ločljivost vzorca SVG - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Ločljivost vrisovanja vzorcev. Privzeta vrednost je 128. Višje vrednosti izboljšajo ločljivost, z nižjimi vrednostmi pa je risanje hitrejše - + SVG pattern default size Privzeta velikost vzorca SVG - + The default size for SVG patterns Privzeta velikost vzorcev SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Označite, če želite pri razgradnji in nadgradnji (razcepi ploskve in ustvari le lupine) ohraniti barve ploskev - + Preserve colors of faces during downgrade/upgrade Med razgradnjo/nadgradnjo ohrani barve ploskev - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Označite, če želite, da pri razgradnji/nadgradnji imena ploskev izvirajo iz imena izhodiščnega predmeta in obratno (razcepi na ploskve, naredi le lupino) - + Preserve names of faces during downgrade/upgrade Med razgradnjo/nadgradnjo ohrani poimenovanja ploskev - + Drawing view line definitions Določila črt risalnega pogleda - + Dashed line definition Opredelba črtkane črte - - - + + + An SVG linestyle definition Določilo sloga črt SVG - + Dashdot line definition Opredelba črtopične črte - + Dotted line definition Opredelba pikčaste črte @@ -1776,6 +1781,11 @@ stalno širino"), družina (npr. "Arial,Helvetica,sans") ali ime s slogom (npr. + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Izberite datoteko pisave @@ -2810,21 +2820,21 @@ To lahko spodleti pri predlogah novejših od DXF R12. - + Top Zgoraj - + Front Spredaj - + Side Stran @@ -3256,14 +3266,14 @@ Poskusite prestaviti datoteko DWG v mapo, katere pot ne vsebuje presledkov in ne ali poskusite shraniti v starejšo različico DWGja. - + All Shapes must be coplanar Vse oblike morajo biti soravninske (koplanarne) - + Selected Shapes must define a plane Izbrane oblike morajo tvoriti ravnino @@ -4689,22 +4699,27 @@ Končni kót bo seštevek izhodiščnega in tega kóta. Somernostna določilka: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - dodane lastnosti "Poravnava", "Sklic poravnave", "Ohrani levi rob", "Prevelikosti na mero" in "Združi" + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type spremenjena vrsta lastnosti "Sledenje" - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Besedilna oblika: niz je brez črtovij - + ShapeString: face creation failed for one character Besedilna oblika: pri enem znaku je ustvarjanje ploskve spodletelo @@ -5619,7 +5634,7 @@ z menija Orodja -> Upravljalnik vstavkov Line width - Širina črte + Debelina črte @@ -7034,52 +7049,57 @@ It is a list of strings; each element in the list will be displayed in its own l To je seznam nizov, ki bodo prikazani vsak v svoji vrsti. - + Text string Besedilni niz - + Font file name Ime datoteke pisave - + Height of text Višina besedila - + Horizontal and vertical alignment Vodoravna in navpična poravnava - + Height reference used for justification Višinski sklic poravnave - + Keep left margin and leading white space when justification is left Pri levi poravnavi ohrani levi rob in začetni presledek - + Scale to ensure cap height is equal to size Prevelikosti tako, da bo višina pokrova enaka velikosti - + Inter-character spacing Medznakovni razmik - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Zapolni črke s ploskvami - + Fuse faces if faces overlap, usually not required (can be very slow) Združi ploskve, če se prekrivajo, običajno pa ni potrebno (lahko zelo počasno) @@ -8153,7 +8173,7 @@ Use 'arch' to force US arch notation Arrow size - Velikost puščice + Velikost puščic diff --git a/src/Mod/Draft/Resources/translations/Draft_sr-CS.qm b/src/Mod/Draft/Resources/translations/Draft_sr-CS.qm index 8b1027a059..33890b995c 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_sr-CS.qm and b/src/Mod/Draft/Resources/translations/Draft_sr-CS.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_sr-CS.ts b/src/Mod/Draft/Resources/translations/Draft_sr-CS.ts index 856977836f..b0676e108f 100644 --- a/src/Mod/Draft/Resources/translations/Draft_sr-CS.ts +++ b/src/Mod/Draft/Resources/translations/Draft_sr-CS.ts @@ -657,7 +657,7 @@ Ovo radi samo ako je "Umnožavanje veza" isključeno. Fuse - Spajanje + Unija @@ -736,6 +736,11 @@ Umnožavanje veza je efikasnije kada se napravi više kopija, ali se ne može sp Font file Datoteka fonta + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -964,7 +969,7 @@ promeniti korišćenjem tipki [ i ] tokom crtanja px - px + PX @@ -1135,12 +1140,12 @@ promeniti korišćenjem tipki [ i ] tokom crtanja Arrow - Strela + Strelica Tick - Otkucaj + Kosa crta @@ -1488,74 +1493,74 @@ Imaj na umu da ova opcija nije u potpunosti podržana i da se mnogi objekti neć Lokacija alternativnih SVG šara - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Ovde možeš navesti fasciklu sa sopstvenim SVG datotekama koje sadrže <pattern> definicije koje treba dodati standardnim šarama - + SVG pattern resolution Rezolucija SVG šare - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Rezolucija za crtanje šara. Podrazumevana vrednost je 128. Više vrednosti daju bolje rezolucije, niže vrednosti čine crtanje bržim - + SVG pattern default size Podrazumevana veličina SVG šare - + The default size for SVG patterns Podrazumevana veličina za SVG šare - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Čekiraj ako želiš da sačuvaš boje stranica tokom rastavljanja/sastavljanja (samo splitFaces i makeShell) - + Preserve colors of faces during downgrade/upgrade Sačuvaj boje stranica tokom rastavljanja/sastavljanja - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Čekiraj ako želiš da imena stranica potiču iz imena izvornog objekta i obrnuto tokom rastavljanja/sastavljanja (samo splitFaces i makeShell) - + Preserve names of faces during downgrade/upgrade Sačuvaj imena stranica tokom rastavljanja/sastavljanja - + Drawing view line definitions Definicije linija crteža - + Dashed line definition Definisanje isprekidane linije - - - + + + An SVG linestyle definition Definisanje stila SVG linija - + Dashdot line definition Definisanje crta-tačka linije - + Dotted line definition Definisanje tačkaste linije @@ -1685,12 +1690,12 @@ kao što su "Arial:Bold" Arrow - Strelica + Strela Tick - Kosa crta + Otkucaj @@ -1755,12 +1760,12 @@ kao što su "Arial:Bold" Feet separator - Feet separator + Separator brojeva (za stope) Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Znak koji se može pojavii između vrednosti stopa i inča u kotama @@ -1774,6 +1779,11 @@ kao što su "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Izaberi datoteku fonta @@ -2808,21 +2818,21 @@ Ovo možda neće uspeti za novije šablone od DXF R12. - + Top Odozgo - + Front Spreda - + Side Strana @@ -3251,14 +3261,14 @@ or try saving to a lower DWG version. Greška tokom DWG konverzije. Pokušaj da premestiš DWG datoteku u fasciklu koja ima putanju bez razmaka i ne-engleskih znakova, ili pokušaj da sačuvaš u nižoj DWG verziji. - + All Shapes must be coplanar Svi oblici moraju biti komplanarni - + Selected Shapes must define a plane Izabrani oblici moraju definisati ravan @@ -4684,22 +4694,27 @@ Krajnji ugao će biti početni ugao plus ovaj iznos. Parametar simetrije: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Tekstualni oblik: znakovni niz nema žice - + ShapeString: face creation failed for one character TekstualniOblik: nije uspelo pravljenje stranice od jednog znaka @@ -7031,52 +7046,57 @@ It is a list of strings; each element in the list will be displayed in its own l To je lista sa nizovima znakova; svaki niz znakova u listi će biti prikazan u svojoj liniji. - + Text string Tekstualni niz znakova - + Font file name Ime datoteke fonta - + Height of text Visina teksta - + Horizontal and vertical alignment Horizontalno i vertikalno poravnanje - + Height reference used for justification Referentna visina za obostrano poravnanje - + Keep left margin and leading white space when justification is left Zadržite levu marginu i prednji beli prostor kada je levo poravnanje - + Scale to ensure cap height is equal to size Skaliraj, da bi osigurao visinu velikog slova jednaku veličini - + Inter-character spacing Međuznakovni razmak - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Popuni slova stranicama - + Fuse faces if faces overlap, usually not required (can be very slow) Sjedini stranice ako se preklapaju, obično nije potrebno (može biti veoma sporo) diff --git a/src/Mod/Draft/Resources/translations/Draft_sr.qm b/src/Mod/Draft/Resources/translations/Draft_sr.qm index 8164f26979..b0c2eebc70 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_sr.qm and b/src/Mod/Draft/Resources/translations/Draft_sr.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_sr.ts b/src/Mod/Draft/Resources/translations/Draft_sr.ts index 5bd480a9f6..e4327af0e2 100644 --- a/src/Mod/Draft/Resources/translations/Draft_sr.ts +++ b/src/Mod/Draft/Resources/translations/Draft_sr.ts @@ -736,6 +736,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Датотека фонта + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1488,74 +1493,74 @@ Note that this is not fully supported, and many object will be not editable with Локација алтернативних SVG шара - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Овде можеш навести фасциклу са сопственим SVG датотекама које садрже <pattern> дефиниције које треба додати стандардним шарама - + SVG pattern resolution Резолуција SVG шаре - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Резолуција за цртање шара. Подразумевана вредност је 128. Више вредности дају боље резолуције, ниже вредности чине цртање бржим - + SVG pattern default size Подразумевана величина SVG шаре - + The default size for SVG patterns Подразумевана величина за SVG шаре - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Чекирај ако желиш да сачуваш боје страница током састављања/растављања (само splitFaces и makeShell) - + Preserve colors of faces during downgrade/upgrade Сачувај боје страница током састављања/растављања - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Чекирај ако желиш да имена страница потичу из имена изворног објекта и обрнуто током састављања/растављања (само splitFaces и makeShell) - + Preserve names of faces during downgrade/upgrade Сачувај имена страница током састављања/растављања - + Drawing view line definitions Дефиниције линија цртежа - + Dashed line definition Дефинисање испрекидане линије - - - + + + An SVG linestyle definition Дефинисање стила SVG линија - + Dashdot line definition Дефинисање црта-тачка линије - + Dotted line definition Дефинисање тачкасте линије @@ -1755,12 +1760,12 @@ such as "Arial:Bold" Feet separator - Feet separator + Сепаратор бројева (за стопе) Optional string to appear between the feet and inches values in dimensions - Optional string to appear between the feet and inches values in dimensions + Znak koji se može pojavii između vrednosti stopa i inča u kotama @@ -1774,6 +1779,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Изабери датотеку фонта @@ -2808,21 +2818,21 @@ This might fail for post DXF R12 templates. - + Top Одозго - + Front Спреда - + Side Страна @@ -3251,14 +3261,14 @@ or try saving to a lower DWG version. Грешка током DWG конверзијe. Покушај да преместиш DWG датотеку у фасциклу која има путању без размака и не-енглеских знакова, или покушај да сачуваш у нижој DWG верзији. - + All Shapes must be coplanar Сви облици морају бити компланарни - + Selected Shapes must define a plane Изабрани облици морају дефинисати раван @@ -4684,22 +4694,27 @@ The final angle will be the base angle plus this amount. Параметар симетрије: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires Текстуални облик: знаковни низ нема жице - + ShapeString: face creation failed for one character ТекстуалниОблик: није успело прављење странице од једног знака @@ -7031,52 +7046,57 @@ It is a list of strings; each element in the list will be displayed in its own l То је листа са низовима знакова; сваки низ знакова у листи ће бити приказан у својој линији. - + Text string Текстуални низ знакова - + Font file name Име датотеке фонта - + Height of text Висина текста - + Horizontal and vertical alignment Хоризонтално и вертикално поравнање - + Height reference used for justification Референтна висина за обострано поравнање - + Keep left margin and leading white space when justification is left Задржите леву маргину и предњи бели простор када је лево поравнање - + Scale to ensure cap height is equal to size Скалирај, да би осигурао висину великог слова једнаку величини - + Inter-character spacing Међузнаковни размак - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Попуни слова страницама - + Fuse faces if faces overlap, usually not required (can be very slow) Сједини странице ако се преклапају, обично није потребно (може бити веома споро) diff --git a/src/Mod/Draft/Resources/translations/Draft_sv-SE.qm b/src/Mod/Draft/Resources/translations/Draft_sv-SE.qm index d9fae65a1b..b3dd54d099 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_sv-SE.qm and b/src/Mod/Draft/Resources/translations/Draft_sv-SE.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_sv-SE.ts b/src/Mod/Draft/Resources/translations/Draft_sv-SE.ts index 000fb864d3..f08b1411c5 100644 --- a/src/Mod/Draft/Resources/translations/Draft_sv-SE.ts +++ b/src/Mod/Draft/Resources/translations/Draft_sv-SE.ts @@ -737,6 +737,11 @@ En Länkmatris är effektivare när du skapar flera kopior, men den kan inte sl Font file Teckensnittsfil + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1486,74 +1491,74 @@ Observera att detta inte stöds fullt ut, och många objekt kommer inte att kunn Alternativa SVG Mönsterplats - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Här kan du ange en katalog med anpassade SVG-filer som innehåller <pattern> definitioner som ska läggas till standardmönstren - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Upplösningen för att rita mönstren. Standardvärdet är 128. Högre värden ger bättre upplösningar, lägre värden gör ritningen snabbare - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns Standard-storleken för SVG-mönster - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Om detta är markerat kommer färger på ytor att behållas under nedgradering och uppgradering (splitFaces och makeShell endast) - + Preserve colors of faces during downgrade/upgrade Behåll färger på ytor under nedgradering/uppgradering - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Om detta är markerat kommer namnen på ytor att erhållas från originalobjektet och vice versa under nedgradering och uppgradering (splitFaces och makeShell endast) - + Preserve names of faces during downgrade/upgrade Behåll namn på ytor under nedgradering/uppgradering - + Drawing view line definitions Linjedefinitioner för ritningsvy - + Dashed line definition Definition för streckad linje - - - + + + An SVG linestyle definition En SVG-definition för linjestil - + Dashdot line definition Definition för streck-punktslinje - + Dotted line definition Definition för punktlinje @@ -1772,6 +1777,11 @@ som "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Välj en teckensnittsfil @@ -2803,21 +2813,21 @@ This might fail for post DXF R12 templates. - + Top Topp - + Front Front - + Side Sida @@ -3249,14 +3259,14 @@ Prova att flytta DWG-filen till en sökväg utan mellanslag och icke-engelska te eller försök spara till en lägre DWG-version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4682,22 +4692,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7029,52 +7044,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Textsträng - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_tr.qm b/src/Mod/Draft/Resources/translations/Draft_tr.qm index f6950aaca2..fe293a9d6b 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_tr.qm and b/src/Mod/Draft/Resources/translations/Draft_tr.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_tr.ts b/src/Mod/Draft/Resources/translations/Draft_tr.ts index 4394e29040..599db41b9e 100644 --- a/src/Mod/Draft/Resources/translations/Draft_tr.ts +++ b/src/Mod/Draft/Resources/translations/Draft_tr.ts @@ -737,6 +737,11 @@ Birden fazla kopyalar oluştuğu zaman bir bağlantı daha verimlidir ama o, bir Font file Yazı tipi dosyası + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1490,74 +1495,74 @@ Bunun tam olarak desteklenmediğini ve birçok nesnenin Taslak Değiştiricilerl Alternatif SVG desenleri konumu - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns desen - + SVG pattern resolution SVG desen çözünürlüğü - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Desenleri çizmek için varsyılan çözünürlük değeri 128 dir. Daha yüksek değerler daha iyi görüntü sağlar. daha düşük değerler ise daha hızlı grafikler sağlar - + SVG pattern default size SVG desen varsayılan boyutu - + The default size for SVG patterns SVG desenler için varsayılan boyut - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Sürüm indirme ve yükseltme yaparken yüzeylerin renklerini korumak istiyorsanız bunu işaretleyin (yalnızca splitFaces ve makeShell) - + Preserve colors of faces during downgrade/upgrade Sürüm indirme / yükseltme sırasında yüzlerin renklerini koru - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Sürüm indirme / yükseltme yaparken yüzey isimlendirmelerin kaynak nesneden esinlenilerek türetilmesini ve tersini istiyorsanız bu seçeneği işaretleyin (yalnızca splitFaces [YüzeyleriAyır] ve makeShell[KabukOluştur]) - + Preserve names of faces during downgrade/upgrade Sürüm indirme / yükseltme sırasında yüzeylerin isimlerini koru - + Drawing view line definitions Çizim görünümü satır tanımları - + Dashed line definition Kesik çizgi tanımı - - - + + + An SVG linestyle definition Bir SVG linestyle tanımı - + Dashdot line definition Kesik çizgi tanımı - + Dotted line definition Kesik çizgi tanımı @@ -1774,6 +1779,11 @@ Bu değer, "Arial", varsayılan stiller "sans", "serif" veya "mono", veya aile a + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Grip Dosyasını Seçin @@ -2806,21 +2816,21 @@ This might fail for post DXF R12 templates. - + Top üst - + Front Ön - + Side Yan @@ -3252,14 +3262,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4685,22 +4695,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7032,52 +7047,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Metin dizesi - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_uk.qm b/src/Mod/Draft/Resources/translations/Draft_uk.qm index 5a140c3870..a3bc384764 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_uk.qm and b/src/Mod/Draft/Resources/translations/Draft_uk.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_uk.ts b/src/Mod/Draft/Resources/translations/Draft_uk.ts index 5d6b0a86a2..e3273b69e1 100644 --- a/src/Mod/Draft/Resources/translations/Draft_uk.ts +++ b/src/Mod/Draft/Resources/translations/Draft_uk.ts @@ -737,6 +737,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Файл шрифту + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1489,76 +1494,76 @@ Note that this is not fully supported, and many object will be not editable with Додаткове розташування шаблонів SVG - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Тут можна вказати каталог з користувацькими SVG файлами, що містять <pattern> визначення, які будуть додані до стандартних шаблонів - + SVG pattern resolution Роздільна здатність SVG шаблонів - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster Роздільна здатність малювання шаблонів. За замовчуванням значення 128. Більше значень дають кращі роздільні здатності, менші значення роблять креслення швидше - + SVG pattern default size Розмір SVG шаблону за змовчуванням - + The default size for SVG patterns Розмір за замовчуванням для шаблонів SVG - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Відмітьте цей пункт, якщо ви хочете зберегти кольори поверхонь при зменшенні та оновленні (тільки розділення Поверхонь та зробити Каркас) make Shell - + Preserve colors of faces during downgrade/upgrade Зберегти кольори обличчя під час зниження / оновлення - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Відмітьте цей пункт, якщо ви хочете, щоб імена поверхонь виходили з назви об’єкта і навпаки під час виконання понизити ( тільки розділення Поверхонь та зробити Каркас) - + Preserve names of faces during downgrade/upgrade Зберегти назви поверхонь під час пониження/оновлення - + Drawing view line definitions Визначення вигляду лінії креслення - + Dashed line definition Визначення пунктирної лінії - - - + + + An SVG linestyle definition Визначення стилів ліній SVG - + Dashdot line definition Визначення штрихпунктирної лінії - + Dotted line definition Визначення для пунктирної лінії @@ -1777,6 +1782,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Обрати файл шрифту @@ -2810,21 +2820,21 @@ This might fail for post DXF R12 templates. - + Top Згори - + Front Фронтальний - + Side Сторона @@ -3256,14 +3266,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4689,22 +4699,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7036,52 +7051,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Текстовий рядок - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_val-ES.qm b/src/Mod/Draft/Resources/translations/Draft_val-ES.qm index c85fe484b0..f319c5308c 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_val-ES.qm and b/src/Mod/Draft/Resources/translations/Draft_val-ES.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_val-ES.ts b/src/Mod/Draft/Resources/translations/Draft_val-ES.ts index b6cd0ebca4..03e56c9d74 100644 --- a/src/Mod/Draft/Resources/translations/Draft_val-ES.ts +++ b/src/Mod/Draft/Resources/translations/Draft_val-ES.ts @@ -736,6 +736,11 @@ Una matriu d'enllaç és més eficient quan es creen diverses còpies, però no Font file Fitxer de tipus de lletra + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1476,74 +1481,74 @@ Tingueu en compte que això no és totalment compatible i que molts objectes no Alternate SVG patterns location - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Marqueu açò si voleu preservar el color de les cares mentre s'estiga revertint o actualitzant (sols splitFaces i makeShell) - + Preserve colors of faces during downgrade/upgrade Preserva el color de les cares durant la reversió i l'actualització - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Marqueu açò si voleu que els noms de les cares deriven del nom de l'objecte d'origen i viceversa quan s'estiga revertint o actualitzant (sols splitFaces i makeShell) - + Preserve names of faces during downgrade/upgrade Preserva el nom de les cares durant la reversió i l'actualització - + Drawing view line definitions Definicions de línia de vista de dibuix - + Dashed line definition Definició de la línia discontínua - - - + + + An SVG linestyle definition Una definició d'estil de línia SVG - + Dashdot line definition Definició de la línia de punt i ratlla - + Dotted line definition Definició de la línia de punts @@ -1759,6 +1764,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file Seleccioneu un fitxer de tipus de lletra @@ -2781,21 +2791,21 @@ This might fail for post DXF R12 templates. - + Top Planta - + Front Alçat - + Side Costat @@ -3227,14 +3237,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4660,22 +4670,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7007,52 +7022,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string Text string - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_zh-CN.qm b/src/Mod/Draft/Resources/translations/Draft_zh-CN.qm index e09f63a838..a5c3958d0d 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_zh-CN.qm and b/src/Mod/Draft/Resources/translations/Draft_zh-CN.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_zh-CN.ts b/src/Mod/Draft/Resources/translations/Draft_zh-CN.ts index 54184687b2..8482c7a9a5 100644 --- a/src/Mod/Draft/Resources/translations/Draft_zh-CN.ts +++ b/src/Mod/Draft/Resources/translations/Draft_zh-CN.ts @@ -734,6 +734,11 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file 字体文件 + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form @@ -1481,74 +1486,74 @@ Note that this is not fully supported, and many object will be not editable with Alternate SVG patterns location - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) 如果要在执行降级和升级时保留面的颜色 (仅限拆分面和 壳体创建), 请选择此选项 - + Preserve colors of faces during downgrade/upgrade 在降级/升级过程中保留面的颜色 - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) 如果您希望从原始对象名称派生面名称, 并且在执行降级升级 (仅限拆分面和 壳体创建) 时从面名称派生对象名称, 请检选择改选项。 - + Preserve names of faces during downgrade/upgrade 在降级/升级过程中保留面的名称 - + Drawing view line definitions 绘图视图直线定义 - + Dashed line definition 虚线(Dash) 设定 - - - + + + An SVG linestyle definition SVG 直线样式定义 - + Dashdot line definition 点划线(Dashdot) 设定 - + Dotted line definition 点线(Dot) 设定 @@ -1764,6 +1769,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file 选择一个字体文件 @@ -2798,21 +2808,21 @@ This might fail for post DXF R12 templates. - + Top 俯视 - + Front 前视 - + Side 侧面 @@ -3244,14 +3254,14 @@ or try saving to a lower DWG version. 或尝试保存到 DWG 的较低版本。 - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -4677,22 +4687,27 @@ The final angle will be the base angle plus this amount. Symmetry parameter: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -7024,52 +7039,57 @@ It is a list of strings; each element in the list will be displayed in its own l It is a list of strings; each element in the list will be displayed in its own line. - + Text string 文本字符串 - + Font file name Font file name - + Height of text 文本高度 - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) diff --git a/src/Mod/Draft/Resources/translations/Draft_zh-TW.qm b/src/Mod/Draft/Resources/translations/Draft_zh-TW.qm index 96abe873ac..faf76d923a 100644 Binary files a/src/Mod/Draft/Resources/translations/Draft_zh-TW.qm and b/src/Mod/Draft/Resources/translations/Draft_zh-TW.qm differ diff --git a/src/Mod/Draft/Resources/translations/Draft_zh-TW.ts b/src/Mod/Draft/Resources/translations/Draft_zh-TW.ts index 02c7d93088..a9c3120306 100644 --- a/src/Mod/Draft/Resources/translations/Draft_zh-TW.ts +++ b/src/Mod/Draft/Resources/translations/Draft_zh-TW.ts @@ -136,13 +136,13 @@ The type of arrows or markers to use for dimensions and labels - The type of arrows or markers to use for dimensions and labels + 用於尺寸和標籤之箭頭或標記的類型 The size of the arrows or markers in system units - The size of the arrows or markers in system units + 箭頭或標記的尺寸，以系統單位表示 @@ -159,13 +159,13 @@ The distance the dimension line is additionally extended - The distance the dimension line is additionally extended + 附加擴展的尺寸線距離 The distance the extension lines are additionally extended beyond the dimension line - The distance the extension lines are additionally extended beyond the dimension line + 延伸線額外延伸超出尺寸線的距離 @@ -176,7 +176,7 @@ The line spacing for multi-line texts and labels (relative to the font size) - The line spacing for multi-line texts and labels (relative to the font size) + 多行文字和標籤的行間距 (相對於字體大小) @@ -187,7 +187,7 @@ The color of texts, dimension texts and label texts - The color of texts, dimension texts and label texts + 文字、尺寸文字和標籤文字的顏色 @@ -203,7 +203,7 @@ A multiplier factor that affects the size of texts and markers - A multiplier factor that affects the size of texts and markers + 影響文字和標記大小的乘數 @@ -247,7 +247,7 @@ The distance between the dimension text and the dimension line - The distance between the dimension text and the dimension line + 尺寸文字與尺寸線之間的距離 @@ -324,7 +324,7 @@ Extension overshoot - Extension overshoot + 延伸超越量 @@ -338,44 +338,42 @@ Distance from one layer of objects to the next layer of objects. - Distance from one layer of objects to the next layer of objects. + 從一層物件到下一層物件的距離。 Radial distance - Radial distance + 徑向距離 Distance from one element in one ring of the array to the next element in the same ring. It cannot be zero. - Distance from one element in one ring of the array to the next element in the same ring. -It cannot be zero. + 從陣列中一個環的一個元件到同一個環中下一個元件的距離。其值不能為零。 Tangential distance - Tangential distance + 切線距離 Number of circular layers or rings to create, including a copy of the original object. It must be at least 2. - Number of circular layers or rings to create, including a copy of the original object. -It must be at least 2. + 要創建的環形層數或環數，包括原始物件的副本。它必須至少為2。 Number of circular layers - Number of circular layers + 環形層數 The number of symmetry lines in the circular array. - The number of symmetry lines in the circular array. + 環形陣列中的對稱線數量。 @@ -392,7 +390,7 @@ Change the direction of the axis itself in the property editor. Center of rotation - Center of rotation + 旋轉中心點 @@ -412,12 +410,12 @@ Change the direction of the axis itself in the property editor. Reset the coordinates of the center of rotation. - Reset the coordinates of the center of rotation. + 重設旋轉中心的座標。 Reset point - Reset point + 重設點 @@ -441,7 +439,7 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Link array - Link array + 連結陣列 @@ -455,13 +453,13 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Number of elements in the array in the specified direction, including a copy of the original object. The number must be at least 1 in each direction. - Number of elements in the array in the specified direction, including a copy of the original object. -The number must be at least 1 in each direction. + 在指定的方向中，陣列中的元件數目，包括原始物件的一個副本。 +每個方向上的數目必須至少為1。 Number of elements - Number of elements + 元件數目 @@ -492,64 +490,64 @@ The number must be at least 1 in each direction. Distance between the elements in the X direction. Normally, only the X value is necessary; the other two values can give an additional shift in their respective directions. Negative values will result in copies produced in the negative direction. - Distance between the elements in the X direction. -Normally, only the X value is necessary; the other two values can give an additional shift in their respective directions. -Negative values will result in copies produced in the negative direction. + 元件在 X 方向之間的距離。 +通常只有 X 值是必要的；其他兩個值可以在它們各自的方向上提供額外的位移。 +負值將導致在反方向上產生副本。 X intervals - X intervals + X 間隔 Reset the distances. - Reset the distances. + 重置距離 Reset X - Reset X + 重設 X Distance between the elements in the Y direction. Normally, only the Y value is necessary; the other two values can give an additional shift in their respective directions. Negative values will result in copies produced in the negative direction. - Distance between the elements in the Y direction. -Normally, only the Y value is necessary; the other two values can give an additional shift in their respective directions. -Negative values will result in copies produced in the negative direction. + 元件在 Y 方向之間的距離。 +通常只有 Y 值是必要的；其他兩個值可以在它們各自的方向上提供額外的位移。 +負值將導致在反方向上產生副本。 Y intervals - Y intervals + Y 間隔 Reset Y - Reset Y + 重設 Y Distance between the elements in the Z direction. Normally, only the Z value is necessary; the other two values can give an additional shift in their respective directions. Negative values will result in copies produced in the negative direction. - Distance between the elements in the Z direction. -Normally, only the Z value is necessary; the other two values can give an additional shift in their respective directions. -Negative values will result in copies produced in the negative direction. + 元件在 Z 方向之間的距離。 +通常只有 Z 值是必要的；其他兩個值可以在它們各自的方向上提供額外的位移。 +負值將導致在反方向上產生副本。 Z intervals - Z intervals + Z 間隔 Reset Z - Reset Z + 重設 Z @@ -573,7 +571,7 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Link array - Link array + 連結陣列 @@ -596,20 +594,20 @@ The maximum absolute value is 360 degrees. Polar angle - Polar angle + 極座標角度 Number of elements in the array, including a copy of the original object. It must be at least 2. - Number of elements in the array, including a copy of the original object. -It must be at least 2. + 陣列中元件的數量，包含原始物件的一個副本。 +它必須至少為 2。 Number of elements - Number of elements + 元件數目 @@ -621,7 +619,7 @@ Change the direction of the axis itself in the property editor. Center of rotation - Center of rotation + 旋轉中心點 @@ -641,12 +639,12 @@ Change the direction of the axis itself in the property editor. Reset the coordinates of the center of rotation. - Reset the coordinates of the center of rotation. + 重設旋轉中心的座標。 Reset point - Reset point + 重設點 @@ -670,7 +668,7 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Link array - Link array + 連結陣列 @@ -737,50 +735,55 @@ A Link array is more efficient when creating multiple copies, but it cannot be f Font file Font file + + + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + Form Working plane setup - Working plane setup + 工作平面設定 Select a face or working plane proxy or 3 vertices. Or choose one of the options below - Select a face or working plane proxy or 3 vertices. -Or choose one of the options below + 選擇一個面、工作平面代理或 3 個頂點。 +或者選擇以下選項之一 Sets the working plane to the XY plane (ground plane) - Sets the working plane to the XY plane (ground plane) + 設置工作平面為 XY 平面（地平面) Top (XY) - Top (XY) + 上視圖 (XY 平面) Sets the working plane to the XZ plane (front plane) - Sets the working plane to the XZ plane (front plane) + 設置工作平面為 XZ 平面（前平面） Front (XZ) - Front (XZ) + 前視圖 (XZ 平面) Sets the working plane to the YZ plane (side plane) - Sets the working plane to the YZ plane (side plane) + 設置工作平面為 YZ 平面（側面平面） Side (YZ) - Side (YZ) + 側視圖 (YZ 平面) @@ -790,14 +793,13 @@ Or choose one of the options below Align to view - Align to view + 對齊視圖 The working plane will align to the current view each time a command is started - The working plane will align to the current -view each time a command is started + 每次啟動命令時，工作平面將對齊到當前視圖 @@ -831,7 +833,7 @@ of the buttons above Center plane on view - Center plane on view + 在視圖上置中平面 @@ -854,13 +856,13 @@ will be moved to the center of the view Move working plane - Move working plane + 移動工作平面 The spacing between the smaller grid lines - The spacing between the smaller grid lines + 較小網格線之間的間距 @@ -871,17 +873,17 @@ will be moved to the center of the view The number of squares between each main line of the grid - The number of squares between each main line of the grid + 每個網格主線之間的方塊數量 Main line every - Main line every + 所有主要線段 Grid extension - Grid extension + 格線延伸 @@ -894,14 +896,12 @@ will be moved to the center of the view The distance at which a point can be snapped to when approaching the mouse. You can also change this value by using the [ and ] keys while drawing - The distance at which a point can be snapped to -when approaching the mouse. You can also change this -value by using the [ and ] keys while drawing + 當靠近滑鼠時可以貼齊到一個點的距離。您也可以在繪圖時使用 [ 和 ] 鍵來更改此值。 Snapping radius - Snapping radius + 貼齊半徑 @@ -911,7 +911,7 @@ value by using the [ and ] keys while drawing Center view - Center view + 視圖置中 @@ -966,7 +966,7 @@ value by using the [ and ] keys while drawing px - px + 像素 @@ -1011,7 +1011,7 @@ value by using the [ and ] keys while drawing Flat Lines - Flat Lines + 平線條 @@ -1036,7 +1036,7 @@ value by using the [ and ] keys while drawing The color of faces - The color of faces + 面的顏色 @@ -1046,7 +1046,7 @@ value by using the [ and ] keys while drawing The transparency of faces - The transparency of faces + 面的透明度 @@ -1182,7 +1182,7 @@ value by using the [ and ] keys while drawing Dim overshoot - Dim overshoot + 尺寸超越量 @@ -1197,7 +1197,7 @@ value by using the [ and ] keys while drawing Ext overshoot - Ext overshoot + 延伸超越量 @@ -1237,7 +1237,7 @@ value by using the [ and ] keys while drawing Pattern: - Pattern: + 樣式： @@ -1317,12 +1317,12 @@ Values with differences below this value will be treated as same. This value wil Show groups in layers list drop-down button - Show groups in layers list drop-down button + 在圖層清單下拉按鈕中顯示群組 Draft tools options - Draft tools options + 草稿工具選項 @@ -1340,8 +1340,8 @@ This allows to point the direction and type the distance. Normally, after copying objects, the copies get selected. If this option is checked, the base objects will be selected instead. - Normally, after copying objects, the copies get selected. -If this option is checked, the base objects will be selected instead. + 通常，在複製物件後，副本會被選中。 +如果勾選了此選項，則將選中基礎物件而不是副本。 @@ -1351,7 +1351,7 @@ If this option is checked, the base objects will be selected instead. If this option is set, when creating Draft objects on top of an existing face of another object, the "Support" property of the Draft object will be set to the base object. This was the standard behaviour before FreeCAD 0.19 - If this option is set, when creating Draft objects on top of an existing face of another object, the "Support" property of the Draft object will be set to the base object. This was the standard behaviour before FreeCAD 0.19 + 如果設定了此選項，在現有物件的表面上創建草稿物件時，草稿物件的 "支持" 屬性將設置為基本物件。這是在 FreeCAD 0.19 版之前的標準行為。 @@ -1462,7 +1462,7 @@ Note that this is not fully supported, and many object will be not editable with The default color for snap symbols - The default color for snap symbols + 貼齊符號之預設顏色 @@ -1490,74 +1490,74 @@ Note that this is not fully supported, and many object will be not editable with Alternate SVG patterns location - + Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns Here you can specify a directory with custom SVG files containing <pattern> definitions to be added to the standard patterns - + SVG pattern resolution SVG pattern resolution - + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster - + SVG pattern default size SVG pattern default size - + The default size for SVG patterns The default size for SVG patterns - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) - + Preserve colors of faces during downgrade/upgrade Preserve colors of faces during downgrade/upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) - + Preserve names of faces during downgrade/upgrade Preserve names of faces during downgrade/upgrade - + Drawing view line definitions Drawing view line definitions - + Dashed line definition 虛線(Dash)設定 - - - + + + An SVG linestyle definition SVG 線條樣式定義 - + Dashdot line definition 虛線(Dashdot)設定 - + Dotted line definition 虛線(Dot)設定 @@ -1639,7 +1639,7 @@ such as "Arial:Bold" Extension lines size - Extension lines size + 延伸線尺寸 @@ -1649,7 +1649,7 @@ such as "Arial:Bold" Extension line overshoot - Extension line overshoot + 延伸線超越量 @@ -1773,6 +1773,11 @@ such as "Arial:Bold" + Font files (*.ttf *.otf *.pfb) + Font files (*.ttf *.otf *.pfb) + + + Select a font file 選擇一個字型檔 @@ -2113,7 +2118,7 @@ instead of the size they have in the DXF document If this is checked, DXF layers will be imported as Draft Layers - If this is checked, DXF layers will be imported as Draft Layers + 若勾選此項，DXF層將會以草稿層匯入 @@ -2189,7 +2194,7 @@ This might fail for post DXF R12 templates. Snapping - 對齊 + 鎖點 @@ -2250,22 +2255,22 @@ This might fail for post DXF R12 templates. The Alt modifier key - The Alt modifier key + alt編輯鍵 If checked, the Snap toolbar will be shown whenever you use snapping - 若勾選,當您使用快選時會顯示快選工具列 + 若勾選，當您使用鎖點時會顯示鎖點工具列 Show Draft Snap toolbar - 顯示底圖快選工具列 + 顯示草稿鎖點工具列 Hide Draft snap toolbar after use - 於使用後隱藏底圖鎖點工具列 + 於使用後隱藏草稿鎖點工具列 @@ -2295,32 +2300,32 @@ This might fail for post DXF R12 templates. If checked, an additional border is displayed around the grid, showing the main square size in the bottom left border - If checked, an additional border is displayed around the grid, showing the main square size in the bottom left border + 若勾選，則會在網格周圍顯示額外的邊框，並在左下邊框中顯示主方塊大小。 Show grid border - Show grid border + 顯示格線邊界 <html><head/><body><p>If checked, the outline of a human figure is displayed at the bottom left corner of the grid. This option is only effective if the BIM workbench is installed and if &quot;Show grid border&quot; option is enabled.</p></body></html> - <html><head/><body><p>If checked, the outline of a human figure is displayed at the bottom left corner of the grid. This option is only effective if the BIM workbench is installed and if &quot;Show grid border&quot; option is enabled.</p></body></html> + <html><head/><body><p>如果選中，則在網格的左下角顯示人物輪廓的輪廓。此選項僅在安裝了 BIM 工作台時而且若 &quot;顯示格線邊界&quot; 選項啟用時有效。</p></body></html> Show human figure - Show human figure + 顯示人形圖示 If set, the grid will have its two main axes colored in red, green or blue when they match global axes - If set, the grid will have its two main axes colored in red, green or blue when they match global axes + 如果設置了這個選項，當網格的主要兩個軸與全局軸匹配時，網格將會以紅色、綠色或藍色著色。 Use colored axes - Use colored axes + 使用彩色座標軸 @@ -2350,7 +2355,7 @@ This might fail for post DXF R12 templates. The number of horizontal or vertical lines of the grid - The number of horizontal or vertical lines of the grid + 網格之水平或垂直線條數目 @@ -2360,22 +2365,22 @@ This might fail for post DXF R12 templates. Grid color and transparency - Grid color and transparency + 網格顏色和透明度 The color of the grid - The color of the grid + 網格顏色 The overall transparency of the grid - The overall transparency of the grid + 網格的整體透明度 Draft Edit preferences - Draft Edit preferences + 草稿編輯偏好設定 @@ -2390,17 +2395,17 @@ This might fail for post DXF R12 templates. <html><head/><body><p>Sets the maximum number of objects Draft Edit</p><p>can process at the same time</p></body></html> - <html><head/><body><p>Sets the maximum number of objects Draft Edit</p><p>can process at the same time</p></body></html> + <html><head/><body><p>設定草稿編輯可以同時處理</p><p>的最大物件數量</p></body></html> Draft edit pick radius - Draft edit pick radius + 草稿編輯選擇半徑 Controls pick radius of edit nodes - Controls pick radius of edit nodes + 控制編輯節點的選擇半徑 @@ -2510,7 +2515,7 @@ This might fail for post DXF R12 templates. Subelement Mode - Subelement Mode + 子元件模式 @@ -2590,7 +2595,7 @@ This might fail for post DXF R12 templates. Cycle Snap - Cycle Snap + 循環貼齊 @@ -2610,7 +2615,7 @@ This might fail for post DXF R12 templates. Snap - Snap + 貼齊 @@ -2660,17 +2665,17 @@ This might fail for post DXF R12 templates. Draft Statusbar - Draft Statusbar + 草稿狀態列 Enable snap statusbar widget - Enable snap statusbar widget + 啟用貼齊狀態欄小工具 Draft snap widget - Draft snap widget + 草稿貼齊小工具 @@ -2724,7 +2729,7 @@ This might fail for post DXF R12 templates. Subelement mode - Subelement mode + 子元件模式 @@ -2739,17 +2744,17 @@ This might fail for post DXF R12 templates. Snap On/Off - Snap On/Off + 貼齊開啟/關閉 Increase snap radius - Increase snap radius + 增大貼齊半徑 Decrease snap radius - Decrease snap radius + 減少貼齊半徑 @@ -2775,7 +2780,7 @@ This might fail for post DXF R12 templates. Add custom snap point - Add custom snap point + 添加自定貼齊點 @@ -2796,7 +2801,7 @@ This might fail for post DXF R12 templates. Cycle snap object - Cycle snap object + 循環貼齊物件 @@ -2805,21 +2810,21 @@ This might fail for post DXF R12 templates. - + Top 上視圖 - + Front 前視圖 - + Side Side @@ -3031,12 +3036,12 @@ Not available if Draft preference option 'Use Part Primitives' is enabled Modify subelements - Modify subelements + 修改子元件集 If checked, subelements will be modified instead of entire objects - If checked, subelements will be modified instead of entire objects + 若勾選，子元件將會被修改而不是整個物件 @@ -3251,14 +3256,14 @@ Try moving the DWG file to a directory path without spaces and non-english chara or try saving to a lower DWG version. - + All Shapes must be coplanar All Shapes must be coplanar - + Selected Shapes must define a plane Selected Shapes must define a plane @@ -3433,7 +3438,7 @@ To enabled FreeCAD to download these libraries, answer Yes. Objects have different placements. Distance between the two base points: - Objects have different placements. Distance between the two base points: + 物件有不同的放置點。兩個基本點之間的距離是： @@ -3448,7 +3453,7 @@ To enabled FreeCAD to download these libraries, answer Yes. %s shares a base with %d other objects. Please check if you want to modify this. - %s shares a base with %d other objects. Please check if you want to modify this. + %s 與其他 %d 個物件共享一個基礎物件。請檢查您是否要修改此共享。 @@ -3496,7 +3501,7 @@ To enabled FreeCAD to download these libraries, answer Yes. Please select exactly two objects, the base object and the path object, before calling this command. - Please select exactly two objects, the base object and the path object, before calling this command. + 在呼叫此命令前，請選擇正好兩個物件，基礎物件與路徑物件。 @@ -3609,12 +3614,12 @@ To enabled FreeCAD to download these libraries, answer Yes. Convert to Draft - Convert to Draft + 轉換為草稿 Convert Draft/Sketch - Convert Draft/Sketch + 轉換為草稿/草圖 @@ -3641,7 +3646,7 @@ To enabled FreeCAD to download these libraries, answer Yes. Some subelements could not be moved. - Some subelements could not be moved. + 某些子元件集無法被移動。 @@ -3657,7 +3662,7 @@ To enabled FreeCAD to download these libraries, answer Yes. Pick radius - Pick radius + 選擇半徑 @@ -3720,17 +3725,17 @@ To enabled FreeCAD to download these libraries, answer Yes. Toggle grid - Toggle grid + 切換格線 Select an object to edit - Select an object to edit + 選擇一物件來編輯 Select a Draft object to edit - Select a Draft object to edit + 選取一個草稿物件以進行編輯 @@ -3816,7 +3821,7 @@ To enabled FreeCAD to download these libraries, answer Yes. Rotation - Rotation + 旋轉 @@ -3930,7 +3935,7 @@ The final angle will be the base angle plus this amount. Two elements needed. - Two elements needed. + 需要兩個元件。 @@ -3996,7 +4001,7 @@ The final angle will be the base angle plus this amount. Unable to trim these objects, only Draft wires and arcs are supported. - Unable to trim these objects, only Draft wires and arcs are supported. + 無法修剪這些物件，僅支援草稿線段及弧 @@ -4234,7 +4239,7 @@ The final angle will be the base angle plus this amount. Some subelements could not be scaled. - Some subelements could not be scaled. + 某些子元件集無法被縮放。 @@ -4266,7 +4271,7 @@ The final angle will be the base angle plus this amount. Please select exactly two objects, the base object and the point object, before calling this command. - Please select exactly two objects, the base object and the point object, before calling this command. + 在呼叫此命令前，請選擇正好兩個物件，基礎物件與點物件。 @@ -4276,7 +4281,7 @@ The final angle will be the base angle plus this amount. No active Draft Toolbar. - No active Draft Toolbar. + 無活動中的草稿工具列。 @@ -4309,7 +4314,7 @@ The final angle will be the base angle plus this amount. Create Dimension (radial) - Create Dimension (radial) + 建立尺寸（圓弧） @@ -4468,7 +4473,7 @@ The final angle will be the base angle plus this amount. Task panel: - Task panel: + 工作面板： @@ -4483,7 +4488,7 @@ The final angle will be the base angle plus this amount. At least one element must be selected. - At least one element must be selected. + 至少必須選擇一個元件。 @@ -4500,12 +4505,12 @@ The final angle will be the base angle plus this amount. Object: - Object: + 物件: Number of elements must be at least 2. - Number of elements must be at least 2. + 元件數目必須至少為 2。 @@ -4521,26 +4526,26 @@ The final angle will be the base angle plus this amount. Center reset: - Center reset: + 中心重設: Fuse: - Fuse: + 聯集: Create Link array: - Create Link array: + 建立連結陣列： Number of elements: - Number of elements: + 元件數目： @@ -4551,14 +4556,14 @@ The final angle will be the base angle plus this amount. Center of rotation: - Center of rotation: + 旋轉中心點: Aborted: - Aborted: + 已中止: @@ -4572,7 +4577,7 @@ The final angle will be the base angle plus this amount. Number of elements must be at least 1. - Number of elements must be at least 1. + 元件數目必須至少為 1。 @@ -4592,7 +4597,7 @@ The final angle will be the base angle plus this amount. Number of X elements: - Number of X elements: + X 元件的數目： @@ -4602,7 +4607,7 @@ The final angle will be the base angle plus this amount. Number of Y elements: - Number of Y elements: + Y 元件的數目： @@ -4612,7 +4617,7 @@ The final angle will be the base angle plus this amount. Number of Z elements: - Number of Z elements: + Z 元件的數目： @@ -4641,65 +4646,70 @@ The final angle will be the base angle plus this amount. Number of layers must be at least 2. - Number of layers must be at least 2. + 層數必須至少為 2。 Radial distance is zero. Resulting array may not look correct. - Radial distance is zero. Resulting array may not look correct. + 徑向距離為零。生成的陣列可能看起來不正確。" Radial distance is negative. It is made positive to proceed. - Radial distance is negative. It is made positive to proceed. + 徑向距離為負數。它被變為正數以繼續進行。 Tangential distance cannot be zero. - Tangential distance cannot be zero. + 切線距離不能為零。 Tangential distance is negative. It is made positive to proceed. - Tangential distance is negative. It is made positive to proceed. + 切線距離為負數。它會被轉為正數以繼續進行。 Radial distance: - Radial distance: + 徑向距離: Tangential distance: - Tangential distance: + 切線距離: Number of circular layers: - Number of circular layers: + 環形層數： Symmetry parameter: - Symmetry parameter: + 對稱參數: - - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties - added 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ScaleToSize' and 'Fuse' properties + + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties + added 'Fuse', 'Justification', 'JustificationReference', 'KeepLeftMargin', 'ObliqueAngle' and 'ScaleToSize' properties - + changed 'Tracking' property type changed 'Tracking' property type - + + ShapeString: oblique angle must be in the -80 to +80 degree range + ShapeString: oblique angle must be in the -80 to +80 degree range + + + ShapeString: string has no wires ShapeString: string has no wires - + ShapeString: face creation failed for one character ShapeString: face creation failed for one character @@ -4789,7 +4799,7 @@ The final angle will be the base angle plus this amount. Two elements are needed. - Two elements are needed. + 需要兩個元件。 @@ -4905,7 +4915,7 @@ The final angle will be the base angle plus this amount. Wrong input: must be a vector. - Wrong input: must be a vector. + 錯誤輸入: 必須為一向量。 @@ -4940,14 +4950,14 @@ The final angle will be the base angle plus this amount. Wrong input: must be an integer number. - Wrong input: must be an integer number. + 錯誤輸入: 必須為一整數。 Input: number of elements must be at least 1. It is set to 1. - Input: number of elements must be at least 1. It is set to 1. + 輸入：元件數量必須至少為1。已被設為 1。 @@ -4980,7 +4990,7 @@ The final angle will be the base angle plus this amount. Wrong input: subelement not in object. - Wrong input: subelement not in object. + 錯誤輸入：子元件不在物件中。 @@ -5019,7 +5029,7 @@ The final angle will be the base angle plus this amount. Wrong input: must be a list of two elements. For example, [object, 'Edge1']. - Wrong input: must be a list of two elements. For example, [object, 'Edge1']. + 錯誤輸入：必須為一包含兩元件的清單。舉例來說 [object, 'Edge1']。 @@ -5045,7 +5055,7 @@ The final angle will be the base angle plus this amount. Wrong input: object doesn't have at least one element in 'Vertexes' to use for measuring. - Wrong input: object doesn't have at least one element in 'Vertexes' to use for measuring. + 錯誤輸入：物件在 'Vertexes' 中至少需要有一个元件來用於測量。 @@ -5072,7 +5082,7 @@ The final angle will be the base angle plus this amount. Wrong input: object doesn't have at least one element in 'Edges' to use for measuring. - Wrong input: object doesn't have at least one element in 'Edges' to use for measuring. + 錯誤輸入：物件在 'Edges' 中至少需要有一個元件用於測量。 @@ -5104,7 +5114,7 @@ The final angle will be the base angle plus this amount. Wrong input: must be a number or quantity. - Wrong input: must be a number or quantity. + 錯誤輸入: 必須是數字或數量。 @@ -5380,28 +5390,28 @@ The final angle will be the base angle plus this amount. Draft creation tools - Draft creation tools + 草稿創建工具 Draft annotation tools - Draft annotation tools + 草稿註解工具 Draft modification tools - Draft modification tools + 草稿修改工具 Draft utility tools - Draft utility tools + 草稿實用工具 Draft snap - Draft snap + 草稿鎖點 @@ -5453,7 +5463,7 @@ from menu Tools -> Addon Manager You must choose a base object before using this command - You must choose a base object before using this command + 在使用此命令前您必須選擇基礎物件 @@ -5483,7 +5493,7 @@ from menu Tools -> Addon Manager Warning - Warning + 警告 @@ -5568,7 +5578,7 @@ from menu Tools -> Addon Manager Modify subelements - Modify subelements + 修改子元件集 @@ -5783,7 +5793,7 @@ The path can be a polyline, B-spline, Bezier curve, or even edges from other obj Path Link array - Path Link array + 路徑連結陣列 @@ -5811,15 +5821,13 @@ if any. If many objects or many subelements are selected, only the first one in each case will be used to provide information to the label. - Creates a label, optionally attached to a selected object or subelement. + 創建一個標籤，可選擇附加到所選物件或子元件。 -First select a vertex, an edge, or a face of an object, then call this command, -and then set the position of the leader line and the textual label. -The label will be able to display information about this object, and about the selected subelement, -if any. +首先選擇一個物件的頂點、邊緣或面，然後呼叫此命令， +然後設定標籤線的位置和文本標籤。 +該標籤將能夠顯示有關該物件以及所選子元件（如果有的話）的資訊。 -If many objects or many subelements are selected, only the first one in each case -will be used to provide information to the label. +如果選擇了多個物件或多個子元件，則每種情況只會使用第一個來提供資訊給標籤。 @@ -5832,7 +5840,7 @@ will be used to provide information to the label. Creates a 2-point line. CTRL to snap, SHIFT to constrain. - Creates a 2-point line. CTRL to snap, SHIFT to constrain. + 創建一條具有2個端點的線。按住 CTRL 進行鎖點，按住 SHIFT 進行約束。 @@ -5845,7 +5853,7 @@ will be used to provide information to the label. Creates a multiple-points line (polyline). CTRL to snap, SHIFT to constrain. - Creates a multiple-points line (polyline). CTRL to snap, SHIFT to constrain. + 創建多點線（聚合線）。按住 CTRL 進行貼齊，按住 SHIFT 進行約束。 @@ -5886,7 +5894,7 @@ The lines must share a common point at the start or at the end for the operation Creates a multi-line annotation. CTRL to snap. - Creates a multi-line annotation. CTRL to snap. + 創建多行註解。按住 CTRL 進行對齊。 @@ -5894,7 +5902,7 @@ The lines must share a common point at the start or at the end for the operation Draft to Sketch - Draft to Sketch + 草稿至草圖 @@ -5911,12 +5919,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Lock - Snap Lock + 鎖點鎖定 Enables or disables snapping globally. - Enables or disables snapping globally. + 全局啟用或停用鎖點功能。 @@ -5924,12 +5932,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Midpoint - Snap Midpoint + 貼齊中點 Snaps to the midpoint of edges. - Snaps to the midpoint of edges. + 貼齊到邊的中點。 @@ -5937,12 +5945,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Perpendicular - Snap Perpendicular + 貼齊垂直方向 Snaps to the perpendicular points on faces and edges. - Snaps to the perpendicular points on faces and edges. + 貼齊至面與邊的垂直點。 @@ -5950,12 +5958,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Grid - Snap Grid + 貼齊網格 Snaps to the intersections of grid lines. - Snaps to the intersections of grid lines. + 貼齊至網格線的交叉點。 @@ -5963,12 +5971,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Intersection - Snap Intersection + 貼齊相交 Snaps to the intersection of two edges. - Snaps to the intersection of two edges. + 貼齊至兩個邊的交叉點。 @@ -5976,12 +5984,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Parallel - Snap Parallel + 平行貼齊 Snaps to an imaginary line parallel to straight edges. - Snaps to an imaginary line parallel to straight edges. + 貼齊至與直線邊緣平行的虛構線。 @@ -5989,12 +5997,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Endpoint - Snap Endpoint + 貼齊終點 Snaps to the endpoints of edges. - Snaps to the endpoints of edges. + 貼齊至邊緣終點。 @@ -6002,12 +6010,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Angle - Snap Angle + 貼齊角度 Snaps to the special cardinal points on circular edges, at multiples of 30° and 45°. - Snaps to the special cardinal points on circular edges, at multiples of 30° and 45°. + 貼齊至圓形邊緣上的特殊主要點，多為 30° 和 45° 的整數倍。 @@ -6015,12 +6023,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Center - Snap Center + 貼齊中心 Snaps to the center point of faces and circular edges, and to the Placement point of Working Plane Proxies and Building Parts. - Snaps to the center point of faces and circular edges, and to the Placement point of Working Plane Proxies and Building Parts. + 貼齊至面和圓形邊緣的中心點，以及工作平面代理和建築部件的放置點。 @@ -6028,12 +6036,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Extension - Snap Extension + 貼齊延伸 Snaps to an imaginary line that extends beyond the endpoints of straight edges. - Snaps to an imaginary line that extends beyond the endpoints of straight edges. + 貼齊至延伸超出直線邊緣端點的虛構線。 @@ -6041,12 +6049,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Near - Snap Near + 鄰近貼齊 Snaps to the nearest point on faces and edges. - Snaps to the nearest point on faces and edges. + 貼齊至面與邊的最近點。 @@ -6054,12 +6062,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Ortho - Snap Ortho + 貼齊頂部 Snaps to imaginary lines that cross the previous point at multiples of 45°. - Snaps to imaginary lines that cross the previous point at multiples of 45°. + 貼齊至虛構線，其以 45° 的整數倍穿越前一個點。 @@ -6067,12 +6075,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Special - Snap Special + 特殊貼齊 Snaps to special points defined by the object. - Snaps to special points defined by the object. + 貼齊至由物件定義的特殊點。 @@ -6080,12 +6088,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Dimensions - Snap Dimensions + 貼齊尺寸 Shows temporary X and Y dimensions. - Shows temporary X and Y dimensions. + 顯示暫時的 X 與 Y 尺寸。 @@ -6093,12 +6101,12 @@ However, a single sketch with disconnected traces will be converted into several Snap Working Plane - Snap Working Plane + 貼齊工作平面 Projects snap points onto the current working plane. - Projects snap points onto the current working plane. + 投影貼齊點到目前工作平面上。 @@ -6106,12 +6114,12 @@ However, a single sketch with disconnected traces will be converted into several Show snap toolbar - Show snap toolbar + 顯示鎖點工具列 Shows the snap toolbar if it is hidden. - Shows the snap toolbar if it is hidden. + 顯示鎖點工作列若其為隱藏狀態。 @@ -6126,9 +6134,9 @@ However, a single sketch with disconnected traces will be converted into several Moves the selected objects from one base point to another point. If the "copy" option is active, it will create displaced copies. CTRL to snap, SHIFT to constrain. - Moves the selected objects from one base point to another point. -If the "copy" option is active, it will create displaced copies. -CTRL to snap, SHIFT to constrain. + 將選定的物件從一個基點移動到另一個點。 +如果啟用了 "複製" 選項，它將創建位移的副本。 +按住 CTRL 進行鎖點，按住 SHIFT 以約束。 @@ -6142,8 +6150,8 @@ CTRL to snap, SHIFT to constrain. Creates a circular arc by a center point and a radius. CTRL to snap, SHIFT to constrain. - Creates a circular arc by a center point and a radius. -CTRL to snap, SHIFT to constrain. + 通過中心點和半徑來建立圓弧。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。 @@ -6157,8 +6165,8 @@ CTRL to snap, SHIFT to constrain. Creates a circular arc by picking 3 points. CTRL to snap, SHIFT to constrain. - Creates a circular arc by picking 3 points. -CTRL to snap, SHIFT to constrain. + 通過選擇3個點來建立圓弧。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。 @@ -6179,12 +6187,12 @@ CTRL to snap, SHIFT to constrain. Toggle grid - Toggle grid + 切換格線 Toggles the Draft grid on and off. - Toggles the Draft grid on and off. + 開/關顯示草稿格線 @@ -6192,12 +6200,12 @@ CTRL to snap, SHIFT to constrain. Subelement highlight - Subelement highlight + 子元件突出顯示 Highlight the subelements of the selected objects, so that they can then be edited with the move, rotate, and scale tools. - Highlight the subelements of the selected objects, so that they can then be edited with the move, rotate, and scale tools. + 突出顯示所選物件的子元件，以便他們可以使用移動、旋轉與縮放工具編輯。 @@ -6256,10 +6264,9 @@ on supported nodes and on supported objects. creating various circular layers. The array can be turned into an orthogonal or a polar array by changing its type. - Creates copies of the selected object, and places the copies in a radial pattern -creating various circular layers. + 複製所選物件，並將副本以徑向模式放置，以創建多個環形層次。 -The array can be turned into an orthogonal or a polar array by changing its type. +此陣列可藉由改變其類型轉換為正交陣列或極坐標陣列。 @@ -6300,9 +6307,9 @@ The array can be turned into an orthogonal or a polar array by changing its type Rotates the selected objects. Choose the center of rotation, then the initial angle, and then the final angle. If the "copy" option is active, it will create rotated copies. CTRL to snap, SHIFT to constrain. Hold ALT and click to create a copy with each click. - Rotates the selected objects. Choose the center of rotation, then the initial angle, and then the final angle. -If the "copy" option is active, it will create rotated copies. -CTRL to snap, SHIFT to constrain. Hold ALT and click to create a copy with each click. + 旋轉選定的物件。選擇旋轉中心，然後選擇初始角度和最終角度。 +如果啟用了 "複製" 選項，它將建立旋轉的副本。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。按住 ALT 鍵並點擊以每次點擊創建一個副本。 @@ -6417,8 +6424,8 @@ Then you can use it to save a different camera position and objects' states any Flip the normal direction of the selected dimensions (linear, radial, angular). If other objects are selected they are ignored. - Flip the normal direction of the selected dimensions (linear, radial, angular). -If other objects are selected they are ignored. + 翻轉所選尺寸（線性、徑向、角度）的法線方向。 +如果其他物件被選擇，則忽略它們。 @@ -6458,8 +6465,8 @@ If other objects are selected they are ignored. Creates a regular polygon (triangle, square, pentagon, ...), by defining the number of sides and the circumscribed radius. CTRL to snap, SHIFT to constrain - Creates a regular polygon (triangle, square, pentagon, ...), by defining the number of sides and the circumscribed radius. -CTRL to snap, SHIFT to constrain + 通過定義邊數和外接半徑來創建正多邊形（三角形、正方形、五邊形，...）。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。 @@ -6504,7 +6511,8 @@ CTRL snaps, SHIFT constrains to current segment or to normal, ALT inverts. Creates a multiple-point B-spline. CTRL to snap, SHIFT to constrain. - Creates a multiple-point B-spline. CTRL to snap, SHIFT to constrain. + 建立一多點 B 雲形線。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。 @@ -6531,8 +6539,8 @@ CTRL snaps, SHIFT constrains to current segment or to normal, ALT inverts. Creates an N-degree Bézier curve. The more points you pick, the higher the degree. CTRL to snap, SHIFT to constrain. - Creates an N-degree Bézier curve. The more points you pick, the higher the degree. -CTRL to snap, SHIFT to constrain. + 建立一個 N 階貝茲曲線。選擇的點越多，階層就越高。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。 @@ -6547,9 +6555,9 @@ CTRL to snap, SHIFT to constrain. Creates a Bézier curve made of 2nd degree (quadratic) and 3rd degree (cubic) segments. Click and drag to define each segment. After the curve is created you can go back to edit each control point and set the properties of each knot. CTRL to snap, SHIFT to constrain. - Creates a Bézier curve made of 2nd degree (quadratic) and 3rd degree (cubic) segments. Click and drag to define each segment. -After the curve is created you can go back to edit each control point and set the properties of each knot. -CTRL to snap, SHIFT to constrain. + 創建由二次（二次）和三次（三次）段組成的貝茲曲線。單擊並拖曳以定義每個段。 +在創建曲線後，您可以返回編輯每個控制點並設定每個結點的屬性。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。 @@ -6590,7 +6598,7 @@ CTRL to snap, ALT to select tangent objects. Creates an ellipse. CTRL to snap. - Creates an ellipse. CTRL to snap. + 建立一個橢圓。CTRL可鎖點。 @@ -6636,8 +6644,8 @@ The array can be turned into a polar or a circular array by changing its type. Scales the selected objects from a base point. CTRL to snap, SHIFT to constrain, ALT to copy. - Scales the selected objects from a base point. -CTRL to snap, SHIFT to constrain, ALT to copy. + 從基點縮放被選的物件。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。按住 ALT 鍵進行複製。 @@ -6666,8 +6674,8 @@ Objects added to this layer can share the same visual properties such as line co Creates copies of the selected base object at the points of a point object. First select the base object, and then select the point object. - Creates copies of the selected base object at the points of a point object. -First select the base object, and then select the point object. + 在點物件的點處複製所選的基礎物件。 +先選基礎物件，然後選點物件。 @@ -6675,7 +6683,7 @@ First select the base object, and then select the point object. PointLinkArray - PointLinkArray + 點連結陣列 @@ -6768,18 +6776,16 @@ You may select a single line or single circular arc before launching this comman to create the corresponding linked dimension. You may also select an 'App::MeasureDistance' object before launching this command to turn it into a 'Draft Dimension' object. - Creates a dimension. + 創建尺寸。 -- Pick three points to create a simple linear dimension. -- Select a straight line to create a linear dimension linked to that line. -- Select an arc or circle to create a radius or diameter dimension linked to that arc. -- Select two straight lines to create an angular dimension between them. -CTRL to snap, SHIFT to constrain, ALT to select an edge or arc. +- 選擇三個點以創建簡單的線性尺寸。 +- 選擇一條直線以創建與該直線關聯的線性尺寸。 +- 選擇一個弧或圓以創建與該弧關聯的半徑或直徑尺寸。 +- 選擇兩條直線以在它們之間創建角度尺寸。 + 按住 CTRL 進行鎖點，按住 SHIFT 進行約束，按住 ALT 選擇邊緣或弧。 -You may select a single line or single circular arc before launching this command -to create the corresponding linked dimension. -You may also select an 'App::MeasureDistance' object before launching this command -to turn it into a 'Draft Dimension' object. +在啟動此命令之前，您可以選擇單條線或單個圓弧，以創建相應的關聯尺寸。 +您也可以在啟動此命令之前選擇一個 'App::MeasureDistance' 物件，將其轉換為 'Draft Dimension' 物件。 @@ -6943,9 +6949,9 @@ convert closed edges into filled faces and parametric polygons, and merge faces Offsets of the selected object. It can also create an offset copy of the original object. CTRL to snap, SHIFT to constrain. Hold ALT and click to create a copy with each click. - Offsets of the selected object. -It can also create an offset copy of the original object. -CTRL to snap, SHIFT to constrain. Hold ALT and click to create a copy with each click. + 選定物件的偏移量。 +它還可以創建原始物件的偏移副本。 +按住 CTRL 進行鎖點，按住 SHIFT 進行約束。按住 ALT 鍵並點擊以每次點擊創建一個副本。 @@ -7021,69 +7027,74 @@ For example, it explodes the selected polylines into simpler faces, wires, and t The placement of the base point of the first line - The placement of the base point of the first line + 第一行基準點的位置 The text displayed by this object. It is a list of strings; each element in the list will be displayed in its own line. - The text displayed by this object. -It is a list of strings; each element in the list will be displayed in its own line. + 此物件顯示的文字。 +它是一個字串列表； 列表中的每個元件都將顯示在自己的行中。 - + Text string 文字字串 - + Font file name Font file name - + Height of text Height of text - + Horizontal and vertical alignment Horizontal and vertical alignment - + Height reference used for justification Height reference used for justification - + Keep left margin and leading white space when justification is left Keep left margin and leading white space when justification is left - + Scale to ensure cap height is equal to size Scale to ensure cap height is equal to size - + Inter-character spacing Inter-character spacing - + + Oblique (slant) angle + Oblique (slant) angle + + + Fill letters with faces Fill letters with faces - + Fuse faces if faces overlap, usually not required (can be very slow) Fuse faces if faces overlap, usually not required (can be very slow) The base object used by this object - The base object used by this object + 此物件所使用的基礎物件 @@ -7199,7 +7210,7 @@ set True for fusion or False for compound The base object that will be duplicated. - The base object that will be duplicated. + 此基礎物件將會被複製。 @@ -7223,7 +7234,7 @@ set True for fusion or False for compound Show the individual array elements (only for Link arrays) - Show the individual array elements (only for Link arrays) + 顯示單個陣列元件（僅適用於連結陣列） @@ -7291,7 +7302,7 @@ depending on the value of 'Straight Direction'. The placement of the 'Text' element in 3D space - The placement of the 'Text' element in 3D space + 3D 空間中「文字」元件的位置 @@ -7352,7 +7363,7 @@ they will only be editable by changing the style through the 'Annotation style e The base object that will be duplicated - The base object that will be duplicated + 此基礎物件將會被複製 @@ -7419,8 +7430,8 @@ To get better results with 'Original' or 'Tangent' you may have to set 'Force Ve Orient the copies along the path depending on the 'Align Mode'. Otherwise the copies will have the same orientation as the original Base object. - Orient the copies along the path depending on the 'Align Mode'. -Otherwise the copies will have the same orientation as the original Base object. + 根據“對齊模式”沿著路徑定位副本。 +否則，副本將具有與原始基本物件相同的方向。 @@ -7428,10 +7439,10 @@ Otherwise the copies will have the same orientation as the original Base object. - Ortho: places the copies in the direction of the global X, Y, Z axes. - Polar: places the copies along a circular arc, up to a specified angle, and with certain orientation defined by a center and an axis. - Circular: places the copies in concentric circular layers around the base object. - The type of array to create. -- Ortho: places the copies in the direction of the global X, Y, Z axes. -- Polar: places the copies along a circular arc, up to a specified angle, and with certain orientation defined by a center and an axis. -- Circular: places the copies in concentric circular layers around the base object. + 要建立的陣列類型。 +- Ortho：將副本放置於全域 X、Y、Z 軸的方向上。 +- Polar：將副本沿圓弧放置，直到指定角度，並具有由中心和軸定義的特定方向。 +- Circular：將副本放置於環繞基礎物件的同心圓層中。 @@ -7507,17 +7518,17 @@ Leave this property empty to be able to set 'Axis' and 'Center' manually. Distance between circular layers - Distance between circular layers + 環形圖層之間的距離 Distance between copies in the same circular layer - Distance between copies in the same circular layer + 同一環形圖層中副本之間的距離 Number of circular layers. The 'Base' object counts as one layer. - Number of circular layers. The 'Base' object counts as one layer. + 環形圖層的數量。「基礎」物件計為一層。 @@ -7534,7 +7545,7 @@ This property is read-only, as the number depends on the parameters of the array Base object that will be duplicated - Base object that will be duplicated + 基礎物件將會被複製 @@ -7557,7 +7568,7 @@ This property is read-only, as the number depends on the points in 'Point Object The base object this 2D view must represent - The base object this 2D view must represent + 此 2D 視圖必須表示的基礎物件 @@ -7621,12 +7632,12 @@ This property is read-only, as the number depends on the points in 'Point Object If this is True, only solid geometry is handled. This overrides the base object's Only Solids property - If this is True, only solid geometry is handled. This overrides the base object's Only Solids property + 若此為真，則僅處理實體幾何。這將覆蓋基本物件的唯一實體屬性 If this is True, the contents are clipped to the borders of the section plane, if applicable. This overrides the base object's Clip property - If this is True, the contents are clipped to the borders of the section plane, if applicable. This overrides the base object's Clip property + 若此為真，如果適用的話內容將被裁剪到切面的邊界。這將覆蓋基本物件的裁剪屬性 @@ -7769,14 +7780,11 @@ is to the measured object. that displays the measured radius or diameter. - For angular dimensions, this controls the radius of the dimension arc that displays the measured angle. - A point through which the dimension line, or an extrapolation of it, will pass. + 經過尺寸線或其外推的點。 -- For linear dimensions, this property controls how close the dimension line -is to the measured object. -- For radial dimensions, this controls the direction of the dimension line -that displays the measured radius or diameter. -- For angular dimensions, this controls the radius of the dimension arc -that displays the measured angle. +- 對於線性尺寸，此屬性控制尺寸線與被測對象的接近程度。 +- 對於徑向尺寸，這控制顯示測量半徑或直徑的尺寸線的方向。 +- 對於角度尺寸，這控制顯示測量角度的尺寸弧的半徑。 @@ -7889,7 +7897,7 @@ the 'First Angle' and 'Last Angle' properties. Linked faces - Linked faces + 相連的面 @@ -7934,7 +7942,7 @@ the 'First Angle' and 'Last Angle' properties. The base object is the wire, it's formed from 2 objects - The base object is the wire, it's formed from 2 objects + 此基礎物件是線，它由兩個物件所形成 @@ -7994,7 +8002,7 @@ the 'First Angle' and 'Last Angle' properties. Show the individual array elements - Show the individual array elements + 顯示單獨的陣列元件 diff --git a/src/Mod/Draft/WorkingPlane.py b/src/Mod/Draft/WorkingPlane.py index 44c5a1d739..d82e8198fc 100644 --- a/src/Mod/Draft/WorkingPlane.py +++ b/src/Mod/Draft/WorkingPlane.py @@ -35,13 +35,14 @@ YZ, and XZ planes. # in FreeCAD and a couple of utility functions. import math -from sys import float_info import lazy_loader.lazy_loader as lz import FreeCAD import DraftVecUtils from FreeCAD import Vector +from draftutils import gui_utils from draftutils import utils +from draftutils.messages import _wrn from draftutils.translate import translate DraftGeomUtils = lz.LazyLoader("DraftGeomUtils", globals(), "DraftGeomUtils") @@ -534,7 +535,7 @@ class PlaneBase: direction: Base.Vector, optional Defaults to `None` in which case the WP `axis` is used. Direction of projection. - force_projection: Bool, optional + force_projection: bool, optional Defaults to `True`. See DraftGeomUtils.project_point_on_plane @@ -591,617 +592,205 @@ class PlaneBase: "position"] -class Plane: - """A WorkPlane object. +class Plane(PlaneBase): + """The old Plane class. Parameters ---------- - u: Base::Vector3, optional - An axis (vector) that helps define the working plane. - It defaults to `(1, 0, 0)`, or the +X axis. + u: Base.Vector or WorkingPlane.Plane, optional + Defaults to Vector(1, 0, 0). + If a WP is provided: + A copy of the WP is created, all other parameters are then ignored. + If a vector is provided: + Unit vector for the `u` attribute (+X axis). - v: Base::Vector3, optional - An axis (vector) that helps define the working plane. - It defaults to `(0, 1, 0)`, or the +Y axis. + v: Base.Vector, optional + Defaults to Vector(0, 1, 0). + Unit vector for the `v` attribute (+Y axis). - w: Base::Vector3, optional - An axis that is supposed to be perpendicular to `u` and `v`; - it is redundant. - It defaults to `(0, 0, 1)`, or the +Z axis. + w: Base.Vector, optional + Defaults to Vector(0, 0, 1). + Unit vector for the `axis` attribute (+Z axis). - pos: Base::Vector3, optional - A point through which the plane goes through. - It defaults to the origin `(0, 0, 0)`. + pos: Base.Vector, optional + Defaults to Vector(0, 0, 0). + Vector for the `position` attribute (origin). - Attributes - ---------- - doc: App::Document - The active document. Reset view when `doc` changes. + Note that the u, v and w vectors are not checked for validity. + Other attributes + ---------------- weak: bool - It is `True` if the plane has been defined by `setup()` - or has been reset. A weak plane can be changed - (it is the "auto" mode), while a strong plane will keep - its position until weakened (it is "locked") + A weak WP is in "Auto" mode and will adapt to the current view. - u: Base::Vector3 - An axis (vector) that helps define the working plane. - - v: Base::Vector3 - An axis (vector) that helps define the working plane. - - axis: Base::Vector3 - A vector that is supposed to be perpendicular to `u` and `v`; - it is helpful although redundant. - - position: Base::Vector3 - A point, which the plane goes through, - that helps define the working plane. - - stored: bool + stored: None/list A placeholder for a stored state. """ def __init__(self, u=Vector(1, 0, 0), v=Vector(0, 1, 0), w=Vector(0, 0, 1), - pos=Vector(0, 0, 0)): + pos=Vector(0, 0, 0), + weak=True): - # keep track of active document. Reset view when doc changes. - self.doc = None - self.weak = True - self.u = u - self.v = v - self.axis = w - self.position = pos + if isinstance(u, Plane): + self.match(u) + return + super().__init__(u, v, w, pos) + self.weak = weak # a placeholder for a stored state self.stored = None - def __repr__(self): - """Show the string representation of the object.""" - text = "Workplane" - text += " x=" + str(DraftVecUtils.rounded(self.u)) - text += " y=" + str(DraftVecUtils.rounded(self.v)) - text += " z=" + str(DraftVecUtils.rounded(self.axis)) - return text - def copy(self): - """Return a new plane that is a copy of the present object.""" - p = plane(u=self.u, v=self.v, w=self.axis, pos=self.position) - p.weak = self.weak - return p + """See PlaneBase.copy.""" + wp = Plane() + self.match(source=self, target=wp) + return wp - def offsetToPoint(self, p, direction=None): - """Return the signed distance from a point to the plane. + def offsetToPoint(self, point, direction=None): + """Return the signed distance from a point to the plane. The direction + argument is ignored. - Parameters - ---------- - p : Base::Vector3 - The external point to consider. - - direction : Base::Vector3, optional - The unit vector that indicates the direction of the distance. - - It defaults to `None`, which then uses the `plane.axis` (normal) - value, meaning that the measured distance is perpendicular - to the plane. - - Returns - ------- - float - The distance from the point to the plane. - - Notes - ----- - The signed distance `d`, from `p` to the plane, is such that - :: - x = p + d*direction, - - where `x` is a point that lies on the plane. - - The `direction` is a unit vector that specifies the direction - in which the distance is measured. - It defaults to `plane.axis`, - meaning that it is the perpendicular distance. - - A picture will help explain the computation - :: - p - //| - / / | - d / / | axis - / / | - / / | - -------- plane -----x-----c-----a-------- - - The points are as follows - - * `p` is an arbitrary point outside the plane. - * `c` is a known point on the plane, - for example, `plane.position`. - * `x` is the intercept on the plane from `p` in - the desired `direction`. - * `a` is the perpendicular intercept on the plane, - i.e. along `plane.axis`. - - The distance is calculated through the dot product - of the vector `pc` (going from point `p` to point `c`, - both of which are known) with the unit vector `direction` - (which is provided or defaults to `plane.axis`). - :: - d = pc . direction - d = (c - p) . direction - - **Warning:** this implementation doesn't calculate the entire - distance `|xp|`, only the distance `|pc|` projected onto `|xp|`. - - Trigonometric relationships - --------------------------- - In 2D the distances can be calculated by trigonometric relationships - :: - |ap| = |cp| cos(apc) = |xp| cos(apx) - - Then the desired distance is `d = |xp|` - :: - |xp| = |cp| cos(apc) / cos(apx) - - The cosines can be obtained from the definition of the dot product - :: - A . B = |A||B| cos(angleAB) - - If one vector is a unit vector - :: - A . uB = |A| cos(angleAB) - cp . axis = |cp| cos(apc) - - and if both vectors are unit vectors - :: - uA . uB = cos(angleAB). - direction . axis = cos(apx) - - Then - :: - d = (cp . axis) / (direction . axis) - - **Note:** for 2D these trigonometric operations - produce the full `|xp|` distance. + The returned value is the negative of the local Z coordinate of the point. """ - if direction is None: - direction = self.axis - return direction.dot(self.position.sub(p)) + return -DraftGeomUtils.distance_to_plane(point, self.position, self.axis) - def projectPoint(self, p, direction=None, force_projection=True): - """Project a point onto the plane, by default orthogonally. - - Parameters - ---------- - p : Base::Vector3 - The point to project. - direction : Base::Vector3, optional - The unit vector that indicates the direction of projection. - - It defaults to `None`, which then uses the `plane.axis` (normal) - value, meaning that the point is projected perpendicularly - to the plane. - force_projection: Bool, optional - Forces the projection if the deviation between the direction and - the normal is less than float epsilon from the orthogonality. - The direction of projection is modified to a float epsilon - deviation between the direction and the orthogonal. - It defaults to True. - - Returns - ------- - Base::Vector3 - The projected vector, scaled to the appropriate distance. - """ - - axis = Vector(self.axis).normalize() - if direction is None: - dir = axis - else: - dir = Vector(direction).normalize() - - cos = dir.dot(axis) - delta_ax_proj = (p - self.position).dot(axis) - # check the only conflicting case: direction orthogonal to axis - if abs(cos) <= float_info.epsilon: - if force_projection: - cos = math.copysign(float_info.epsilon, delta_ax_proj) - dir = axis.cross(dir).cross(axis) - cos*axis - else: - return None - - proj = p - delta_ax_proj/cos*dir - - return proj - - def projectPointOld(self, p, direction=None): - """Project a point onto the plane. OBSOLETE. - - Parameters - ---------- - p : Base::Vector3 - The point to project. - direction : Base::Vector3, optional - The unit vector that indicates the direction of projection. - - It defaults to `None`, which then uses the `plane.axis` (normal) - value, meaning that the point is projected perpendicularly - to the plane. - - Returns - ------- - Base::Vector3 - The projected point, - or the original point if the angle between the `direction` - and the `plane.axis` is 90 degrees. - """ - if not direction: - direction = self.axis - t = Vector(direction) - # t.normalize() - a = round(t.getAngle(self.axis), DraftVecUtils.precision()) - pp = round((math.pi)/2, DraftVecUtils.precision()) - if a == pp: - return p - t.multiply(self.offsetToPoint(p, direction)) - return p.add(t) + def projectPoint(self, point, direction=None, force_projection=True): + """See PlaneBase.project_point.""" + return super().project_point(point, direction, force_projection) def alignToPointAndAxis(self, point, axis, offset=0, upvec=None): - """Align the working plane to a point and an axis (vector). - - Set `v` as the cross product of `axis` with `(1, 0, 0)` or `+X`, - and `u` as `v` rotated -90 degrees around the `axis`. - Also set `weak` to `False`. - - Parameters - ---------- - point : Base::Vector3 - The new `position` of the plane, adjusted by - the `offset`. - axis : Base::Vector3 - A vector whose unit vector will be used as the new `axis` - of the plane. - If it is very close to the `X` or `-X` axes, - it will use this axis exactly, and will adjust `u` and `v` - to `+Y` and `+Z`, or `-Y` and `+Z`, respectively. - offset : float, optional - Defaults to zero. A value which will be used to offset - the plane in the direction of its `axis`. - upvec : Base::Vector3, optional - Defaults to `None`. - If it exists, its unit vector will be used as `v`, - and will set `u` as the cross product of `v` with `axis`. - """ - self.doc = FreeCAD.ActiveDocument - self.axis = axis - self.axis.normalize() - if axis.getAngle(Vector(1, 0, 0)) < 0.00001: - self.axis = Vector(1, 0, 0) - self.u = Vector(0, 1, 0) - self.v = Vector(0, 0, 1) - elif axis.getAngle(Vector(-1, 0, 0)) < 0.00001: - self.axis = Vector(-1, 0, 0) - self.u = Vector(0, -1, 0) - self.v = Vector(0, 0, 1) - elif upvec: - self.u = upvec.cross(self.axis) - self.u.normalize() - self.v = self.axis.cross(self.u) - self.v.normalize() - else: - self.v = axis.cross(Vector(1, 0, 0)) - self.v.normalize() - self.u = DraftVecUtils.rotate(self.v, -math.pi/2, self.axis) - self.u.normalize() - offsetVector = Vector(axis) - offsetVector.multiply(offset) - self.position = point.add(offsetVector) + """See PlaneBase.align_to_point_and_axis.""" + if upvec is None: + upvec = Vector(1, 0, 0) + super().align_to_point_and_axis(point, axis, offset, upvec) self.weak = False - # Console.PrintMessage("(position = " + str(self.position) + ")\n") - # Console.PrintMessage(self.__repr__() + "\n") + return True def alignToPointAndAxis_SVG(self, point, axis, offset=0): - """Align the working plane to a point and an axis (vector). - - It aligns `u` and `v` based on the magnitude of the components - of `axis`. - Also set `weak` to `False`. - - Parameters - ---------- - point : Base::Vector3 - The new `position` of the plane, adjusted by - the `offset`. - axis : Base::Vector3 - A vector whose unit vector will be used as the new `axis` - of the plane. - The magnitudes of the `x`, `y`, `z` components of the axis - determine the orientation of `u` and `v` of the plane. - offset : float, optional - Defaults to zero. A value which will be used to offset - the plane in the direction of its `axis`. - - Cases - ----- - The `u` and `v` are always calculated the same - - * `u` is the cross product of the positive or negative of `axis` - with a `reference vector`. - :: - u = [+1|-1] axis.cross(ref_vec) - * `v` is `u` rotated 90 degrees around `axis`. - - Whether the `axis` is positive or negative, and which reference - vector is used, depends on the absolute values of the `x`, `y`, `z` - components of the `axis` unit vector. - - #. If `x > y`, and `y > z` - The reference vector is +Z - :: - u = -1 axis.cross(+Z) - #. If `y > z`, and `z >= x` - The reference vector is +X. - :: - u = -1 axis.cross(+X) - #. If `y >= x`, and `x > z` - The reference vector is +Z. - :: - u = +1 axis.cross(+Z) - #. If `x > z`, and `z >= y` - The reference vector is +Y. - :: - u = +1 axis.cross(+Y) - #. If `z >= y`, and `y > x` - The reference vector is +X. - :: - u = +1 axis.cross(+X) - #. otherwise - The reference vector is +Y. - :: - u = -1 axis.cross(+Y) - """ - self.doc = FreeCAD.ActiveDocument - self.axis = axis - self.axis.normalize() - ref_vec = Vector(0.0, 1.0, 0.0) - - if ((abs(axis.x) > abs(axis.y)) and (abs(axis.y) > abs(axis.z))): - ref_vec = Vector(0.0, 0., 1.0) - self.u = axis.negative().cross(ref_vec) - self.u.normalize() - self.v = DraftVecUtils.rotate(self.u, math.pi/2, self.axis) - # projcase = "Case new" - - elif ((abs(axis.y) > abs(axis.z)) and (abs(axis.z) >= abs(axis.x))): - ref_vec = Vector(1.0, 0.0, 0.0) - self.u = axis.negative().cross(ref_vec) - self.u.normalize() - self.v = DraftVecUtils.rotate(self.u, math.pi/2, self.axis) - # projcase = "Y>Z, View Y" - - elif ((abs(axis.y) >= abs(axis.x)) and (abs(axis.x) > abs(axis.z))): - ref_vec = Vector(0.0, 0., 1.0) - self.u = axis.cross(ref_vec) - self.u.normalize() - self.v = DraftVecUtils.rotate(self.u, math.pi/2, self.axis) - # projcase = "ehem. XY, Case XY" - - elif ((abs(axis.x) > abs(axis.z)) and (abs(axis.z) >= abs(axis.y))): - self.u = axis.cross(ref_vec) - self.u.normalize() - self.v = DraftVecUtils.rotate(self.u, math.pi/2, self.axis) - # projcase = "X>Z, View X" - - elif ((abs(axis.z) >= abs(axis.y)) and (abs(axis.y) > abs(axis.x))): - ref_vec = Vector(1.0, 0., 0.0) - self.u = axis.cross(ref_vec) - self.u.normalize() - self.v = DraftVecUtils.rotate(self.u, math.pi/2, self.axis) - # projcase = "Y>X, Case YZ" - - else: - self.u = axis.negative().cross(ref_vec) - self.u.normalize() - self.v = DraftVecUtils.rotate(self.u, math.pi/2, self.axis) - # projcase = "else" - - # spat_vec = self.u.cross(self.v) - # spat_res = spat_vec.dot(axis) - # Console.PrintMessage(projcase + " spat Prod = " + str(spat_res) + "\n") - - offsetVector = Vector(axis) - offsetVector.multiply(offset) - self.position = point.add(offsetVector) + """See PlaneBase.align_to_point_and_axis_svg.""" + super().align_to_point_and_axis_svg(point, axis, offset) self.weak = False - # Console.PrintMessage("(position = " + str(self.position) + ")\n") - # Console.PrintMessage(self.__repr__() + "\n") + return True def alignToCurve(self, shape, offset=0): - """Align plane to curve. NOT YET IMPLEMENTED. + """Align the WP to a curve. NOT IMPLEMENTED. Parameters ---------- - shape : Part.Shape - A curve that will serve to align the plane. - It can be an `'Edge'` or `'Wire'`. - offset : float - Defaults to zero. A value which will be used to offset - the plane in the direction of its `axis`. + shape: Part.Shape + Edge or Wire. + offset: float, optional + Defaults to zero. + Offset along the WP `axis`. Returns ------- - False - Returns `False` if the shape is null. - Currently it always returns `False`. + `False` """ - if shape.isNull(): - return False - elif shape.ShapeType == 'Edge': - # ??? TODO: process curve here. look at shape.edges[0].Curve - return False - elif shape.ShapeType == 'Wire': - # ??? TODO: determine if edges define a plane - return False - else: - return False + return False - def alignToEdges(self, edges): - """Align plane to two edges. + def alignToEdges(self, shapes, offset=0): + """Align the WP to edges with an optional offset. - Uses the two points of the first edge to define the direction - of the unit vector `u`, the other two points of the other edge - to define the other unit vector `v`, and then the cross product - of `u` with `v` to define the `axis`. + The eges must define a plane. + + The endpoints of the first edge defines the WP `position` and `u` axis. Parameters ---------- - edges : list - A list of two edges. + shapes: iterable + Two edges. + offset: float, optional + Defaults to zero. + Offset along the WP `axis`. Returns ------- - False - Return `False` if `edges` is a list of more than 2 elements. + `True`/`False` + `True` if successful. """ - # use a list of edges to find a plane position - if len(edges) > 2: + if super().align_to_edges_vertexes(shapes, offset) is False: return False - # for axes systems, we suppose the 2 first edges are parallel - # ??? TODO: exclude other cases first - v1 = edges[0].Vertexes[-1].Point.sub(edges[0].Vertexes[0].Point) - v2 = edges[1].Vertexes[0].Point.sub(edges[0].Vertexes[0].Point) - v3 = v1.cross(v2) - v1.normalize() - v2.normalize() - v3.normalize() - # print(v1,v2,v3) - self.u = v1 - self.v = v2 - self.axis = v3 + self.weak = False + return True def alignToFace(self, shape, offset=0, parent=None): - """Align the plane to a face. + """Align the WP to a face with an optional offset. - It uses the center of mass of the face as `position`, - and its normal in the center of the face as `axis`, - then calls `alignToPointAndAxis(position, axis, offset)`. + The face must be planar. - If the face is a quadrilateral, then it adjusts the position - of the plane according to its reported X direction and Y direction. + The center of gravity of the face defines the WP `position` and the + normal of the face the WP `axis`. The WP `u` and `v` vectors are + determined by the DraftGeomUtils.uv_vectors_from_face function. + See there. - Also set `weak` to `False`. - - Parameter - -------- - shape : Part.Face - A shape of type `'Face'`. - - offset : float - Defaults to zero. A value which will be used to offset - the plane in the direction of its `axis`. - - parent : object - Defaults to None. The ParentGeoFeatureGroup of the object - the face belongs to. + Parameters + ---------- + shape: Part.Face + Face. + offset: float, optional + Defaults to zero. + Offset along the WP `axis`. + parent: object + Defaults to `None`. + The ParentGeoFeatureGroup of the object the face belongs to. Returns ------- - bool - `True` if the operation was successful, and `False` if the shape - is not a `'Face'`. - - See Also - -------- - alignToPointAndAxis + `True`/`False` + `True` if successful. """ - # Set face to the unique selected face, if found - if shape.ShapeType == 'Face': + if shape.ShapeType == "Face" and shape.Surface.isPlanar(): + place = DraftGeomUtils.placement_from_face(shape) if parent: - place = parent.getGlobalPlacement() - else: - place = FreeCAD.Placement() - rot = place.Rotation - - cen = place.multVec(shape.CenterOfMass) - nor = rot.multVec(shape.normalAt(0, 0)) - self.alignToPointAndAxis(cen, nor, offset) - - pmr = shape.ParameterRange # (uMin, uMax, vMin, vMax) - u = shape.valueAt(pmr[1], 0).sub(shape.valueAt(pmr[0], 0)) - v = shape.valueAt(0, pmr[3]).sub(shape.valueAt(0, pmr[2])) - self.u = rot.multVec(u).normalize() - self.v = rot.multVec(v).normalize() - - if shape.Orientation == "Reversed": - self.u, self.v = self.v, self.u - - # If self.u or self.v matches a wrong global axis, rotate them: - if DraftVecUtils.equals(self.v, Vector(0, 0, -1)): - self.u, self.v = self.u.negative(), self.v.negative() - elif DraftVecUtils.equals(self.u, Vector(0, 0, 1)): - self.u, self.v = self.v.negative(), self.u - elif DraftVecUtils.equals(self.u, Vector(0, 0, -1)): - self.u, self.v = self.v, self.u.negative() - + place = parent.getGlobalPlacement() * place + super().align_to_placement(place, offset) self.weak = False return True else: return False def alignTo3Points(self, p1, p2, p3, offset=0): - """Align the plane to three points. + """Align the plane to a temporary face created from three points. - It makes a closed quadrilateral face with the three points, - and then calls `alignToFace(shape, offset)`. - - Parameter - --------- - p1 : Base::Vector3 - The first point. - p2 : Base::Vector3 - The second point. - p3 : Base::Vector3 - The third point. - - offset : float - Defaults to zero. A value which will be used to offset - the plane in the direction of its `axis`. + Parameters + ---------- + p1: Base.Vector + First point. + p2: Base.Vector + Second point. + p3: Base.Vector + Third point. + offset: float, optional + Defaults to zero. + Offset along the WP `axis` Returns ------- - bool - `True` if the operation was successful, and `False` otherwise. + `True`/`False` + `True` if successful. """ - import Part w = Part.makePolygon([p1, p2, p3, p1]) f = Part.Face(w) return self.alignToFace(f, offset) def alignToSelection(self, offset=0): - """Align the plane to a selection if it defines a plane. + """Align the plane to a selection with an optional offset. - If the selection uniquely defines a plane it will be used. + The selection must define a plane. Parameter --------- - offset : float - Defaults to zero. A value which will be used to offset - the plane in the direction of its `axis`. + offset: float, optional + Defaults to zero. + Offset along the WP `axis` Returns ------- - bool - `True` if the operation was successful, and `False` otherwise. - It returns `False` if the selection has no elements, - or if the object is not derived from `'Part::Feature'` - or if the object doesn't have a `Shape`. - - See Also - -------- - alignToFace, alignToCurve + `True`/`False` + `True` if successful. """ - sel_ex = FreeCADGui.Selection.getSelectionEx(FreeCAD.ActiveDocument.Name) + sel_ex = FreeCADGui.Selection.getSelectionEx() if not sel_ex: return False @@ -1215,13 +804,13 @@ class Plane: if isinstance(geom, Part.Shape): geom_is_shape = True if not geom_is_shape: - FreeCAD.Console.PrintError(translate( + _wrn(translate( "draft", "Object without Part.Shape geometry:'{}'".format( obj.ObjectName)) + "\n") return False if geom.isNull(): - FreeCAD.Console.PrintError(translate( + _wrn(translate( "draft", "Object with null Part.Shape geometry:'{}'".format( obj.ObjectName)) + "\n") @@ -1236,7 +825,7 @@ class Plane: normal = None for n in range(len(shapes)): if not DraftGeomUtils.is_planar(shapes[n]): - FreeCAD.Console.PrintError(translate( + _wrn(translate( "draft", "'{}' object is not planar".format(names[n])) + "\n") return False if not normal: @@ -1247,7 +836,7 @@ class Plane: if normal: for n in range(len(shapes)): if not DraftGeomUtils.are_coplanar(shapes[shape_ref], shapes[n]): - FreeCAD.Console.PrintError(translate( + _wrn(translate( "draft", "{} and {} aren't coplanar".format( names[shape_ref],names[n])) + "\n") return False @@ -1257,7 +846,7 @@ class Plane: if len(points) >= 3: poly = Part.makePolygon(points) if not DraftGeomUtils.is_planar(poly): - FreeCAD.Console.PrintError(translate( + _wrn(translate( "draft", "All Shapes must be coplanar") + "\n") return False normal = DraftGeomUtils.get_normal(poly) @@ -1265,13 +854,13 @@ class Plane: normal = None if not normal: - FreeCAD.Console.PrintError(translate( + _wrn(translate( "draft", "Selected Shapes must define a plane") + "\n") return False # set center of mass - ctr_mass = FreeCAD.Vector(0,0,0) - ctr_pts = FreeCAD.Vector(0,0,0) + ctr_mass = Vector(0,0,0) + ctr_pts = Vector(0,0,0) mass = 0 for shape in shapes: if hasattr(shape, "CenterOfMass"): @@ -1285,15 +874,15 @@ class Plane: else: ctr_mass = ctr_pts/len(shapes) - self.alignToPointAndAxis(ctr_mass, normal, offset) - + super().align_to_point_and_axis(ctr_mass, normal, offset) + self.weak = False return True def setup(self, direction=None, point=None, upvec=None, force=False): """Set up the working plane if it exists but is undefined. If `direction` and `point` are present, - it calls `alignToPointAndAxis(point, direction, 0, upvec)`. + it calls `align_to_point_and_axis(point, direction, 0, upvec)`. Otherwise, it gets the camera orientation to define a working plane that is perpendicular to the current view, @@ -1308,40 +897,26 @@ class Plane: Parameters ---------- - direction : Base::Vector3, optional + direction: Base.Vector, optional It defaults to `None`. It is the new `axis` of the plane. - point : Base::Vector3, optional + point: Base.Vector, optional It defaults to `None`. It is the new `position` of the plane. - upvec : Base::Vector3, optional + upvec: Base.Vector, optional It defaults to `None`. It is the new `v` orientation of the plane. - force : Bool + force: bool If True, it sets the plane even if the plane is not in weak mode - - To do - ----- - When the interface is not loaded it should fail and print - a message, `FreeCAD.Console.PrintError()`. """ if self.weak or force: - if direction and point: - self.alignToPointAndAxis(point, direction, 0, upvec) + if direction is not None and point is not None: + super().align_to_point_and_axis(point, direction, 0, upvec) elif FreeCAD.GuiUp: try: - import FreeCADGui - from pivy import coin - view = FreeCADGui.ActiveDocument.ActiveView - camera = view.getCameraNode() - rot = camera.getField("orientation").getValue() - coin_up = coin.SbVec3f(0, 1, 0) - upvec = Vector(rot.multVec(coin_up).getValue()) - vdir = view.getViewDirection() - # don't change the plane if the axis and v vector - # are already correct: - tol = Part.Precision.angular() - if abs(math.pi - vdir.getAngle(self.axis)) > tol \ - or abs(math.pi - upvec.getAngle(self.v)) > tol: - self.alignToPointAndAxis(Vector(0, 0, 0), - vdir.negative(), 0, upvec) + view = gui_utils.get_3d_view() + if view is not None: + cam = view.getCameraNode() + rot = FreeCAD.Rotation(*cam.getField("orientation").getValue().getValue()) + self.u, self.v, self.axis = self._axes_from_view_rotation(rot) + self.position = Vector() except Exception: pass if force: @@ -1350,18 +925,17 @@ class Plane: self.weak = True def reset(self): - """Reset the plane. + """Reset the WP. - Set the `doc` attribute to `None`, and `weak` to `True`. + Sets the `weak` attribute to `True`. """ - self.doc = None self.weak = True def setTop(self): - """sets the WP to top position and updates the GUI""" - self.alignToPointAndAxis(FreeCAD.Vector(0.0, 0.0, 0.0), FreeCAD.Vector(0, 0, 1), 0.0) + """Sets the WP to the top position and updates the GUI.""" + super().set_to_top() + self.weak = False if FreeCAD.GuiUp: - import FreeCADGui from draftutils.translate import translate if hasattr(FreeCADGui,"Snapper"): FreeCADGui.Snapper.setGrid() @@ -1369,10 +943,10 @@ class Plane: FreeCADGui.draftToolBar.wplabel.setText(translate("draft", "Top")) def setFront(self): - """sets the WP to front position and updates the GUI""" - self.alignToPointAndAxis(FreeCAD.Vector(0.0, 0.0, 0.0), FreeCAD.Vector(0, 1, 0), 0.0) + """Sets the WP to the front position and updates the GUI.""" + super().set_to_front() + self.weak = False if FreeCAD.GuiUp: - import FreeCADGui from draftutils.translate import translate if hasattr(FreeCADGui,"Snapper"): FreeCADGui.Snapper.setGrid() @@ -1380,10 +954,17 @@ class Plane: FreeCADGui.draftToolBar.wplabel.setText(translate("draft", "Front")) def setSide(self): - """sets the WP to top position and updates the GUI""" - self.alignToPointAndAxis(FreeCAD.Vector(0.0, 0.0, 0.0), FreeCAD.Vector(-1, 0, 0), 0.0) + """Sets the WP to the left side position and updates the GUI. + + Note that set_to_side from the parent class sets the WP to the right side position. + Which matches the Side option from Draft_SelectPlane. + """ + self.u = Vector(0, -1, 0) + self.v = Vector(0, 0, 1) + self.axis = Vector(-1, 0, 0) + self.position = Vector() + self.weak = False if FreeCAD.GuiUp: - import FreeCADGui from draftutils.translate import translate if hasattr(FreeCADGui,"Snapper"): FreeCADGui.Snapper.setGrid() @@ -1391,106 +972,32 @@ class Plane: FreeCADGui.draftToolBar.wplabel.setText(translate("draft", "Side")) def getRotation(self): - """Return a placement describing the plane orientation only. - - If `FreeCAD.GuiUp` is `True`, that is, if the graphical interface - is loaded, it will test if the active object is an `Arch` container - and will calculate the placement accordingly. - - Returns - ------- - Base::Placement - A placement, comprised of a `Base` (`Base::Vector3`), - and a `Rotation` (`Base::Rotation`). - """ - m = DraftVecUtils.getPlaneRotation(self.u, self.v) - p = FreeCAD.Placement(m) - # Arch active container - if FreeCAD.GuiUp: - import FreeCADGui - if FreeCADGui.ActiveDocument: - view = FreeCADGui.ActiveDocument.ActiveView - if view and hasattr(view,"getActiveOject"): - a = view.getActiveObject("Arch") - if a: - p = a.Placement.inverse().multiply(p) - return p + """Return a placement describing the WP orientation only.""" + return FreeCAD.Placement(Vector(), FreeCAD.Rotation(self.u, self.v, self.axis, "ZYX")) def getPlacement(self, rotated=False): - """Return the placement of the plane. - - Parameters - ---------- - rotated : bool, optional - It defaults to `False`. If it is `True`, it switches `axis` - with `-v` to produce a rotated placement. - - Returns - ------- - Base::Placement - A placement, comprised of a `Base` (`Base::Vector3`), - and a `Rotation` (`Base::Rotation`). - """ - if rotated: - m = DraftVecUtils.getPlaneRotation(self.u, self.axis) - else: - m = DraftVecUtils.getPlaneRotation(self.u, self.v) - m.move(self.position) - p = FreeCAD.Placement(m) - # Arch active container if based on App Part - # if FreeCAD.GuiUp: - # import FreeCADGui - # view = FreeCADGui.ActiveDocument.ActiveView - # a = view.getActiveObject("Arch") - # if a: - # p = a.Placement.inverse().multiply(p) - return p + """Return a placement calculated from the WP. The rotated argument is ignored.""" + return super().get_placement() def getNormal(self): - """Return the normal vector of the plane (axis). + """Return the normal vector (axis) of the WP.""" + return self.axis - Returns - ------- - Base::Vector3 - The `axis` attribute of the plane. - """ - n = self.axis - # Arch active container if based on App Part - # if FreeCAD.GuiUp: - # import FreeCADGui - # view = FreeCADGui.ActiveDocument.ActiveView - # a = view.getActiveObject("Arch") - # if a: - # n = a.Placement.inverse().Rotation.multVec(n) - return n - - def setFromPlacement(self, pl, rebase=False): - """Set the plane from a placement. - - It normally uses only the rotation, unless `rebase` is `True`. + def setFromPlacement(self, place, rebase=False): + """Align the WP to a placement. Parameters ---------- - pl : Base::Placement or Base::Matrix4D - A placement, comprised of a `Base` (`Base::Vector3`), - and a `Rotation` (`Base::Rotation`), - or a `Base::Matrix4D` that defines a placement. - rebase : bool, optional - It defaults to `False`. - If `True`, it will use `pl.Base` as the new `position` - of the plane. Otherwise it will only consider `pl.Rotation`. - - To do - ----- - If `pl` is a `Base::Matrix4D`, it shouldn't try to use `pl.Base` - because a matrix has no `Base`. + place: Base.Placement + Placement. + rebase: bool, optional + Defaults to `False`. + If `False` the `position` of the WP is not changed. """ - rot = FreeCAD.Placement(pl).Rotation - self.u = rot.multVec(FreeCAD.Vector(1, 0, 0)) - self.v = rot.multVec(FreeCAD.Vector(0, 1, 0)) - self.axis = rot.multVec(FreeCAD.Vector(0, 0, 1)) if rebase: - self.position = pl.Base + super().align_to_placement(place) + else: + super()._axes_from_rotation(place.Rotation) def inverse(self): """Invert the direction of the plane. @@ -1514,284 +1021,56 @@ class Plane: Restores the attributes `u`, `v`, `axis`, `position` and `weak` from `stored`, and set `stored` to `None`. """ - if self.stored: - self.u = self.stored[0] - self.v = self.stored[1] - self.axis = self.stored[2] - self.position = self.stored[3] - self.weak = self.stored[4] + if self.stored is not None: + self.u, self.v, self.axis, self.position, self.weak = self.stored self.stored = None def getLocalCoords(self, point): - """Return the coordinates of the given point, from the plane. - - If the `point` was constructed using the plane as origin, - return the relative coordinates from the `point` to the plane. - - A vector is calculated from the plane's `position` - to the external `point`, and this vector is projected onto - each of the `u`, `v` and `axis` of the plane to determine - the local, relative vector. - - Parameters - ---------- - point : Base::Vector3 - The point external to the plane. - - Returns - ------- - Base::Vector3 - The relative coordinates of the point from the plane. - - See Also - -------- - getGlobalCoords, getLocalRot, getGlobalRot - - Notes - ----- - The following graphic explains the coordinates. - :: - g GlobalCoords (1, 11) - | - | - | - (n) p point (1, 6) - | LocalCoords (1, 1) - | - ----plane--------c-------- position (0, 5) - - In the graphic - - * `p` is an arbitrary point, external to the plane - * `c` is the plane's `position` - * `g` is the global coordinates of `p` when added to the plane - * `n` is the relative coordinates of `p` when referred to the plane - - To do - ----- - Maybe a better name would be getRelativeCoords? + """Translate a point from the global coordinate system to + the local (WP) coordinate system. """ - pt = point.sub(self.position) - xv = DraftVecUtils.project(pt, self.u) - x = xv.Length - # If the angle between the projection xv and u - # is larger than 1 radian (57.29 degrees), use the negative - # of the magnitude. Why exactly 1 radian? - if xv.getAngle(self.u) > 1: - x = -x - yv = DraftVecUtils.project(pt, self.v) - y = yv.Length - if yv.getAngle(self.v) > 1: - y = -y - zv = DraftVecUtils.project(pt, self.axis) - z = zv.Length - if zv.getAngle(self.axis) > 1: - z = -z - return Vector(x, y, z) + return super().get_local_coords(point) def getGlobalCoords(self, point): - """Return the coordinates of the given point, added to the plane. - - If the `point` was constructed using the plane as origin, - return the absolute coordinates from the `point` - to the global origin. - - The `u`, `v`, and `axis` vectors scale the components of `point`, - and the result is added to the planes `position`. - - Parameters - ---------- - point : Base::Vector3 - The external point. - - Returns - ------- - Base::Vector3 - The coordinates of the point from the absolute origin. - - See Also - -------- - getLocalCoords, getLocalRot, getGlobalRot - - Notes - ----- - The following graphic explains the coordinates. - :: - g GlobalCoords (1, 11) - | - | - | - (n) p point (1, 6) - | LocalCoords (1, 1) - | - ----plane--------c-------- position (0, 5) - - In the graphic - - * `p` is an arbitrary point, external to the plane - * `c` is the plane's `position` - * `g` is the global coordinates of `p` when added to the plane - * `n` is the relative coordinates of `p` when referred to the plane - + """Translate a point from the local (WP) coordinate system to + the global coordinate system. """ - vx = Vector(self.u).multiply(point.x) - vy = Vector(self.v).multiply(point.y) - vz = Vector(self.axis).multiply(point.z) - pt = (vx.add(vy)).add(vz) - return pt.add(self.position) + return super().get_global_coords(point) - def getLocalRot(self, point): - """Like getLocalCoords, but doesn't use the plane's position. - - If the `point` was constructed using the plane as origin, - return the relative coordinates from the `point` to the plane. - However, in this case, the plane is assumed to have its `position` - at the global origin, therefore, the returned coordinates - will only consider the orientation of the plane. - - The external `point` is a vector, which is projected onto - each of the `u`, `v` and `axis` of the plane to determine - the local, relative vector. - - Parameters - ---------- - point : Base::Vector3 - The point external to the plane. - - Returns - ------- - Base::Vector3 - The relative coordinates of the point from the plane, - if the plane had its `position` at the global origin. - - See Also - -------- - getLocalCoords, getGlobalCoords, getGlobalRot + def getLocalRot(self, vec): + """Translate a vector from the global coordinate system to + the local (WP) coordinate system. """ - xv = DraftVecUtils.project(point, self.u) - x = xv.Length - if xv.getAngle(self.u) > 1: - x = -x - yv = DraftVecUtils.project(point, self.v) - y = yv.Length - if yv.getAngle(self.v) > 1: - y = -y - zv = DraftVecUtils.project(point, self.axis) - z = zv.Length - if zv.getAngle(self.axis) > 1: - z = -z - return Vector(x, y, z) + return super().get_local_coords(vec, as_vector=True) - def getGlobalRot(self, point): - """Like getGlobalCoords, but doesn't use the plane's position. - - If the `point` was constructed using the plane as origin, - return the absolute coordinates from the `point` - to the global origin. - However, in this case, the plane is assumed to have its `position` - at the global origin, therefore, the returned coordinates - will only consider the orientation of the plane. - - The `u`, `v`, and `axis` vectors scale the components of `point`. - - Parameters - ---------- - point : Base::Vector3 - The external point. - - Returns - ------- - Base::Vector3 - The coordinates of the point from the absolute origin. - - See Also - -------- - getGlobalCoords, getLocalCoords, getLocalRot + def getGlobalRot(self, vec): + """Translate a vector from the local (WP) coordinate system to + the global coordinate system. """ - vx = Vector(self.u).multiply(point.x) - vy = Vector(self.v).multiply(point.y) - vz = Vector(self.axis).multiply(point.z) - pt = (vx.add(vy)).add(vz) - return pt + return super().get_global_coords(vec, as_vector=True) - def getClosestAxis(self, point): - """Return the closest axis of the plane to the given point (vector). - - It tests the angle that the `point` vector makes with the unit vectors - `u`, `v`, and `axis`, as well their negatives. - The smallest angle indicates the closest axis. + def getClosestAxis(self, vec): + """Return the closest WP axis to a vector. Parameters ---------- - point : Base::Vector3 - The external point to test. + vec: Base.Vector + Vector. Returns ------- str - * It is `'x'` if the closest axis is `u` or `-u`. - * It is `'y'` if the closest axis is `v` or `-v`. - * It is `'z'` if the closest axis is `axis` or `-axis`. + `'x'`, `'y'` or `'z'`. """ - ax = point.getAngle(self.u) - ay = point.getAngle(self.v) - az = point.getAngle(self.axis) - bx = point.getAngle(self.u.negative()) - by = point.getAngle(self.v.negative()) - bz = point.getAngle(self.axis.negative()) - b = min(ax, ay, az, bx, by, bz) - if b in [ax, bx]: - return "x" - elif b in [ay, by]: - return "y" - elif b in [az, bz]: - return "z" - else: - return None + return super().get_closest_axis(vec) def isGlobal(self): - """Return True if the plane axes are equal to the global axes. - - Return `False` if any of `u`, `v`, or `axis` does not correspond - to `+X`, `+Y`, or `+Z`, respectively. - """ - if self.u != Vector(1, 0, 0): - return False - if self.v != Vector(0, 1, 0): - return False - if self.axis != Vector(0, 0, 1): - return False - return True + """Return `True` if the WP matches the global coordinate system.""" + return super().is_global() def isOrtho(self): - """Return True if the plane axes are orthogonal with the global axes. - - Orthogonal means that the angle between `u` and the global axis `+Y` - is a multiple of 90 degrees, meaning 0, -90, 90, -180, 180, - -270, 270, or 360 degrees. - And similarly for `v` and `axis`. - All three axes should be orthogonal to the `+Y` axis. - - Due to rounding errors, the angle difference is rounded - to 6 decimal digits to do the test. - - Returns - ------- - bool - Returns `True` if all three `u`, `v`, and `axis` - are orthogonal with the global axis `+Y`. - Otherwise it returns `False`. - """ - ortho = [0, -1.570796, 1.570796, - -3.141593, 3.141593, - -4.712389, 4.712389, 6.283185] - # Shouldn't the angle difference be calculated with - # the other global axes `+X` and `+Z` as well? - if round(self.u.getAngle(Vector(0, 1, 0)), 6) in ortho: - if round(self.v.getAngle(Vector(0, 1, 0)), 6) in ortho: - if round(self.axis.getAngle(Vector(0, 1, 0)), 6) in ortho: - return True - return False + """Return `True` if the WP axes are orthogonal to the global axes.""" + return super().is_ortho() def getDeviation(self): """Return the angle between the u axis and the horizontal plane. @@ -1822,15 +1101,15 @@ class Plane: def getParameters(self): """Return a dictionary with the data which define the plane: - `u`, `v`, `axis`, `weak`. + `u`, `v`, `axis`, `position`, `weak`. Returns ------- dict dictionary of the form: - {"position":position, "u":x, "v":v, "axis":axis, "weak":weak} + {"u":x, "v":v, "axis":axis, "position":position, "weak":weak} """ - return {"position":self.position, "u":self.u, "v":self.v, "axis":self.axis, "weak":self.weak} + return super().get_parameters() def setFromParameters(self, data): """Set the plane according to data. @@ -1839,15 +1118,16 @@ class Plane: ---------- data: dict dictionary of the form: - {"position":position, "u":x, "v":v, "axis":axis, "weak":weak} + {"u":x, "v":v, "axis":axis, "position":position, "weak":weak} """ - self.position = data["position"] - self.u = data["u"] - self.v = data["v"] - self.axis = data["axis"] - self.weak = data["weak"] + super().set_parameters(data) - return None + def _get_prop_list(self): + return ["u", + "v", + "axis", + "position", + "weak"] plane = Plane diff --git a/src/Mod/Draft/draftobjects/shapestring.py b/src/Mod/Draft/draftobjects/shapestring.py index 41ada164f7..b5c7300ec3 100644 --- a/src/Mod/Draft/draftobjects/shapestring.py +++ b/src/Mod/Draft/draftobjects/shapestring.py @@ -164,11 +164,6 @@ class ShapeString(DraftObject): if obj.ScaleToSize: ss_shape.scale(obj.Size / cap_height) cap_height = obj.Size - just_vec = self.justification_vector(ss_shape, - cap_height, - obj.Justification, - obj.JustificationReference, - obj.KeepLeftMargin) if obj.ObliqueAngle: if -80 <= obj.ObliqueAngle <= 80: mtx = App.Matrix() @@ -177,6 +172,11 @@ class ShapeString(DraftObject): else: wrn = translate("draft", "ShapeString: oblique angle must be in the -80 to +80 degree range") + "\n" App.Console.PrintWarning(wrn) + just_vec = self.justification_vector(ss_shape, + cap_height, + obj.Justification, + obj.JustificationReference, + obj.KeepLeftMargin) shapes = ss_shape.SubShapes for shape in shapes: shape.translate(just_vec) @@ -194,7 +194,7 @@ class ShapeString(DraftObject): self.props_changed_store(prop) def justification_vector(self, ss_shape, cap_height, just, just_ref, keep_left_margin): # ss_shape is a compound - box = ss_shape.BoundBox + box = ss_shape.optimalBoundingBox() if keep_left_margin is True and "Left" in just: vec = App.Vector(0, 0, 0) else: diff --git a/src/Mod/Draft/draftutils/groups.py b/src/Mod/Draft/draftutils/groups.py index a1e5f15789..e48851395d 100644 --- a/src/Mod/Draft/draftutils/groups.py +++ b/src/Mod/Draft/draftutils/groups.py @@ -276,7 +276,7 @@ def getGroupContents(objectslist, spaces, noarchchild) -def get_movable_children(objectslist, recursive=True): +def get_movable_children(objectslist, recursive=True, _donelist=[]): """Return a list of objects with child objects that move with a host. Builds a list of objects with all child objects (`obj.OutList`) @@ -295,6 +295,9 @@ def get_movable_children(objectslist, recursive=True): Otherwise, only direct children of the input objects are added to the output list. + _donelist: list + List of object names. Used internally to prevent an endless loop. + Returns ------- list @@ -306,8 +309,14 @@ def get_movable_children(objectslist, recursive=True): objectslist = [objectslist] for obj in objectslist: + if obj.Name in _donelist: + continue + + _donelist.append(obj.Name) + # Skips some objects that should never move their children - if utils.get_type(obj) not in ("Clone", "SectionPlane", + if utils.get_type(obj) not in ("App::Part", "PartDesign::Body", + "Clone", "SectionPlane", "Facebinder", "BuildingPart", "App::Link"): children = obj.OutList if (hasattr(obj, "Proxy") and obj.Proxy @@ -318,17 +327,14 @@ def get_movable_children(objectslist, recursive=True): for child in children: if hasattr(child, "MoveWithHost") and child.MoveWithHost: - if hasattr(obj, "CloneOf"): - if obj.CloneOf: - if obj.CloneOf.Name != child.Name: - added.append(child) - else: + if hasattr(obj, "CloneOf") and obj.CloneOf: + if obj.CloneOf.Name != child.Name: added.append(child) else: added.append(child) if recursive: - added.extend(get_movable_children(children)) + added.extend(get_movable_children(children, recursive, _donelist)) return added diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index 3de9923162..e43496f643 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -47,8 +47,8 @@ texts, colors,layers (from groups) """ # scaling factor between autocad font sizes and coin font sizes TEXTSCALING = 1.35 -# the minimum version of the dxfLibrary needed to run - OBSOLETE - not used anymore -# CURRENTDXFLIB = 1.41 +# the minimum version of the dxfLibrary needed to run +CURRENTDXFLIB = 1.41 import sys import os @@ -116,10 +116,8 @@ def errorDXFLib(gui): files = ['dxfColorMap.py', 'dxfImportObjects.py', 'dxfLibrary.py', 'dxfReader.py'] - _weburl = 'https://raw.githubusercontent.com/yorikvanhavre/' - _weburl += 'Draft-dxf-importer/' - # baseurl = _weburl + '{0:.2f}'.format(CURRENTDXFLIB) + "/" - baseurl = _weburl + "master/" + baseurl = 'https://raw.githubusercontent.com/yorikvanhavre/' + baseurl += 'Draft-dxf-importer/master/' import ArchCommands from FreeCAD import Base progressbar = Base.ProgressIndicator() @@ -194,7 +192,7 @@ def getDXFlibs(): libsok = False FCC.PrintWarning("DXF libraries not found. Trying to download...\n") else: - if "v"+str(CURRENTDXFLIB) in dxfLibrary.__version__: + if float(dxfLibrary.__version__[1:5]) >= CURRENTDXFLIB: libsok = True else: FCC.PrintWarning("DXF libraries need to be updated. " diff --git a/src/Mod/Draft/importSVG.py b/src/Mod/Draft/importSVG.py index 382cf87d5d..ce8bf32d11 100644 --- a/src/Mod/Draft/importSVG.py +++ b/src/Mod/Draft/importSVG.py @@ -820,18 +820,16 @@ class svgHandler(xml.sax.ContentHandler): if 'width' in data \ and 'height' in data \ and 'viewBox' in data: - vbw = float(data['viewBox'][2]) - vbh = float(data['viewBox'][3]) - w = attrs.getValue('width') - h = attrs.getValue('height') - self.viewbox = (vbw, vbh) if len(self.grouptransform) == 0: unitmode = 'mm' + str(self.svgdpi) else: # nested svg element unitmode = 'css' + str(self.svgdpi) - abw = getsize(w, unitmode) - abh = getsize(h, unitmode) + vbw = getsize(data['viewBox'][2], unitmode) + vbh = getsize(data['viewBox'][3], unitmode) + abw = getsize(attrs.getValue('width'), unitmode) + abh = getsize(attrs.getValue('height'), unitmode) + self.viewbox = (vbw, vbh) sx = abw / vbw sy = abh / vbh _data = data.get('preserveAspectRatio', []) diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt index 4698a00fa6..4c5a2aef13 100644 --- a/src/Mod/Drawing/App/CMakeLists.txt +++ b/src/Mod/Drawing/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppDrawing -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS} diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index 5a253143da..edbf3465f5 100644 --- a/src/Mod/Drawing/Gui/CMakeLists.txt +++ b/src/Mod/Drawing/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ATANH -DHAVE_ASINH -DHAVE_ACOSH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index ea04bbf9c1..cb7c5f5a59 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -9,12 +9,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) add_compile_options(-Wno-pedantic) # needed for vtk headers endif() -if(MSVC) - add_definitions(-DFCAppFem -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if(BUILD_FEM_NETGEN) add_definitions(-DFCWithNetgen ${NETGEN_DEFINITIONS}) diff --git a/src/Mod/Fem/Gui/AppFemGui.cpp b/src/Mod/Fem/Gui/AppFemGui.cpp index d1dd8acf3f..c4f36d46a2 100644 --- a/src/Mod/Fem/Gui/AppFemGui.cpp +++ b/src/Mod/Fem/Gui/AppFemGui.cpp @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include "DlgSettingsFemCcxImp.h" #include "DlgSettingsFemElmerImp.h" @@ -34,18 +34,25 @@ #include "DlgSettingsFemGeneralImp.h" #include "DlgSettingsFemGmshImp.h" #include "DlgSettingsFemInOutVtkImp.h" -#include "DlgSettingsFemMaterialImp.h" #include "DlgSettingsFemMystranImp.h" #include "DlgSettingsFemZ88Imp.h" #include "PropertyFemMeshItem.h" #include "ViewProviderAnalysis.h" +#include "ViewProviderFemMesh.h" +#include "ViewProviderFemMeshShape.h" +#include "ViewProviderFemMeshShapeNetgen.h" +#include "ViewProviderSetElements.h" +#include "ViewProviderSetFaces.h" +#include "ViewProviderSetGeometry.h" +#include "ViewProviderSetNodes.h" +#include "ViewProviderSolver.h" #include "ViewProviderFemConstraint.h" #include "ViewProviderFemConstraintBearing.h" #include "ViewProviderFemConstraintContact.h" #include "ViewProviderFemConstraintDisplacement.h" #include "ViewProviderFemConstraintFixed.h" -#include "ViewProviderFemConstraintFluidBoundary.h" #include "ViewProviderFemConstraintForce.h" +#include "ViewProviderFemConstraintFluidBoundary.h" #include "ViewProviderFemConstraintGear.h" #include "ViewProviderFemConstraintHeatflux.h" #include "ViewProviderFemConstraintInitialTemperature.h" @@ -56,15 +63,7 @@ #include "ViewProviderFemConstraintSpring.h" #include "ViewProviderFemConstraintTemperature.h" #include "ViewProviderFemConstraintTransform.h" -#include "ViewProviderFemMesh.h" -#include "ViewProviderFemMeshShape.h" -#include "ViewProviderFemMeshShapeNetgen.h" #include "ViewProviderResult.h" -#include "ViewProviderSetElements.h" -#include "ViewProviderSetFaces.h" -#include "ViewProviderSetGeometry.h" -#include "ViewProviderSetNodes.h" -#include "ViewProviderSolver.h" #include "Workbench.h" #ifdef FC_USE_VTK @@ -178,7 +177,6 @@ PyMOD_INIT_FUNC(FemGui) new Gui::PrefPageProducer(QT_TRANSLATE_NOOP("QObject", "FEM")); new Gui::PrefPageProducer(QT_TRANSLATE_NOOP("QObject", "FEM")); new Gui::PrefPageProducer(QT_TRANSLATE_NOOP("QObject", "FEM")); - new Gui::PrefPageProducer(QT_TRANSLATE_NOOP("QObject", "FEM")); // register preferences pages on Import-Export new Gui::PrefPageProducer(QT_TRANSLATE_NOOP("QObject", "Import-Export")); diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 625c85150f..5635bef1fc 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -1,26 +1,18 @@ - # Many warnings caused by vtk if(CMAKE_COMPILER_IS_CLANGXX) add_compile_options(-Wno-pedantic) # needed for vtk headers - if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) + + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) add_compile_options(-Wno-inconsistent-missing-override) endif() elseif(CMAKE_COMPILER_IS_GNUCXX) add_compile_options(-Wno-pedantic) # needed for vtk headers endif() -if(MSVC) - add_definitions(-DFCGuiFem -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - if(BUILD_FEM_NETGEN) add_definitions(-DFCWithNetgen) endif(BUILD_FEM_NETGEN) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src @@ -37,18 +29,15 @@ include_directories( link_directories(${OCC_LIBRARY_DIR}) link_directories(${SMESH_LIB_PATH}) - set(FemGui_LIBS Fem FreeCADGui PartGui ) - generate_from_xml(ViewProviderFemMeshPy) generate_from_xml(ViewProviderFemPostPipelinePy) - SET(Python_SRCS ViewProviderFemMeshPy.xml ViewProviderFemMeshPyImp.cpp @@ -57,7 +46,6 @@ SET(Python_SRCS ) SOURCE_GROUP("Python" FILES ${Python_SRCS}) - set(FemGui_UIC_SRCS DlgSettingsFemCcx.ui DlgSettingsFemElmer.ui @@ -65,7 +53,6 @@ set(FemGui_UIC_SRCS DlgSettingsFemGeneral.ui DlgSettingsFemGmsh.ui DlgSettingsFemInOutVtk.ui - DlgSettingsFemMaterial.ui DlgSettingsFemMystran.ui DlgSettingsFemZ88.ui TaskCreateNodeSet.ui @@ -88,6 +75,7 @@ set(FemGui_UIC_SRCS TaskAnalysisInfo.ui TaskDriver.ui ) + if(BUILD_FEM_VTK) set(FemGui_UIC_SRCS ${FemGui_UIC_SRCS} @@ -126,9 +114,6 @@ SET(FemGui_DLG_SRCS DlgSettingsFemInOutVtk.ui DlgSettingsFemInOutVtkImp.cpp DlgSettingsFemInOutVtkImp.h - DlgSettingsFemMaterial.ui - DlgSettingsFemMaterialImp.cpp - DlgSettingsFemMaterialImp.h DlgSettingsFemMystran.ui DlgSettingsFemMystranImp.cpp DlgSettingsFemMystranImp.h @@ -186,14 +171,13 @@ SET(FemGui_DLG_SRCS ) SOURCE_GROUP("Constraint-Dialogs" FILES ${FemGui_DLG_SRCS}) -set (Fem_TR_QRC ${CMAKE_CURRENT_BINARY_DIR}/Resources/Fem_translation.qrc) +set(Fem_TR_QRC ${CMAKE_CURRENT_BINARY_DIR}/Resources/Fem_translation.qrc) qt_find_and_add_translation(QM_SRCS "Resources/translations/*_*.ts" ${CMAKE_CURRENT_BINARY_DIR}/Resources/translations) qt_create_resource_file(${Fem_TR_QRC} ${QM_SRCS}) qt_add_resources(FemResource_SRCS Resources/Fem.qrc ${Fem_TR_QRC}) SOURCE_GROUP("Resources" FILES ${FemResource_SRCS}) - SET(FemGui_SRCS_ViewProvider ViewProviderFemMesh.cpp ViewProviderFemMesh.h @@ -254,7 +238,6 @@ SET(FemGui_SRCS_ViewProvider ) SOURCE_GROUP("ViewProvider" FILES ${FemGui_SRCS_ViewProvider}) - SET(FemGui_SRCS_TaskBoxes TaskObjectName.ui TaskObjectName.cpp @@ -272,6 +255,7 @@ SET(FemGui_SRCS_TaskBoxes TaskTetParameter.cpp TaskTetParameter.h ) + if(BUILD_FEM_VTK) SET(FemGui_SRCS_TaskBoxes ${FemGui_SRCS_TaskBoxes} @@ -291,8 +275,8 @@ if(BUILD_FEM_VTK) TaskPostWarpVector.ui ) endif(BUILD_FEM_VTK) -SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes}) +SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes}) SET(FemGui_SRCS_TaskDlg TaskDlgCreateNodeSet.h @@ -304,7 +288,6 @@ SET(FemGui_SRCS_TaskDlg ) SOURCE_GROUP("Task_Dialogs" FILES ${FemGui_SRCS_TaskDlg}) - SET(FemGui_SRCS_Module AppFemGui.cpp AppFemGuiPy.cpp @@ -325,7 +308,6 @@ SET(FemGui_SRCS_Module ) SOURCE_GROUP("Module" FILES ${FemGui_SRCS_Module}) - if(BUILD_FEM_VTK) SET(FemGui_SRCS_Post ViewProviderFemPostObject.h @@ -336,11 +318,10 @@ if(BUILD_FEM_VTK) ViewProviderFemPostFunction.cpp ViewProviderFemPostFilter.h ViewProviderFemPostFilter.cpp - ) + ) SOURCE_GROUP("PostObjects" FILES ${FemGui_SRCS_Post}) endif(BUILD_FEM_VTK) - SET(FemGui_SRCS ${Python_SRCS} ${FemGui_DLG_SRCS} @@ -365,13 +346,10 @@ SET(FemGuiIcon_SVG add_library(FemGui SHARED ${FemGui_SRCS} ${FemGuiIcon_SVG}) target_link_libraries(FemGui ${FemGui_LIBS} ${VTK_LIBRARIES}) - fc_copy_sources(FemGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Fem" ${FemGuiIcon_SVG}) - INSTALL(FILES ${FemGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Fem/Resources/icons") - # Python modules ui files, they are copied as they are, thus the need not to be added to Fem.qrc # see https://forum.freecad.org/viewtopic.php?f=10&t=25833 SET(FemGuiPythonUI_SRCS @@ -409,10 +387,7 @@ fc_copy_sources(FemPythonUi "${CMAKE_BINARY_DIR}/Mod/Fem" ${FemGuiPythonUI_SRCS} INSTALL(FILES ${FemGuiPythonUI_SRCS} DESTINATION Mod/Fem/Resources/ui) - - SET_BIN_DIR(FemGui FemGui /Mod/Fem) SET_PYTHON_PREFIX_SUFFIX(FemGui) - INSTALL(TARGETS FemGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 8d3a15bb00..eb37c6505f 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -1195,7 +1195,7 @@ CmdFemCompEmConstraints::CmdFemCompEmConstraints() sGroup = QT_TR_NOOP("Fem"); sMenuText = QT_TR_NOOP("Electromagnetic boundary conditions"); sToolTipText = QT_TR_NOOP("Electromagnetic boundary conditions"); - sWhatsThis = ""; + sWhatsThis = "FEM_CompEmConstraints"; sStatusTip = sToolTipText; } diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.cpp deleted file mode 100644 index 9451f8ea01..0000000000 --- a/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2018 FreeCAD Developers * - * Author: Bernd Hahnebach * - * Based on src/Mod/Fem/Gui/DlgSettingsFemElmerImp.cpp * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#include "PreCompiled.h" - -#include "DlgSettingsFemMaterialImp.h" -#include "ui_DlgSettingsFemMaterial.h" - - -using namespace FemGui; - -DlgSettingsFemMaterialImp::DlgSettingsFemMaterialImp(QWidget* parent) - : PreferencePage(parent) - , ui(new Ui_DlgSettingsFemMaterialImp) -{ - ui->setupUi(this); -} - -DlgSettingsFemMaterialImp::~DlgSettingsFemMaterialImp() = default; - -void DlgSettingsFemMaterialImp::saveSettings() -{ - ui->cb_use_built_in_materials->onSave(); - ui->cb_use_mat_from_config_dir->onSave(); - ui->cb_use_mat_from_custom_dir->onSave(); - ui->fc_custom_mat_dir->onSave(); - ui->cb_delete_duplicates->onSave(); - ui->cb_sort_by_resources->onSave(); -} - -void DlgSettingsFemMaterialImp::loadSettings() -{ - ui->cb_use_built_in_materials->onRestore(); - ui->cb_use_mat_from_config_dir->onRestore(); - ui->cb_use_mat_from_custom_dir->onRestore(); - ui->fc_custom_mat_dir->onRestore(); - ui->cb_delete_duplicates->onRestore(); - ui->cb_sort_by_resources->onRestore(); -} - -/** - * Sets the strings of the subwidgets using the current language. - */ -void DlgSettingsFemMaterialImp::changeEvent(QEvent* e) -{ - if (e->type() == QEvent::LanguageChange) { - ui->retranslateUi(this); - } - else { - QWidget::changeEvent(e); - } -} - -#include "moc_DlgSettingsFemMaterialImp.cpp" diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h b/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h deleted file mode 100644 index 9a72a3eca0..0000000000 --- a/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h +++ /dev/null @@ -1,55 +0,0 @@ -/************************************************************************** - * Copyright (c) 2018 FreeCAD Developers * - * Author: Bernd Hahnebach * - * Based on src/Mod/Fem/Gui/DlgSettingsFemElmer.h * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#ifndef FEMGUI_DLGSETTINGSFEMMATERIALIMP_H -#define FEMGUI_DLGSETTINGSFEMMATERIALIMP_H - -#include -#include - - -namespace FemGui -{ -class Ui_DlgSettingsFemMaterialImp; - -class DlgSettingsFemMaterialImp: public Gui::Dialog::PreferencePage -{ - Q_OBJECT - -public: - explicit DlgSettingsFemMaterialImp(QWidget* parent = nullptr); - ~DlgSettingsFemMaterialImp() override; - -protected: - void saveSettings() override; - void loadSettings() override; - void changeEvent(QEvent* e) override; - -private: - std::unique_ptr ui; -}; - -} // namespace FemGui - -#endif // FEMGUI_DLGSETTINGSFEMMATERIALIMP_H diff --git a/src/Mod/Fem/Gui/Resources/icons/FEM_SolverControl.svg b/src/Mod/Fem/Gui/Resources/icons/FEM_SolverControl.svg index e1f406155b..7017540d9a 100644 --- a/src/Mod/Fem/Gui/Resources/icons/FEM_SolverControl.svg +++ b/src/Mod/Fem/Gui/Resources/icons/FEM_SolverControl.svg @@ -1,91 +1,265 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - [Bernd Hahnebach] - - - fem-control-solver - 2016-05-14 - http://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/ - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - +FEM_SolverControlimage/svg+xml[Bitacovir]2023-09-30http://www.freecadweb.org/wiki/index.php?title=ArtworkFreeCADFreeCAD LGPL2+FEM_SolverControl diff --git a/src/Mod/Fem/Gui/Resources/icons/FEM_SolverRun.svg b/src/Mod/Fem/Gui/Resources/icons/FEM_SolverRun.svg index 4c186f5ef1..4728865402 100644 --- a/src/Mod/Fem/Gui/Resources/icons/FEM_SolverRun.svg +++ b/src/Mod/Fem/Gui/Resources/icons/FEM_SolverRun.svg @@ -1,92 +1,327 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - [Bernd Hahnebach] - - - fem-run-solver - 2016-05-14 - http://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/ - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - - - +FEM_SolverRunimage/svg+xml[Bitacovir]http://www.freecadweb.org/wiki/index.php?title=ArtworkFreeCADFreeCAD LGPL2+2023-09-30FEM_SolverRun diff --git a/src/Mod/Fem/Gui/Resources/icons/FEM_SolverStandard.svg b/src/Mod/Fem/Gui/Resources/icons/FEM_SolverStandard.svg index 7f53d2c870..ac8fc1ed07 100644 --- a/src/Mod/Fem/Gui/Resources/icons/FEM_SolverStandard.svg +++ b/src/Mod/Fem/Gui/Resources/icons/FEM_SolverStandard.svg @@ -1,56 +1,267 @@ - - - - - - - + + FEM_SolverStandard + + + + + + - + + + + + + + + + + + + + + + + + + + - + - + image/svg+xml - + - [Author qingfengxia] + [Bitacovir] - 2015-11-15 - http://www.freecad.org/wiki/index.php?title=Artwork + FEM_SolverStandard + 2023-09-30 + http://www.freecadweb.org/wiki/index.php?title=Artwork FreeCAD - FreeCAD/src/Mod/ FreeCAD LGPL2+ - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem.ts b/src/Mod/Fem/Gui/Resources/translations/Fem.ts index 046b7e6a24..03b71bb643 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem - + Bearing constraint - + Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem - + Contact constraint - + Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem - - Constraint displacement + + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem - - Constraint fixed + + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem - + Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem - - Constraint force + + Force load - + Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem - + Gear constraint - + Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem - + Heat flux load - + Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem - + Initial temperature - + Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem - + Plane multi-point constraint - + Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem - - Constraint pressure + + Pressure load - + Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem - + Pulley constraint - + Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem - + Spring - + Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem - - Constraint temperature + + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem - - Constraint transform + + Local coordinate system - + Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem - + Nodes set - + Creates a FEM mesh nodes set - + Wrong selection - + Select a single FEM mesh or nodes set, please. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem - + Node set by poly - - + + Create node set by Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem - + Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem - + Region clip filter - + Define/create a clip filter which uses functions to define the clipped region - + Wrong selection - + Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem - + Function cut filter - + Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem - + Line clip filter - + Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem - + Data at point clip filter - + Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem - + Filter functions - + Functions for use in postprocessing filter... - + Plane - + Sphere - + Cylinder - + Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label - + Stress [MPa] Plot Y-Axis Label - + Linearized Stresses Plot title - + Membrane Plot legend item label - + Membrane and Bending Plot legend item label - + Total Plot legend item label - - - Fem - - - - - Stress linearization plot - - - - - Define/create stress linearization plots - - - - - - Wrong selection - - - - - - Select a Clip filter which clips a STRESS field along a line, please. - - - - - CmdFemPostPipelineFromResult - - - Fem - - - - - Post pipeline from result - - - - - Creates a post processing pipeline from a result object - - - - - Wrong selection type - - - - - Select a result object, please. - - - - - CmdFemPostScalarClipFilter - - - Fem - - - - - Scalar clip filter - - - - - Define/create a clip filter which clips a field with a scalar value - - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ - Warp filter + Stress linearization plot + Define/create stress linearization plots + + + + + + Wrong selection + + + + + + Select a Clip filter which clips a STRESS field along a line, please. + + + + + CmdFemPostPipelineFromResult + + + Fem + + + + + Post pipeline from result + + + + + Creates a post processing pipeline from a result object + + + + + Wrong selection type + + + + + Select a result object, please. + + + + + CmdFemPostScalarClipFilter + + + Fem + + + + + Scalar clip filter + + + + + Define/create a clip filter which clips a field with a scalar value + + + + + CmdFemPostWarpVectorFilter + + + Fem + + + + + Warp filter + + + + Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition - + Make bearing constraint - + Make contact constraint on a face - + Make displacement boundary condition on face - + Make fixed boundary condition for geometry - + Make force load on geometry - + Make gear constraint - + Make heat flux load on face - + Make initial temperature condition on body - + Make plane multi-point constraint on face - + Make pressure load on face - + Make spring on face - + Make pulley constraint - + Make temperature boundary condition on face - + Make local coordinate system on face - + Place robot - + Edit nodes set - + Create nodes set - + Create filter - + Create function - + Create pipeline from result - + Edit Mirror @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height @@ -1016,12 +1016,12 @@ - + File does not exist - + The specified executable '%1' does not exist! @@ -1114,12 +1114,12 @@ will be merged to make the volume boundaries invisible. - + File does not exist - + The specified executable '%1' does not exist! @@ -1127,19 +1127,19 @@ Specify another file please. - - + + FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. @@ -1362,12 +1362,12 @@ adding an analysis container - + File does not exist - + The specified executable '%1' does not exist! @@ -1427,81 +1427,6 @@ exported from FreeCAD. - - FemGui::DlgSettingsFemMaterialImp - - - Material - - - - - Card resources - - - - - The cards built-in to FreeCAD will be listed as available. - - - - - Use built-in materials - - - - - Also cards from FreeCAD's preferences directory will be listed as available. - - - - - Use materials from Materials directory in user's FreeCAD preference directory - - - - - Also material cards also from the specified directory -will be listed as available. - - - - - Use materials from user defined directory - - - - - User directory - - - - - Card sorting and duplicates - - - - - Duplicate cards will be deleted from the displayed material card list. - - - - - Delete card duplicates - - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - - Sort by resources - - - FemGui::DlgSettingsFemMystranImp @@ -1540,12 +1465,12 @@ If unchecked, they will be sorted by their name. - + File does not exist - + The specified executable '%1' does not exist! @@ -1640,12 +1565,12 @@ that "MAXKOI" needs to be increased. - + File does not exist - + The specified z88r executable '%1' does not exist! @@ -1653,18 +1578,18 @@ Specify another file please. - - + + Wrong file - + You must specify the path to the z88r.exe! - + You must specify the path to the z88r! @@ -1688,13 +1613,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error - + You must specify at least one reference @@ -1702,7 +1627,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error @@ -1710,7 +1635,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error @@ -1718,7 +1643,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error @@ -1726,7 +1651,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error @@ -1734,13 +1659,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error - + Please specify a force greater than 0 @@ -1748,7 +1673,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error @@ -1756,7 +1681,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error @@ -1764,8 +1689,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error @@ -1773,7 +1698,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error @@ -1781,7 +1706,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error @@ -1789,7 +1714,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error @@ -1797,7 +1722,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error @@ -1805,7 +1730,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error @@ -1813,12 +1738,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh - + Meshing failure @@ -1826,7 +1751,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error @@ -1842,12 +1767,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters - + Delete @@ -1855,42 +1780,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error - + Please use only a single reference for bearing constraint - + Only faces can be picked - + Only cylindrical faces can be picked - + Only planar faces can be picked - + Only linear edges can be picked - + Only faces and edges can be picked @@ -1899,77 +1824,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error - + Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! - + Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! - - + + Only faces can be picked - + Only one master for a contact constraint! - + Only one master face for a contact constraint! @@ -1977,28 +1902,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error - - + + Nothing selected! - - + + Selected object is not a part! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2006,28 +1931,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error - - + + Nothing selected! - - + + Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2035,128 +1960,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic - + Turbulence - + Thermal - + select boundary type, faces and set value - + Intensity [0~1] - + Dissipation Rate [m2/s3] - + Length Scale[m] - + Viscosity Ratio [1] - + Hydraulic Diameter [m] - - + + Gradient [K/m] - + Flux [W/m2] - + Empty selection - + Select an edge or a face, please. - - - - - + + + + + Wrong selection - + Selected object is not a part object! - + Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error - - + + Nothing selected! - - + + Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2164,39 +2089,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error - - + + Nothing selected! - - + + Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection - + Select an edge or a face, please. @@ -2204,24 +2129,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error - + Only planar faces can be picked - + Only linear edges can be picked - + Only faces and edges can be picked @@ -2229,30 +2154,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error - - + + Nothing selected! - - + + Selected object is not a part! - - + + Selection must only consist of faces! @@ -2260,42 +2185,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error - - + + Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! - - + + Selected object is not a part! - + Only faces can be picked - + Only planar faces can be picked @@ -2303,28 +2228,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error - - + + Nothing selected! - - + + Selected object is not a part! - + Only faces can be picked @@ -2332,12 +2257,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter - + Torque [Nm] @@ -2345,28 +2270,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error - - + + Nothing selected! - - + + Selected object is not a part! - + Only faces can be picked @@ -2374,22 +2299,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error - - + + Nothing selected! - - + + Selected object is not a part! @@ -2397,64 +2322,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error - - + + Nothing selected! - - + + Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! - + Only faces can be picked - + Only cylindrical faces can be picked @@ -2462,7 +2387,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName @@ -2470,7 +2395,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function @@ -2478,7 +2403,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function @@ -2486,12 +2411,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options - + Length X-Axis plot label @@ -2500,12 +2425,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options - + %1 at (%2; %3; %4) is: %5 %6 @@ -2513,7 +2438,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options @@ -2521,7 +2446,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function @@ -2529,7 +2454,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options @@ -2537,7 +2462,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options @@ -2561,12 +2486,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure - + The FEM module is built without NETGEN support. Meshing will not work!!! @@ -3521,46 +3446,45 @@ Note: for 2D only setting for x is possible, - + Ok - + Cancel - - - - - - - - - - A dialog is already open in the task panel - - - + - - + + + A dialog is already open in the task panel + + + + + + + + + + + Do you want to close this dialog? - + Meshing - @@ -3577,22 +3501,22 @@ Note: for 2D only setting for x is possible, - + Constraint initial temperature - + Constraint pulley - + Constraint spring - + Edit post processing object @@ -3632,62 +3556,62 @@ Note: for 2D only setting for x is possible, - + Are you sure you want to continue? - + Contact constraint - + Displacement boundary condition - + Fixed boundary condition - + Fluid boundary condition - + Force load - + Heat flux load - + Plane multi-point constraint - + Pressure load - + Temperature boundary condition - + Local coordinate system - + Edit analysis feature @@ -4022,7 +3946,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies @@ -5295,20 +5219,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. - - + + Error: no post processing object selected. @@ -6020,13 +5944,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem - - + + Electromagnetic boundary conditions @@ -6071,17 +5995,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem - + Electromagnetic equations - + Electromagnetic equations for the Elmer solver @@ -6089,17 +6013,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem - + Contours filter - + Define/create a contours filter which displays iso contours @@ -6107,7 +6031,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options @@ -6200,17 +6124,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem - + Mechanical equations - + Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_be.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_be.ts index b2c87825f1..ca2d08a3e8 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_be.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_be.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Абмежаванне падшыпніка - + Creates a bearing constraint Стварыць абмежаванне падшыпніка @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem - Fem + МКЭ - + Contact constraint Абмежаванне кантакту - + Creates a contact constraint between faces Стварыць абмежаванне кантакту паміж гранямі @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem МКЭ - - Constraint displacement - Абмежаванне зрушэння + + Displacement boundary condition + Межавая ўмову зрушэння - + Creates a displacement boundary condition for a geometric entity Стварыць межавую ўмову зрушэння для геаметрычнай сутнасці @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem МКЭ - - Constraint fixed - Абмежаванне фіксавання + + Fixed boundary condition + Фіксаваная межавая ўмова - + Creates a fixed boundary condition for a geometric entity Стварыць фіксаваную межавую ўмову для геаметрычнай сутнасці @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem МКЭ - + Fluid boundary condition Межавая ўмова вадкасці - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Стварыць межавую ўмову вадкасці на сутнасці грані для вылічальнай гідрадынамікі @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem МКЭ - - Constraint force - Абмежаванне сілы + + Force load + Сілавая нагрузка - + Creates a force load applied to a geometric entity Стварыць сілавую нагрузку, якая прыкладзеная да геаметрычнай сутнасці @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem МКЭ - + Gear constraint Абмежаванне шасцерні - + Creates a gear constraint Стварыць абмежаванне шасцерні @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem МКЭ - + Heat flux load Нагрузка на цеплавы паток - + Creates a heat flux load acting on a face Стварыць нагрузку цеплавога патоку, якая дзейнічае на грань @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem МКЭ - + Initial temperature Пачатковая тэмпература - + Creates an initial temperature acting on a body Стварае пачатковую тэмпературу, якая дзейнічае на цела @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem МКЭ - + Plane multi-point constraint Абмежаванне шматкропкавай плоскасці - + Creates a plane multi-point constraint for a face Стварыць абмежаванне шматкропкавай плоскасці для грані @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem МКЭ - - Constraint pressure - Абмежаванне ціску + + Pressure load + Нагрузка ціску - + Creates a pressure load acting on a face Стварыць нагрузку ціску, якая дзейнічае на грань @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem МКЭ - + Pulley constraint Абмежаванне шківу - + Creates a pulley constraint Стварыць абмежаванне шківу @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem МКЭ - + Spring Спружына - + Creates a spring acting on a face Стварыць спружыну, якая дзейнічае на грань @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem МКЭ - - Constraint temperature - Абмежаванне тэмпературы + + Temperature boundary condition + Межавая ўмова тэмпературы - + Creates a temperature/concentrated heat flux load acting on a face Стварыць тэмпературную нагрузку/канцэнтраваны цеплавы паток, якія дзейнічаюць на грань @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem МКЭ - - Constraint transform - Абмежаванне пераўтварэння + + Local coordinate system + Лакальная сістэма каардынат - + Create a local coordinate system on a face Стварыць лакальную сістэму каардынат на грані @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem МКЭ - + Nodes set Набор вузлоў - + Creates a FEM mesh nodes set Стварае набор вузлоў паліганальнай сеткі МКЭ - + Wrong selection Няправільны выбар - + Select a single FEM mesh or nodes set, please. Калі ласка, абярыце адну паліганальную сетку МКЭ ці набор вузлоў. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem МКЭ - + Node set by poly Набор вузлоў па шматкутніку - - + + Create node set by Poly Стварыць набор вузлоў з шматкутніка @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem МКЭ - + Apply changes to pipeline Прымяніць змены да канвееру - + Apply changes to parameters directly and not on recompute only... Прымяніць змены да налад напрамую, а не толькі пры пераліку... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem МКЭ - + Region clip filter Фільтр абрэзкі вобласці - + Define/create a clip filter which uses functions to define the clipped region Вызначыць/стварыць фільтр абрэзкі, які ўжывае функцыі для вызначэння вобласці абрэзкі - + Wrong selection Няправільны выбар - + Select a pipeline, please. Калі ласка, абярыце канвеер. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem МКЭ - + Function cut filter Функцыя рэзкі фільтра - + Cut the data along an implicit function Рэзаць дадзеныя па няяўнай функцыі @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem МКЭ - + Line clip filter Фільтр абрэзкі лініі - + Define/create a clip filter which clips a field along a line Вызначыць/стварыць фільтр абрэзкі, які абразае поле наўздоўж лініі @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem МКЭ - + Data at point clip filter Дадзеныя ў фільтры абрэзкі кропкі - + Define/create a clip filter which clips a field data at point Вызначыць/стварыць фільтр абрэзкі, які абразае дадзеныя палі ў кропцы @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem МКЭ - + Filter functions Функцыі фільтра - + Functions for use in postprocessing filter... Функцыі, якія ўжываюцца ў фільтры пасляапрацоўкі... - + Plane Плоскасць - + Sphere Сфера - + Cylinder Цыліндр - + Box Каробка @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Таўшчыня [mm] - + Stress [MPa] Plot Y-Axis Label Напружанне [MPa] - + Linearized Stresses Plot title Лінеарызаваныя напружанні - + Membrane Plot legend item label Мембрана - + Membrane and Bending Plot legend item label Мембрана і выгіб - + Total Plot legend item label Агулам - - - Fem - МКЭ - - - - Stress linearization plot - Графік лінеарызацыі напружання - - - - Define/create stress linearization plots - Вызначае/стварае графікі лінеарызацыі напружання - - - - - Wrong selection - Няправільны выбар - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Калі ласка, абярыце фільтр абрэзкі, які абразае поле напружання наўздоўж лініі. - - - - CmdFemPostPipelineFromResult - - - Fem - МКЭ - - - - Post pipeline from result - Паслаць канвеер з выніку - - - - Creates a post processing pipeline from a result object - Стварае канвеер пасляапрацоўкі з аб'екта выніку - - - - Wrong selection type - Няправільны тып выбару - - - - Select a result object, please. - Калі ласка, абярыце аб'ект выніку. - - - - CmdFemPostScalarClipFilter - - - Fem - МКЭ - - - - Scalar clip filter - Скалярны фільтр зрэзу - - - - Define/create a clip filter which clips a field with a scalar value - Вызначае/стварае фільтр зрэзу, які абразае поле са скалярным значэннем - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Графік лінеарызацыі напружання + + + + Define/create stress linearization plots + Вызначае/стварае графікі лінеарызацыі напружання + + + + + Wrong selection + Няправільны выбар + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Калі ласка, абярыце фільтр абрэзкі, які абразае поле напружання наўздоўж лініі. + + + + CmdFemPostPipelineFromResult + + + Fem + МКЭ + + + + Post pipeline from result + Паслаць канвеер з выніку + + + + Creates a post processing pipeline from a result object + Стварае канвеер пасляапрацоўкі з аб'екта выніку + + + + Wrong selection type + Няправільны тып выбару + + + + Select a result object, please. + Калі ласка, абярыце аб'ект выніку. + + + + CmdFemPostScalarClipFilter + + + Fem + МКЭ + + + + Scalar clip filter + Скалярны фільтр зрэзу + + + + Define/create a clip filter which clips a field with a scalar value + Вызначае/стварае фільтр зрэзу, які абразае поле са скалярным значэннем + + + + CmdFemPostWarpVectorFilter + + + Fem + МКЭ + + + Warp filter Фільтр дэфармацыі - + Warp the geometry along a vector field by a certain factor Дэфармаваць геаметрыю наўздоўж вектарнага полю па пэўнаму каэфіцыенту @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Стварыць межавую щмову вадкасці - + Make bearing constraint Зрабіць абмежаванне падшыпніка - + Make contact constraint on a face Зрабіць абмежаванне кантакту на грані - + Make displacement boundary condition on face Зрабіць межавую ўмову зрушэння на грані - + Make fixed boundary condition for geometry Зрабіць фіксаваную межавую ўмову для геаметрыі - + Make force load on geometry Зрабіць сілавую нагрузку на геаметрыю - + Make gear constraint Зрабіць абмежаванне шасцерні - + Make heat flux load on face Зрабіць нагрузку на цеплавы паток - + Make initial temperature condition on body Зрабіць пачатковы тэмпературны рэжым на целе - + Make plane multi-point constraint on face Зрабіць абмежаванне шматкропкавай плоскасці на грані - + Make pressure load on face Зрабіць нагрузку ціскам на грань - + Make spring on face Зрабіць спружыну на грані - + Make pulley constraint Зрабіць абмежаванне шківу - + Make temperature boundary condition on face Зрабіць межавую ўмову тэмпературы на грані - + Make local coordinate system on face Зрабіць лакальную сістэму каардынат на грані - + Place robot Месца робата - + Edit nodes set Змяніць набор вузлоў - + Create nodes set Стварыць набор вузлоў - + Create filter Стварыць фільтр - + Create function Стварыць функцыю - + Create pipeline from result Стварыць канвеер з выніку - + Edit Mirror Змяніць сіметрычна @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Стварыць функцыю плоскасці, якая вызначаная яе пачаткам і напрамкам вектара нармалі - + Create a sphere function, defined by its center and radius Стварыць функцыю сферы, якая вызначаная яе цэнтрам і радыусам - + Create a cylinder function, defined by its center, axis and radius Стварыць функцыю цыліндра, якая вызначаная яе цэнтрам, воссю і радыусам - + Create a box function, defined by its center, length, width and height Стварыць функцыю прастакутніка, якая вызначаная яе цэнтрам, даўжынёй, шырынёй і вышынёй @@ -1016,20 +1016,20 @@ Мяжа нізкай частаты - + File does not exist Файл не існуе - + The specified executable '%1' does not exist! Specify another file please. - Двайковы файл + The specified executable '%1' -не існуе! -Калі ласка, пакажыце іншы файл. + does not exist! +Specify another file please. @@ -1117,36 +1117,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Заўвага:</span>Прапануецца ўжыць цотную колькасць ядраў, каб атрымаць выгаду з сіметрыі сеткі. (Калі ўжыць 8 ядраў, гэтае можа быць хутчэй, чым 9 ядраў.)<br/><span style=" font-weight:600;">Таксама звярніце ўвагу:</span>У крайніх выпадках ElmerSolver можа не сыходзіцца, калі колькасць ядраў занадта вялікая.</p></body></html> - + File does not exist Файл не існуе - + The specified executable '%1' does not exist! Specify another file please. - Двайковы файл + The specified executable '%1' -не існуе! -Калі ласка, пакажыце іншы файл. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading МКЭ Elmer: Не падыходзіць для шматпаточнасці - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Няправільная налада Elmer: Вы ўжылі больш чым адно ядро працэсара. Такім чынам, патрабуецца двайковы файл з суфіксам '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Няправільная налада Elmer: Вы ўжылі больш чым адно ядро працэсара. @@ -1246,7 +1246,7 @@ the constraint or material is applied. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + Дазволіць праграме кіраваць (ствараць, выдаляць) працоўнымі каталогамі для ўсіх сродкаў рашэнняў. Ужывайце часовыя каталогі. @@ -1376,20 +1376,20 @@ adding an analysis container Пакіньце поле пустым, каб ужыць першапачатковы двайковы файл Gmsh - + File does not exist Файл не існуе - + The specified executable '%1' does not exist! Specify another file please. - Двайковы файл + The specified executable '%1' -не існуе! -Калі ласка, пакажыце іншы файл. + does not exist! +Specify another file please. @@ -1450,82 +1450,6 @@ exported from FreeCAD. Аб'ект выніку FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Матэрыял - - - - Card resources - Бібліятэка картак матэрыялаў - - - - The cards built-in to FreeCAD will be listed as available. - Карткі, якія ўбудаваныя ў FreeCAD, будуць пералічаныя як даступныя. - - - - Use built-in materials - Ужываць убудаваныя матэрыялы - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Карткі з каталогу пераваг FreeCAD будуць пералічаныя як даступныя. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Ужываць матэрыялы з каталогу Матэрыялы ў каталогу пераваг карыстальніка FreeCAD - - - - Also material cards also from the specified directory -will be listed as available. - Карткі матэрыялаў з паказанага каталогу будуць пералічаныя як даступныя. - - - - Use materials from user defined directory - Ужываць матэрыялы з каталогу, які абраны карыстальнікам - - - - User directory - Каталог карыстальніка - - - - Card sorting and duplicates - Парадкаванне картак матэрыялу і схаваць паўторныя - - - - Duplicate cards will be deleted from the displayed material card list. - Паўторныя карткі будуць схаваныя з спісу картак матэрыялаў. - - - - Delete card duplicates - Схаваць паўторныя карткі - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Карткі матэрыялаў упарадкаваныя па іх шляху да файлаў (месцазнаходжанню). -Калі не птушка, яны будуць упарадкаваныя па іх назве. - - - - Sort by resources - Парадкаваць па шляху да файлаў - - FemGui::DlgSettingsFemMystranImp @@ -1564,20 +1488,20 @@ If unchecked, they will be sorted by their name. Запісаць каментары ў выходных файле - + File does not exist Файл не існуе - + The specified executable '%1' does not exist! Specify another file please. - Двайковы файл + The specified executable '%1' -не існуе! -Калі ласка, пакажыце іншы файл. + does not exist! +Specify another file please. @@ -1671,34 +1595,34 @@ that "MAXKOI" needs to be increased. Магчыма, вам спатрэбіцца павялічыць гэтае значэнне пры ўжыванні паўтарэння сродку рашэння, інакш вы атрымаеце паведамленне пра памылку, што "MAXKOI" неабходна павялічыць. - + File does not exist Файл не існуе - + The specified z88r executable '%1' does not exist! Specify another file please. - Паказаны двайковы файл z88r + The specified z88r executable '%1' - не існуе! -Калі ласка, пакажыце іншы файл. + does not exist! +Specify another file please. - - + + Wrong file Няправільны файл - + You must specify the path to the z88r.exe! Вы павінны паказаць шлях да файла z88r.exe! - + You must specify the path to the z88r! Вы павінны паказаць шлях да файла z88r! @@ -1722,13 +1646,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Памылка ўводу - + You must specify at least one reference Вы павінны паказаць хаця б адзін спасылак @@ -1736,7 +1660,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Памылка ўводу @@ -1744,7 +1668,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Памылка ўводу @@ -1752,7 +1676,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Памылка ўводу @@ -1760,7 +1684,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Памылка ўводу @@ -1768,13 +1692,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Памылка ўводу - + Please specify a force greater than 0 Калі ласка, пакажыце сілу, якая перавышае 0 @@ -1782,7 +1706,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Памылка ўводу @@ -1790,7 +1714,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Памылка ўводу @@ -1798,8 +1722,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Памылка ўводу @@ -1807,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Памылка ўводу @@ -1815,7 +1739,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Памылка ўводу @@ -1823,7 +1747,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Памылка ўводу @@ -1831,7 +1755,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Памылка ўводу @@ -1839,7 +1763,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Памылка ўводу @@ -1847,12 +1771,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Змяніць паліганальную сетку МКЭ - + Meshing failure Збой стварэння паліганальнай сеткі @@ -1860,9 +1784,9 @@ Specify another file please. FemGui::TaskDlgPost - + Input error - Памылка ўводу + Input error @@ -1876,12 +1800,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Налады элементаў аналізу - + Delete Выдаліць @@ -1889,42 +1813,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Памылка выбару - + Please use only a single reference for bearing constraint Калі ласка, ужывайце толькі адзін спасылак для абмежавання падшыпніка - + Only faces can be picked Можна абраць толькі грані - + Only cylindrical faces can be picked Можна абраць толькі цыліндрычныя грані - + Only planar faces can be picked Можна абраць толькі плоскія грані - + Only linear edges can be picked Можна абраць толькі лінейныя рэбры - + Only faces and edges can be picked Можна абраць толькі грані і рэбры @@ -1933,77 +1857,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Выдаліць - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Памылка выбару - + Only one face in object! - moved to master face Толькі адна грань у аб'екце! - перанесена на галоўную грань - - + + Only one master face and one slave face for a contact constraint! Толькі адна галоўная грань і адна залежная грань для абмежавання кантакту! - - - - + + + + Nothing selected! Нічога не абрана! - + Only one slave face for a contact constraint! Толькі адна залежная грань для абмежавання кантакту! - - - - + + + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - - + + Only faces can be picked Можна абраць толькі грані - + Only one master for a contact constraint! Толькі адна асноўная грань для абмежавання кантакту! - + Only one master face for a contact constraint! Толькі адна асноўная грань для абмежавання кантакту! @@ -2011,28 +1935,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Дапускаецца толькі адзін тып выбару (вяршыня, грань ці рабро) для кожнага элементу аналіза! @@ -2040,28 +1964,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Дапускаецца толькі адзін тып выбару (вяршыня, грань ці рабро) для кожнага элементу аналіза! @@ -2069,128 +1993,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Асноўныя - + Turbulence Турбулентнасць - + Thermal Цеплавы - + select boundary type, faces and set value абярыце тып мяжы, грані і задайце значэнне - + Intensity [0~1] Інтэнсіўнасць [0~1] - + Dissipation Rate [m2/s3] Хуткасць рассейвання [м2/с3] - + Length Scale[m] Маштаб даўжыні [м] - + Viscosity Ratio [1] Каэфіцыент глейкасці [1] - + Hydraulic Diameter [m] Гідраўлічны дыяметр [м] - - + + Gradient [K/m] Градыент [К/м] - + Flux [W/m2] Выпраменьванне [Вт/м2] - + Empty selection Пусты выбар - + Select an edge or a face, please. Калі ласка, абярыце рабро ці грань. - - - - - + + + + + Wrong selection Няправільны выбар - + Selected object is not a part object! Абраны аб'ект не з'яўляецца аб'ектам дэталі! - + Only one planar face or edge can be selected! Можна абраць толькі адну плоскую грань ці рабро! - + Only planar faces can be picked for 3D Можна абраць толькі плоскія грані для трохмернай дэталі - + Only planar edges can be picked for 2D Для дзвюхмернай дэталі можна абраць толькі плоскія рэбры - + Only faces for 3D part or edges for 2D can be picked Можна абраць толькі грані для трохмернай дэталі ці рэбры для дзвюхмернай дэталі - - + - - + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Дапускаецца толькі адзін тып выбару (вяршыня, грань ці рабро) для кожнага элементу аналіза! @@ -2198,39 +2122,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Дапускаецца толькі адзін тып выбару (вяршыня, грань ці рабро) для кожнага элементу аналіза! - - + + Wrong selection Няправільны выбар - + Select an edge or a face, please. Калі ласка, абярыце рабро ці грань. @@ -2238,24 +2162,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Памылка выбару - + Only planar faces can be picked Можна абраць толькі плоскія грані - + Only linear edges can be picked Можна абраць толькі лінейныя рэбры - + Only faces and edges can be picked Можна абраць толькі грані і рэбры @@ -2263,30 +2187,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - - + + Selection must only consist of faces! Выбар павінен складацца толькі з граняў! @@ -2294,42 +2218,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Памылка выбару - - + + Only one face can be selected for a plane multi-point constraint! Для шматкропкавага абмежавання плоскасці можа быць абраная толькі адна грань! - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - + Only faces can be picked Можна абраць толькі грані - + Only planar faces can be picked Можна абраць толькі плоскія грані @@ -2337,28 +2261,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - + Only faces can be picked Можна абраць толькі грані @@ -2366,12 +2290,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Дыяметр шківа - + Torque [Nm] Крутоўны момант [Нм] @@ -2379,28 +2303,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - + Only faces can be picked Можна абраць толькі грані @@ -2408,22 +2332,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! @@ -2431,65 +2355,65 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Памылка абнаўлення элементаў аналізу - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Пераўтваральныя грані змяніліся. Калі ласка, дадавайце толькі пераўтваральныя грані і выдаляйце непераўтваральныя! - - - - - - - - - - + + + + + + + + + + Selection error Памылка выбару - - + + Nothing selected! Нічога не абрана! - - + + Only one face for rectangular local coordinate system! Толькі адна грань для прастакутнай лакальнай сістэмы каардынат! - + Only one face for local coordinate system! Толькі адна грань для лакальнай сістэмы каардынат! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Можна абраць толькі пераўтваральныя грані! Спачатку дадайце межавую ўмову зрушэння да паверхні, потым прымяніце абмежаванне да паверхні - - + + Selected object is not a part! Абраны аб'ект не з'яўляецца дэталлю! - + Only faces can be picked Можна абраць толькі грані - + Only cylindrical faces can be picked Можна абраць толькі цыліндрычныя грані @@ -2497,7 +2421,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName Назва аб'екту @@ -2505,7 +2429,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Абрэзаць вобласць, абярыце няяўную функцыю @@ -2513,7 +2437,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Функцыя выразання, абярыце няяўную функцыю @@ -2521,12 +2445,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Налады дадзеных наўздоўж лініі - + Length X-Axis plot label Даўжыня @@ -2535,12 +2459,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Налады дадзеных у кропцы - + %1 at (%2; %3; %4) is: %5 %6 %1 у (%2; %3; %4) складае: %5 %6 @@ -2548,7 +2472,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Налады адлюстравання вынікаў @@ -2556,7 +2480,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Няяўная функцыя @@ -2564,7 +2488,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Налады скалярнага зрэзу @@ -2572,7 +2496,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Налады дэфармацыі @@ -2596,12 +2520,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Збой стварэння паліганальнай сеткі - + The FEM module is built without NETGEN support. Meshing will not work!!! Модуль МКЭ пабудаваны без падтрымкі Netgen. Пабудова паліганальнай сеткі не спрацуе!!! @@ -3570,46 +3494,45 @@ Note: for 2D only setting for x is possible, Вам неабходна стварыць ці задзейнічаць даследаванне - + Ok OK - + Cancel Скасаваць - - - - - - - - + + + + + + + + A dialog is already open in the task panel На панэлі задач дыялогавае акно ўжо адчыненае - - - - - - - - + + + + + + + + Do you want to close this dialog? Ці жадаеце вы зачыніць дыялогавае акно? - + Meshing Пабудаваць паліганальную сетку - @@ -3626,22 +3549,22 @@ Note: for 2D only setting for x is possible, Імпарт-Экспарт - + Constraint initial temperature Абмежаванне пачатковай тэмпературы - + Constraint pulley Абмежаванне шківу - + Constraint spring Абмежаванне спружыны - + Edit post processing object Змяніць аб'ект пасляапрацоўкі @@ -3681,62 +3604,62 @@ Note: for 2D only setting for x is possible, Суполкі - + Are you sure you want to continue? Ці ўпэўненыя вы, што жадаеце працягнуць? - + Contact constraint Абмежаванне кантакту - + Displacement boundary condition Межавая ўмову зрушэння - + Fixed boundary condition Фіксаваная межавая ўмова - + Fluid boundary condition Межавая ўмова вадкасці - + Force load Сілавая нагрузка - + Heat flux load Нагрузка на цеплавы паток - + Plane multi-point constraint Абмежаванне шматкропкавай плоскасці - + Pressure load Нагрузка ціску - + Temperature boundary condition Межавая ўмова тэмпературы - + Local coordinate system Лакальная сістэма каардынат - + Edit analysis feature Змяніць элемент аналізу @@ -4074,7 +3997,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Залежнасці аб'екта @@ -4117,7 +4040,7 @@ For possible variables, see the description box below. Box - Каробка + Box @@ -4258,7 +4181,7 @@ For possible variables, see the description box below. Distance - Distance + Адлегласць @@ -5301,7 +5224,7 @@ used for the Elmer solver Mesh - Паліганальная сетка + Mesh @@ -5347,20 +5270,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Памылка: фільтр можа быць ужыты толькі да аднаго аб'екту. - - - + + + The filter could not be set up. Фільтр не атрымалася наладзіць. - - + + Error: no post processing object selected. Памылка: аб'ект пасляапрацоўкі не абраны. @@ -6073,13 +5996,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem МКЭ - - + + Electromagnetic boundary conditions Электрамагнетычныя межавыя ўмовы @@ -6124,17 +6047,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem МКЭ - + Electromagnetic equations Ураўненні электрамагнітнага полю - + Electromagnetic equations for the Elmer solver Ураўненні электрамагнітнага полю для сродку рашэння Elmer @@ -6142,17 +6065,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem МКЭ - + Contours filter Фільтр контураў - + Define/create a contours filter which displays iso contours Вызначыць/стварыць фільтр контураў, які адлюстроўвае ізаметрычныя контуры @@ -6160,7 +6083,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Налады фільтра контураў @@ -6253,17 +6176,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem - МКЭ + Fem - + Mechanical equations Ураўненні механікі - + Mechanical equations for the Elmer solver Ураўненні механікі для сродку рашэння Elmer diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_ca.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_ca.ts index a176b90167..74ef5f2a9a 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_ca.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_ca.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Restricció de força + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Conjunt de nodes - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Selecció incorrecta - + Select a single FEM mesh or nodes set, please. Seleccioneu una única malla MEF o un conjunt de nodes @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Crea un conjunt de nodes per polígons @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Selecció incorrecta - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Pla - + Sphere Esfera - + Cylinder Cilindre - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Thickness [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Total - - - Fem - Fem - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Selecció incorrecta - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Selecció incorrecta + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Editar Reflexa en el mirall @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Límit de baixa freqüència - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Utilitzeu materials integrats - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Utilitzeu materials del directori definit per l'ususari - - - - User directory - Directori de l'usuari - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Error d'entrada - + You must specify at least one reference S'ha d'especificar com a mínim una referència @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Error d'entrada @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Error d'entrada @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Error d'entrada @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Error d'entrada @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Error d'entrada - + Please specify a force greater than 0 Especifiqueu una força superior a 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Error d'entrada @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Error d'entrada @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Error d'entrada @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Error d'entrada @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Error d'entrada @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Error d'entrada @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Error d'entrada @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Error d'entrada @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Edita la malla MEF - + Meshing failure Ha fallat el mallat @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Error d'entrada @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Elimina @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Error de selecció - + Please use only a single reference for bearing constraint Utilitzeu només una referència per a restricció de rodament - + Only faces can be picked Únicament es poden seleccionar cares - + Only cylindrical faces can be picked Únicament es poden seleccionar cares cilíndriques - + Only planar faces can be picked Únicament es poden seleccionar cares planes - + Only linear edges can be picked Únicament es poden seleccionar arestes rectes - + Only faces and edges can be picked Únicament es poden seleccionar arestes i cares @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Elimina - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Error de selecció - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! No s'ha seleccionat cap element. - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! L'objecte seleccionat no és una peça. - - + + Only faces can be picked Únicament es poden seleccionar cares - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Selecció incorrecta - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Selecció incorrecta - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Error de selecció - + Only planar faces can be picked Únicament es poden seleccionar cares planes - + Only linear edges can be picked Únicament es poden seleccionar arestes rectes - + Only faces and edges can be picked Únicament es poden seleccionar arestes i cares @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Error de selecció - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only faces can be picked Únicament es poden seleccionar cares - + Only planar faces can be picked Únicament es poden seleccionar cares planes @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only faces can be picked Únicament es poden seleccionar cares @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Diàmetre de la politja - + Torque [Nm] Parell [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only faces can be picked Únicament es poden seleccionar cares @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only faces can be picked Únicament es poden seleccionar cares - + Only cylindrical faces can be picked Únicament es poden seleccionar cares cilíndriques @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName Nom de l'objecte Tasca @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Longitud @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Funció implícita @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Ha fallat el mallat - + The FEM module is built without NETGEN support. Meshing will not work!!! El mòdul MEF està compilat sense el suport de NETGEN. El mallat no funcionarà. @@ -3589,46 +3512,45 @@ Note: for 2D only setting for x is possible, Heu de crear o activar una anàlisi - + Ok D'acord - + Cancel Cancel·la - - - - - - - - + + + + + + + + A dialog is already open in the task panel A dialog is already open in the task panel - - - - - - - - + + + + + + + + Do you want to close this dialog? Do you want to close this dialog? - + Meshing Mallat - @@ -3645,22 +3567,22 @@ Note: for 2D only setting for x is possible, Importació-exportació - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3700,62 +3622,62 @@ Note: for 2D only setting for x is possible, Grups - + Are you sure you want to continue? Segur que voleu continuar? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4093,7 +4015,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Dependències de l'objecte @@ -5373,20 +5295,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6101,13 +6023,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6153,17 +6075,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6171,17 +6093,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6189,7 +6111,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6283,17 +6205,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_cs.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_cs.ts index 3cb24aaee5..438c697dba 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_cs.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_cs.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Posunutí omezení + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Omezení pevná + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Mezní stav kapaliny - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Vytvořte okrajovou podmínku tekutiny na entitě plochy pro výpočetní dynamiku tekutin @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Silová vazba + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Omezení tlaku + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Omezující teplota + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Transformace omezení + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Sada uzlů - + Creates a FEM mesh nodes set Vytvoří sadu uzlů sítě FEM - + Wrong selection Neplatný výběr - + Select a single FEM mesh or nodes set, please. Vyberte prosím samostatnou MKP síť nebo množinu uzlů. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Uzel nastavený pomocí poly - - + + Create node set by Poly Vytvoř množinu uzlů pomocí Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Použít změny na potrubí - + Apply changes to parameters directly and not on recompute only... Aplikujte změny parametrů přímo a ne pouze při přepočtu... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Filtr krajního klipu - + Define/create a clip filter which uses functions to define the clipped region Definujte/vytvořte klipový filtr, který používá funkce k definování oříznuté oblasti - + Wrong selection Neplatný výběr - + Select a pipeline, please. Vyberte potrubí, prosím. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Funkce cut filtr - + Cut the data along an implicit function Ořízněte data podél implicitní funkce @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Linkový klipový filtr - + Define/create a clip filter which clips a field along a line Definujte/vytvořte klipový filtr, který ořízne pole podél čáry @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Filtr dat v bodě klipu - + Define/create a clip filter which clips a field data at point Definujte/vytvořte klipový filtr, který ořízne data pole v bodě @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Funkce filtru - + Functions for use in postprocessing filter... Funkce pro použití ve filtru postprocessingu... - + Plane Rovina - + Sphere Koule - + Cylinder Válec - + Box Kvádr @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Tloušťka [mm] - + Stress [MPa] Plot Y-Axis Label Stres [MPa] - + Linearized Stresses Plot title Linearizovaná napětí - + Membrane Plot legend item label Membranová - + Membrane and Bending Plot legend item label Membrána a ohýbání - + Total Plot legend item label Celkem - - - Fem - Fem - - - - Stress linearization plot - Graf linearizace napětí - - - - Define/create stress linearization plots - Definujte/vytvářejte grafy linearizace napětí - - - - - Wrong selection - Neplatný výběr - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Vyberte filtr Clip, který ořízne pole STRES podél čáry, prosím. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Odeslat kanál z výsledku - - - - Creates a post processing pipeline from a result object - Vytvoří kanál po zpracování z výsledného objektu - - - - Wrong selection type - Špatný typ výběru - - - - Select a result object, please. - Vyberte prosím výsledný objekt. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Skalární klipový filtr - - - - Define/create a clip filter which clips a field with a scalar value - Definujte/vytvořte klipový filtr, který ořízne pole se skalární hodnotou - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Graf linearizace napětí + + + + Define/create stress linearization plots + Definujte/vytvářejte grafy linearizace napětí + + + + + Wrong selection + Neplatný výběr + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Vyberte filtr Clip, který ořízne pole STRES podél čáry, prosím. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Odeslat kanál z výsledku + + + + Creates a post processing pipeline from a result object + Vytvoří kanál po zpracování z výsledného objektu + + + + Wrong selection type + Špatný typ výběru + + + + Select a result object, please. + Vyberte prosím výsledný objekt. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Skalární klipový filtr + + + + Define/create a clip filter which clips a field with a scalar value + Definujte/vytvořte klipový filtr, který ořízne pole se skalární hodnotou + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Osnovní filtr - + Warp the geometry along a vector field by a certain factor Pokřivení geometrie podél vektorového pole o určitý faktor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Vytvořte hraniční podmínku tekutiny - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Umístěte robota - + Edit nodes set Upravit sadu uzlů - + Create nodes set Vytvořte sadu uzlů - + Create filter Vytvořit filtr - + Create function Vytvořit funkci - + Create pipeline from result Vytvořte potrubí z výsledku - + Edit Mirror Upravit zrcadlení @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Vytvořte rovinnou funkci definovanou jejím počátkem a normálou - + Create a sphere function, defined by its center and radius Vytvořte funkci koule definovanou jejím středem a poloměrem - + Create a cylinder function, defined by its center, axis and radius Vytvořte funkci válce definovanou svým středem, osou a poloměrem - + Create a box function, defined by its center, length, width and height Vytvořte krabicovou funkci definovanou svým středem, délkou, šířkou a výškou @@ -1017,20 +1017,20 @@ Dolní limit frekvence - + File does not exist Soubor neexistuje - + The specified executable '%1' does not exist! Specify another file please. - Zadaný spustitelný soubor + The specified executable '%1' - neexistuje! -Zadejte prosím jiný soubor. + does not exist! +Specify another file please. @@ -1119,36 +1119,36 @@ budou sloučeny, aby byly hranice objemu neviditelné. <html><head/><body><p><span style=" font-weight:600;">Poznámka:</span> Doporučuje se použít sudý počet jader, aby bylo možné využít symetrie sítě. (Použití 8 jader může být rychlejší než 9 jader.)<br/> <span style=" font-weight:600;">Poznámka:</span> V extrémních případech nemusí ElmerSolver konvergovat, pokud je číslo jádra příliš vysoké.</p></body></html> - + File does not exist Soubor neexistuje - + The specified executable '%1' does not exist! Specify another file please. - Zadaný spustitelný soubor + The specified executable '%1' - neexistuje! -Zadejte prosím jiný soubor. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Není vhodný pro multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Nesprávné nastavení Elmer: Používáte více než jedno jádro CPU. Proto je vyžadován spustitelný soubor s příponou '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Nesprávné nastavení Elmer: Používáte více než jedno jádro CPU. @@ -1385,20 +1385,20 @@ přidání nádoby na analýzu Chcete-li použít výchozí binární soubor gmsh, ponechte prázdné - + File does not exist Soubor neexistuje - + The specified executable '%1' does not exist! Specify another file please. - Zadaný spustitelný soubor + The specified executable '%1' - neexistuje! -Zadejte prosím jiný soubor. + does not exist! +Specify another file please. @@ -1462,83 +1462,6 @@ exportované z FreeCADu. Objekt výsledku FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materiál - - - - Card resources - Zdroje karet - - - - The cards built-in to FreeCAD will be listed as available. - Karty vestavěné do FreeCADu budou uvedeny jako dostupné. - - - - Use built-in materials - Používat vestavěné materiály - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Také karty z adresáře předvoleb FreeCADu budou uvedeny jako dostupné. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Použijte materiály z adresáře Materials v adresáři předvoleb uživatele FreeCAD - - - - Also material cards also from the specified directory -will be listed as available. - Také karty materiálu také ze zadaného adresáře -budou uvedeny jako dostupné. - - - - Use materials from user defined directory - Používat materiály z adresáře definovaného uživatelem - - - - User directory - Adresář uživatele - - - - Card sorting and duplicates - Třídění karet a duplikáty - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicitní karty budou odstraněny ze zobrazeného seznamu materiálových karet. - - - - Delete card duplicates - Odstraňte duplikáty karet - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Karty materiálu se zobrazí seřazené podle zdrojů (míst). -Pokud není zaškrtnuto, budou seřazeny podle jména. - - - - Sort by resources - Seřadit podle zdrojů - - FemGui::DlgSettingsFemMystranImp @@ -1577,20 +1500,20 @@ Pokud není zaškrtnuto, budou seřazeny podle jména. Pište komentáře do vstupního souboru - + File does not exist Soubor neexistuje - + The specified executable '%1' does not exist! Specify another file please. - Zadaný spustitelný soubor + The specified executable '%1' - neexistuje! -Zadejte prosím jiný soubor. + does not exist! +Specify another file please. @@ -1689,34 +1612,34 @@ iterativní řešitel a zobrazí se chybová zpráva že je třeba zvýšit „MAXKOI“. - + File does not exist Soubor neexistuje - + The specified z88r executable '%1' does not exist! Specify another file please. - Zadaný spustitelný soubor z88r + The specified z88r executable '%1' - neexistuje! -Zadejte prosím jiný soubor. + does not exist! +Specify another file please. - - + + Wrong file Špatný soubor - + You must specify the path to the z88r.exe! Musíte zadat cestu k souboru z88r.exe! - + You must specify the path to the z88r! Musíte zadat cestu k z88r! @@ -1740,13 +1663,13 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraint - - + + Input error Chyba zadání - + You must specify at least one reference Musíte specifikovat nejméně jednu referenci @@ -1754,7 +1677,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintBearing - + Input error Chyba zadání @@ -1762,7 +1685,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintContact - + Input error Chyba zadání @@ -1770,7 +1693,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintDisplacement - + Input error Chyba zadání @@ -1778,7 +1701,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Chyba zadání @@ -1786,13 +1709,13 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintForce - - + + Input error Chyba zadání - + Please specify a force greater than 0 Zadejte prosím sílu větší než 0 @@ -1800,7 +1723,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintGear - + Input error Chyba zadání @@ -1808,7 +1731,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintHeatflux - + Input error Chyba zadání @@ -1816,8 +1739,8 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Chyba zadání @@ -1825,7 +1748,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintPressure - + Input error Chyba zadání @@ -1833,7 +1756,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintPulley - + Input error Chyba zadání @@ -1841,7 +1764,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintSpring - + Input error Chyba zadání @@ -1849,7 +1772,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintTemperature - + Input error Chyba zadání @@ -1857,7 +1780,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgFemConstraintTransform - + Input error Chyba zadání @@ -1865,12 +1788,12 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Upravit MKP síť - + Meshing failure Selhání síťování @@ -1878,7 +1801,7 @@ Zadejte prosím jiný soubor. FemGui::TaskDlgPost - + Input error Chyba zadání @@ -1894,12 +1817,12 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Odstranit @@ -1907,42 +1830,42 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Chyba výběru - + Please use only a single reference for bearing constraint Prosím použijte pouze jednu referenci pro vazbu ložiska - + Only faces can be picked Mohou být vybrány jen stěny - + Only cylindrical faces can be picked Mohou být vybrány pouze válcové plochy - + Only planar faces can be picked Mohou být vybrány pouze rovinné stěny - + Only linear edges can be picked Mohou být vybrány pouze lineární hrany - + Only faces and edges can be picked Mohou být vybrány pouze stěny a hrany @@ -1951,77 +1874,77 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintContact - + Delete Odstranit - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Chyba výběru - + Only one face in object! - moved to master face Pouze jedna tvář v objektu! - přesunuto na hlavní tvář - - + + Only one master face and one slave face for a contact constraint! Pouze jedna hlavní strana a jedna podřízená plocha pro omezení kontaktu! - - - - + + + + Nothing selected! Nic není vybráno! - + Only one slave face for a contact constraint! Pouze jedna slave tvář pro omezení kontaktu! - - - - + + + + Selected object is not a part! Vybraný objekt není součást! - - + + Only faces can be picked Mohou být vybrány jen stěny - + Only one master for a contact constraint! Pouze jeden hlavní pro omezení kontaktu! - + Only one master face for a contact constraint! Pouze jedna hlavní plocha pro omezení kontaktu! @@ -2029,28 +1952,28 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintFluidBoundary - + Basic Základní - + Turbulence Turbulence - + Thermal Tepelný - + select boundary type, faces and set value vyberte typ ohraničení, plochy a nastavte hodnotu - + Intensity [0~1] Intenzita [0~1] - + Dissipation Rate [m2/s3] Rychlost rozptylu [m2/s3] - + Length Scale[m] Měřítko délky [m] - + Viscosity Ratio [1] Viskozitní poměr [1] - + Hydraulic Diameter [m] Hydraulický průměr [m] - - + + Gradient [K/m] Přechod [K/m] - + Flux [W/m2] Tok [W/m2] - + Empty selection Prázdný výběr - + Select an edge or a face, please. Vyberte hranu nebo plochu, prosím. - - - - - + + + + + Wrong selection Neplatný výběr - + Selected object is not a part object! Vybraný objekt není dílčí objekt! - + Only one planar face or edge can be selected! Lze vybrat pouze jednu rovinnou plochu nebo hranu! - + Only planar faces can be picked for 3D Pro 3D lze vybrat pouze rovinné plochy - + Only planar edges can be picked for 2D Pro 2D lze vybrat pouze rovinné hrany - + Only faces for 3D part or edges for 2D can be picked Lze vybrat pouze plochy pro 3D díl nebo hrany pro 2D - - + - - + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Neplatný výběr - + Select an edge or a face, please. Vyberte hranu nebo plochu, prosím. @@ -2256,24 +2179,24 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintGear - - - + + + Selection error Chyba výběru - + Only planar faces can be picked Mohou být vybrány pouze rovinné stěny - + Only linear edges can be picked Mohou být vybrány pouze lineární hrany - + Only faces and edges can be picked Mohou být vybrány pouze stěny a hrany @@ -2281,30 +2204,30 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! - - + + Selection must only consist of faces! Výběr se musí skládat pouze z obličejů! @@ -2312,42 +2235,42 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Chyba výběru - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! - + Only faces can be picked Mohou být vybrány jen stěny - + Only planar faces can be picked Mohou být vybrány pouze rovinné stěny @@ -2355,28 +2278,28 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! - + Only faces can be picked Mohou být vybrány jen stěny @@ -2384,12 +2307,12 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintPulley - + Pulley diameter Průměr kladky - + Torque [Nm] Točivý moment [Nm] @@ -2397,28 +2320,28 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! - + Only faces can be picked Mohou být vybrány jen stěny @@ -2426,22 +2349,22 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Selected object is not a part! Vybraný objekt není součást! @@ -2449,64 +2372,64 @@ Zadejte prosím jiný soubor. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Transformovatelné tváře se změnily. Přidejte pouze transformovatelné plochy a odeberte netransformovatelné plochy! - - - - - - - - - - + + + + + + + + + + Selection error Chyba výběru - - + + Nothing selected! Nic není vybráno! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Vybraný objekt není součást! - + Only faces can be picked Mohou být vybrány jen stěny - + Only cylindrical faces can be picked Mohou být vybrány pouze válcové plochy @@ -2514,7 +2437,7 @@ Zadejte prosím jiný soubor. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2522,7 +2445,7 @@ Zadejte prosím jiný soubor. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, zvolte implicitní funkci @@ -2530,7 +2453,7 @@ Zadejte prosím jiný soubor. FemGui::TaskPostCut - + Function cut, choose implicit function Funkce cut, zvolte implicitní funkci @@ -2538,12 +2461,12 @@ Zadejte prosím jiný soubor. FemGui::TaskPostDataAlongLine - + Data along a line options Možnosti dat podél čáry - + Length X-Axis plot label Délka @@ -2552,12 +2475,12 @@ Zadejte prosím jiný soubor. FemGui::TaskPostDataAtPoint - + Data at point options Možnosti dat v bodě - + %1 at (%2; %3; %4) is: %5 %6 %1 zavináč (%2; %3; %4) je: %5 %6 @@ -2565,7 +2488,7 @@ Zadejte prosím jiný soubor. FemGui::TaskPostDisplay - + Result display options Možnosti zobrazení výsledků @@ -2573,7 +2496,7 @@ Zadejte prosím jiný soubor. FemGui::TaskPostFunction - + Implicit function Implicitní funkce @@ -2581,7 +2504,7 @@ Zadejte prosím jiný soubor. FemGui::TaskPostScalarClip - + Scalar clip options Možnosti skalárního klipu @@ -2589,7 +2512,7 @@ Zadejte prosím jiný soubor. FemGui::TaskPostWarpVector - + Warp options Možnosti warpu @@ -2613,12 +2536,12 @@ Zadejte prosím jiný soubor. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Selhání síťování - + The FEM module is built without NETGEN support. Meshing will not work!!! MKP modul je sestavený bez podpory NETGENu. Síťování nebude fungovat!!! @@ -3590,46 +3513,45 @@ Poznámka: pro 2D je možné pouze nastavení pro x, Musíš vytvořit nebo aktivovat analýzu - + Ok Budiž - + Cancel Zrušit - - - - - - - - + + + + + + + + A dialog is already open in the task panel Dialog je opravdu otevřen v panelu úloh - - - - - - - - + + + + + + + + Do you want to close this dialog? Chcete zavřít tento dialog? - + Meshing Síťování - @@ -3646,22 +3568,22 @@ Poznámka: pro 2D je možné pouze nastavení pro x, Import-Export - + Constraint initial temperature Omezení počáteční teploty - + Constraint pulley Omezovací kladka - + Constraint spring Omezující pružina - + Edit post processing object Upravit objekt následného zpracování @@ -3701,62 +3623,62 @@ Poznámka: pro 2D je možné pouze nastavení pro x, Skupiny - + Are you sure you want to continue? Opravdu si přejete pokračovat? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Mezní stav kapaliny - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ Možné proměnné naleznete v popisném poli níže. Std_Delete - + Object dependencies Závislosti objektu @@ -5328,7 +5250,7 @@ používá se pro řešič Elmer Mesh - Síť + Mesh @@ -5374,20 +5296,20 @@ používá se pro řešič Elmer setupFilter - + Error: A filter can only be applied to a single object. Chyba: Filtr lze použít pouze na jeden objekt. - - - + + + The filter could not be set up. Filtr nelze nastavit. - - + + Error: no post processing object selected. Chyba: nebyl vybrán žádný objekt následného zpracování. @@ -6102,13 +6024,13 @@ Nejprve prosím vyberte typ výsledku. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Nejprve prosím vyberte typ výsledku. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Elektromagnetické rovnice - + Electromagnetic equations for the Elmer solver Elektromagnetické rovnice pro Elmerův řešič @@ -6172,17 +6094,17 @@ Nejprve prosím vyberte typ výsledku. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Filtr obrysů - + Define/create a contours filter which displays iso contours Definujte/vytvořte filtr obrysů, který zobrazuje izo obrysy @@ -6190,7 +6112,7 @@ Nejprve prosím vyberte typ výsledku. FemGui::TaskPostContours - + Contours filter options Možnosti filtrování kontur @@ -6284,17 +6206,17 @@ Nejprve prosím vyberte typ výsledku. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanické rovnice - + Mechanical equations for the Elmer solver Mechanické rovnice pro Elmerův řešič diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_de.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_de.ts index 7111163939..1f9e04bcc3 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_de.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_de.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Randbedingung Versatz + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Randbedingung Festsetzen + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid-Randbedingung - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Erzeuge Fluid-Randbedingung einer Fläche für Computational Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Randbedingung Krafteinwirkung + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Randbedingung Druck + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Feder - + Creates a spring acting on a face Erstellt eine Feder, die auf eine Fläche wirkt @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Randbedingung Temperatur + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Randbedingung Verformung + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Knoten-Set - + Creates a FEM mesh nodes set Erzeugt einen Satz an FEM-Netzknoten - + Wrong selection Falsche Auswahl - + Select a single FEM mesh or nodes set, please. Wählen Sie ein einzelnes FEM-Netz oder einen Knotensatz. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Knoten von Poly gesetzt - - + + Create node set by Poly Erstelle Knotengruppe mittels Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Änderungen auf Pipeline anwenden - + Apply changes to parameters directly and not on recompute only... Parameter-Änderungen direkt anwenden und nicht nur bei Neuberechnung... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region Ausschnitt-Filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Falsche Auswahl - + Select a pipeline, please. Bitte eine Pipeline auswählen. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Funktion Schnitt-Filter - + Cut the data along an implicit function Schneiden Sie die Daten entlang einer impliziten Funktion @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Linie Ausschnitt-Filter - + Define/create a clip filter which clips a field along a line Definieren/Erstellen eines Clip-Filters, der ein Feld entlang einer Linie ausschneidet @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Daten zu Punkt Ausschnits-Filter - + Define/create a clip filter which clips a field data at point Definiere/Erstelle einen Ausschnitt-Filter, der einen Datenpunkt aus einem Feld ausschneidet @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filterfunktionen - + Functions for use in postprocessing filter... Funktionen zur Verwendung in Nachbearbeitungs-Filter... - + Plane Ebene - + Sphere Kugel - + Cylinder Zylinder - + Box Quader @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Dicke [mm] - + Stress [MPa] Plot Y-Axis Label Spannung [MPa] - + Linearized Stresses Plot title Linearisierte Spannungen - + Membrane Plot legend item label Membran - + Membrane and Bending Plot legend item label Membran und Biegung - + Total Plot legend item label Summe - - - Fem - Fem - - - - Stress linearization plot - Linearisierte Spannungsdarstellung - - - - Define/create stress linearization plots - Linearisierte Spannungsdarstellung definieren/erstellen - - - - - Wrong selection - Falsche Auswahl - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Bitte einen einen Ausschnitt-Filter auswählen, der ein Spannungs-Feld entlang einer Linie ausschneidet. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Nachbearbeitungs-Pipeline aus Ergebnis - - - - Creates a post processing pipeline from a result object - Erstellt eine Nachbearbeitungs-Pipeline aus einem Ergebnisobjekt - - - - Wrong selection type - Falscher Auswahl-Typ - - - - Select a result object, please. - Bitte ein Ergebnisobjekt auswählen. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Skalar Ausschnitt-Filter - - - - Define/create a clip filter which clips a field with a scalar value - Definiere/Erstelle einen Ausschnitt-Filter, der ein Feld mit einem skalaren Wert ausschneidet - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Linearisierte Spannungsdarstellung + + + + Define/create stress linearization plots + Linearisierte Spannungsdarstellung definieren/erstellen + + + + + Wrong selection + Falsche Auswahl + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Bitte einen einen Ausschnitt-Filter auswählen, der ein Spannungs-Feld entlang einer Linie ausschneidet. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Nachbearbeitungs-Pipeline aus Ergebnis + + + + Creates a post processing pipeline from a result object + Erstellt eine Nachbearbeitungs-Pipeline aus einem Ergebnisobjekt + + + + Wrong selection type + Falscher Auswahl-Typ + + + + Select a result object, please. + Bitte ein Ergebnisobjekt auswählen. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Skalar Ausschnitt-Filter + + + + Define/create a clip filter which clips a field with a scalar value + Definiere/Erstelle einen Ausschnitt-Filter, der ein Feld mit einem skalaren Wert ausschneidet + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Verformungsfilter - + Warp the geometry along a vector field by a certain factor Geometrie um einen bestimmten Faktor entlang eines Vektorfeldes verformen @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Fluid-Randbedingung erstellen - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face - Make spring on face + Feder auf Fläche kreieren - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Roboter platzieren - + Edit nodes set Knotensatz bearbeiten - + Create nodes set Knotenpunktsatz erstellen - + Create filter Filter erstellen - + Create function Funktion erstellen - + Create pipeline from result Pipeline aus Ergebnis erzeugen - + Edit Mirror Spiegel bearbeiten @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Erstelle eine Ebenenfunktion, definiert durch Ursprung und Normale - + Create a sphere function, defined by its center and radius Erstelle eine Kugelfunktion, definiert durch Mittelpunkt und Radius - + Create a cylinder function, defined by its center, axis and radius Erstellt eine Zylinderfunktion, die durch Mittelpunkt, Achse und Radius definiert wird - + Create a box function, defined by its center, length, width and height Erstellt eine Quaderfunktion, die durch Mittelpunkt, Länge, Breite und Höhe definiert wird @@ -1016,20 +1016,20 @@ Niedrigste Frequenz - + File does not exist Datei existiert nicht - + The specified executable '%1' does not exist! Specify another file please. - Die angegebene ausführbare Datei + The specified executable '%1' - existiert nicht! -Bitte eine andere Datei angeben. + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ verarbeiteten Mesh-Volume-Bereiche werden zusammengeführt, um die Volume-Grenze <html><head/><body><p><span style=" font-weight:600;">Note:</span> Es wird emfohlen, eine gerade Anzahl von Kernen zu verwenden, um von den Netzsymmetrien zu profitieren. (Der Einsatz von 8 kann schneller als der von 9 Kernen sein.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist Datei existiert nicht - + The specified executable '%1' does not exist! Specify another file please. - Die angegebene ausführbare Datei + The specified executable '%1' - existiert nicht! -Bitte eine andere Datei angeben. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Nicht geeignet für Multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Falsche Elmer-Einstellung: Es wird mehr als ein CPU-Kern verwendet, daher ist eine ausführbare Datei mit dem Suffix '_mpi.exe' erforderlich. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Falsche Elmer-Einstellung: Es wird mehr als ein CPU-Kern verwendet, @@ -1382,20 +1382,20 @@ adding an analysis container Freilassen, um die Standard-gmsh-Binärdatei zu verwenden - + File does not exist - Datei existiert nicht + Datei nicht gefunden - + The specified executable '%1' does not exist! Specify another file please. - Die angegebene ausführbare Datei + The specified executable '%1' - existiert nicht! -Bitte eine andere Datei angeben. + does not exist! +Specify another file please. @@ -1454,83 +1454,6 @@ FreeCAD-Ergebnisobjekt: Die importierten Daten werden in ein FreeCAD FEM-Ergebni FreeCAD-Ergebnisobjekt - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Karten-Ressourcen - - - - The cards built-in to FreeCAD will be listed as available. - Die in FreeCAD integrierten Karten werden als verfügbar angezeigt. - - - - Use built-in materials - Verwenden von installierten Materialien - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Auch Karten aus FreeCAD Benutzereinstellungs-Verzeichnis werden als verfügbar angezeigt. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Materialien aus dem Materialverzeichnis im FreeCAD Benutzereinstellungs-Verzeichnis verwenden - - - - Also material cards also from the specified directory -will be listed as available. - Auch Materialkarten aus dem angegebenen Verzeichnis -werden als verfügbar angezeigt. - - - - Use materials from user defined directory - Verwenden von Materialien aus dem vom Benutzer definierten Verzeichnis - - - - User directory - Benutzerverzeichnis - - - - Card sorting and duplicates - Kartensortierung und Duplikate - - - - Duplicate cards will be deleted from the displayed material card list. - Doppelte Karten werden aus der Liste der angezeigten Materialien gelöscht. - - - - Delete card duplicates - Kartenduplikate löschen - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Materialkarten werden nach ihren Ressourcen (Ablageorten) sortiert. -Wenn deaktiviert, werden sie nach ihrem Namen sortiert. - - - - Sort by resources - Nach Quellen sortieren - - FemGui::DlgSettingsFemMystranImp @@ -1569,20 +1492,20 @@ Wenn deaktiviert, werden sie nach ihrem Namen sortiert. Kommentare in die Eingabe-Datei schreiben - + File does not exist Datei nicht gefunden - + The specified executable '%1' does not exist! Specify another file please. - Die angegebene ausführbare Datei + The specified executable '%1' - existiert nicht! -Bitte eine andere Datei angeben. + does not exist! +Specify another file please. @@ -1679,33 +1602,34 @@ iterativen Löser eingesetzt wird und die Fehlermeldung ""MAXKOI" muss erhöht werden" erscheint. - + File does not exist - Datei nicht gefunden + Datei existiert nicht - + The specified z88r executable '%1' does not exist! Specify another file please. - Die angegebene Datei z88r '%1' -existiert nicht! -Bitte eine andere Datei angeben. + The specified z88r executable +'%1' + does not exist! +Specify another file please. - - + + Wrong file Falsche Datei - + You must specify the path to the z88r.exe! Sie müssen den Pfad zu z88r.exe angeben! - + You must specify the path to the z88r! Du musst den Pfad zu z88r angeben! @@ -1729,13 +1653,13 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraint - - + + Input error Eingabefehler - + You must specify at least one reference Sie müssen mindestens eine Referenz angeben @@ -1743,7 +1667,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintBearing - + Input error Eingabefehler @@ -1751,7 +1675,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintContact - + Input error Eingabefehler @@ -1759,7 +1683,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintDisplacement - + Input error Eingabefehler @@ -1767,7 +1691,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Eingabefehler @@ -1775,13 +1699,13 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintForce - - + + Input error Eingabefehler - + Please specify a force greater than 0 Bitte geben Sie eine Kraft größer 0 ein @@ -1789,7 +1713,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintGear - + Input error Eingabefehler @@ -1797,7 +1721,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintHeatflux - + Input error Eingabefehler @@ -1805,8 +1729,8 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Eingabefehler @@ -1814,7 +1738,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintPressure - + Input error Eingabefehler @@ -1822,7 +1746,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintPulley - + Input error Eingabefehler @@ -1830,7 +1754,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintSpring - + Input error Eingabefehler @@ -1838,7 +1762,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintTemperature - + Input error Eingabefehler @@ -1846,7 +1770,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgFemConstraintTransform - + Input error Eingabefehler @@ -1854,12 +1778,12 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh FEM-Netz bearbeiten - + Meshing failure Fehler bei der Netzerstellung @@ -1867,7 +1791,7 @@ Bitte eine andere Datei angeben. FemGui::TaskDlgPost - + Input error Eingabefehler @@ -1883,12 +1807,12 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Löschen @@ -1896,42 +1820,42 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Auswahlfehler - + Please use only a single reference for bearing constraint Bitte verwenden Sie nur eine einzige Referenz für die Lagerrandbedingung - + Only faces can be picked Es können nur Flächen ausgewählt werden - + Only cylindrical faces can be picked Es können nur zylindrische Flächen ausgewählt werden - + Only planar faces can be picked Es können nur ebene Flächen ausgewählt werden - + Only linear edges can be picked Es können nur geradlinige Kanten ausgewählt werden - + Only faces and edges can be picked Es können nur Flächen und Kanten ausgewählt werden @@ -1940,77 +1864,77 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintContact - + Delete Löschen - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Auswahlfehler - + Only one face in object! - moved to master face Nur eine Fläche in Objekt! - In die Hauptfläche verschoben - - + + Only one master face and one slave face for a contact constraint! Nur eine Hauptfläche und eine untergeordnete Fläche für eine Kontakt-Randbedingung! - - - - + + + + Nothing selected! Nichts ausgewählt! - + Only one slave face for a contact constraint! Nur eine untergeordnete Fläche für eine Kontakt-Randbedingung! - - - - + + + + Selected object is not a part! Ausgewähltes Objekt ist kein Teil! - - + + Only faces can be picked Es können nur Flächen ausgewählt werden - + Only one master for a contact constraint! Nur ein Master für eine Kontakt-Randbedingung! - + Only one master face for a contact constraint! Nur eine Hauptfläche für eine Kontakt-Randbedingung! @@ -2018,28 +1942,28 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! - Ausgewähltes Objekt ist kein Teil! + Ausgewähltes Objekt ist kein Part! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2047,28 +1971,28 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! - Ausgewähltes Objekt ist kein Part! + Ausgewähltes Objekt ist kein Teilobjekt! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2076,128 +2000,128 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintFluidBoundary - + Basic Grundlagen - + Turbulence Turbulenz - + Thermal Thermisch - + select boundary type, faces and set value wähle Grenztyp, Flächen und setze den Wert - + Intensity [0~1] Intensität [0~1] - + Dissipation Rate [m2/s3] Dissipationsrate [m2/s3] - + Length Scale[m] Längenmaßstab [m] - + Viscosity Ratio [1] Viskositätsverhältnis [1] - + Hydraulic Diameter [m] Hydraulischer Durchmesser [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Fluss [W/m2] - + Empty selection Leere Auswahl - + Select an edge or a face, please. Bitte eine Kante oder Fläche auswählen. - - - - - + + + + + Wrong selection Falsche Auswahl - + Selected object is not a part object! Ausgewähltes Objekt ist kein Teilobjekt! - + Only one planar face or edge can be selected! Es kann nur eine ebene Fläche oder eine Kante ausgewählt werden! - + Only planar faces can be picked for 3D Es können nur ebene Flächen für 3D ausgewählt werden - + Only planar edges can be picked for 2D Es können nur ebene Flächen für 2D ausgewählt werden - + Only faces for 3D part or edges for 2D can be picked Nur Flächen für 3D-Teile oder Kanten für 2D-Teile können ausgewählt werden - - + - - + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! - Ausgewähltes Objekt ist kein Teilobjekt! + Ausgewähltes Objekt ist kein Teil! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2205,39 +2129,39 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! Ausgewähltes Objekt ist kein Teil! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Falsche Auswahl - + Select an edge or a face, please. Bitte eine Kante oder Fläche auswählen. @@ -2245,24 +2169,24 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintGear - - - + + + Selection error Auswahlfehler - + Only planar faces can be picked Es können nur ebene Flächen ausgewählt werden - + Only linear edges can be picked Es können nur geradlinige Kanten ausgewählt werden - + Only faces and edges can be picked Es können nur Flächen und Kanten ausgewählt werden @@ -2270,30 +2194,30 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! Ausgewähltes Objekt ist kein Teil! - - + + Selection must only consist of faces! Auswahl darf nur aus Flächen bestehen! @@ -2301,42 +2225,42 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Auswahlfehler - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! Ausgewähltes Objekt ist kein Teil! - + Only faces can be picked Es können nur Flächen ausgewählt werden - + Only planar faces can be picked Es können nur ebene Flächen ausgewählt werden @@ -2344,28 +2268,28 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! Ausgewähltes Objekt ist kein Teil! - + Only faces can be picked Es können nur Flächen ausgewählt werden @@ -2373,12 +2297,12 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintPulley - + Pulley diameter Rollendurchmesser - + Torque [Nm] Drehmoment [Nm] @@ -2386,28 +2310,28 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! Ausgewähltes Objekt ist kein Teil! - + Only faces can be picked Es können nur Flächen ausgewählt werden @@ -2415,22 +2339,22 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Selected object is not a part! Ausgewähltes Objekt ist kein Teil! @@ -2438,64 +2362,64 @@ Bitte eine andere Datei angeben. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Die transformierbaren Flächen haben sich geändert. Bitte nur transformierbare Flächen hinzufügen und nicht-transformierbare Flächen entfernen. - - - - - - - - - - + + + + + + + + + + Selection error Auswahlfehler - - + + Nothing selected! Nichts ausgewählt! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Ausgewähltes Objekt ist kein Teil! - + Only faces can be picked Es können nur Flächen ausgewählt werden - + Only cylindrical faces can be picked Es können nur zylindrische Flächen ausgewählt werden @@ -2503,7 +2427,7 @@ Bitte eine andere Datei angeben. FemGui::TaskObjectName - + TaskObjectName AufgabenObjektName @@ -2511,7 +2435,7 @@ Bitte eine andere Datei angeben. FemGui::TaskPostClip - + Clip region, choose implicit function Schneide Region aus, wähle implizite Funktion @@ -2519,7 +2443,7 @@ Bitte eine andere Datei angeben. FemGui::TaskPostCut - + Function cut, choose implicit function Funktionsschnitt, implizite Funktion wählen @@ -2527,12 +2451,12 @@ Bitte eine andere Datei angeben. FemGui::TaskPostDataAlongLine - + Data along a line options Optionen für Daten entlang einer Linie - + Length X-Axis plot label Länge @@ -2541,12 +2465,12 @@ Bitte eine andere Datei angeben. FemGui::TaskPostDataAtPoint - + Data at point options Daten an Punkt Optionen - + %1 at (%2; %3; %4) is: %5 %6 %1 bei (%2; %3; %4) ist: %5 %6 @@ -2554,7 +2478,7 @@ Bitte eine andere Datei angeben. FemGui::TaskPostDisplay - + Result display options Ergebnisanzeigeoptionen @@ -2562,7 +2486,7 @@ Bitte eine andere Datei angeben. FemGui::TaskPostFunction - + Implicit function Implizite Funktion @@ -2570,7 +2494,7 @@ Bitte eine andere Datei angeben. FemGui::TaskPostScalarClip - + Scalar clip options Skalar-Ausschnitt-Optionen @@ -2578,7 +2502,7 @@ Bitte eine andere Datei angeben. FemGui::TaskPostWarpVector - + Warp options Verformungsoptionen @@ -2602,12 +2526,12 @@ Bitte eine andere Datei angeben. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Fehler bei der Netzerstellung - + The FEM module is built without NETGEN support. Meshing will not work!!! Das FEM-Modul ist ohne NETGEN-Unterstützung erstellt worden. Die Netzerstellung funktioniert nicht!!! @@ -3379,7 +3303,7 @@ Hinweis: hat keinen Effekt, wenn ein Volumen ausgewählt wurde Label - Beschriftung + Bezeichnung @@ -3543,7 +3467,7 @@ Hinweis: Für 2D ist nur für x möglich, x - x + х @@ -3579,46 +3503,45 @@ Hinweis: Für 2D ist nur für x möglich, Sie müssen eine Analyse erstellen oder aktivieren - + Ok Ok - + Cancel Abbrechen - - - - - - - - + + + + + + + + A dialog is already open in the task panel Im Aufgabenbereich ist bereits ein Dialog geöffnet - - - - - - - - + + + + + + + + Do you want to close this dialog? Möchten Sie diesen Dialog schließen? - + Meshing Vernetzung - @@ -3635,22 +3558,22 @@ Hinweis: Für 2D ist nur für x möglich, Import / Export - + Constraint initial temperature Randbedingung Starttemperatur - + Constraint pulley Randbedingung Riemenscheibe - + Constraint spring Randbedingung Feder - + Edit post processing object Nachbearbeitungsobjekt bearbeiten @@ -3690,62 +3613,62 @@ Hinweis: Für 2D ist nur für x möglich, Gruppen - + Are you sure you want to continue? Sind Sie sicher, dass Sie fortfahren möchten? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid-Randbedingung - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4057,7 +3980,7 @@ Siehe das nachfolgende Beschreibungsfeld für mögliche Variablen. x - x + х @@ -4083,7 +4006,7 @@ Siehe das nachfolgende Beschreibungsfeld für mögliche Variablen. Std_Delete - + Object dependencies Objektabhängigkeiten @@ -4098,7 +4021,7 @@ Siehe das nachfolgende Beschreibungsfeld für mögliche Variablen. Analysis features - Analysis features + Analysefunktionen @@ -4865,7 +4788,7 @@ für den Löser Elmer verwendet werden x - х + x @@ -5363,20 +5286,20 @@ für den Löser Elmer verwendet werden setupFilter - + Error: A filter can only be applied to a single object. Fehler: Ein Filter kann nur auf ein einzelnes Objekt angewandt werden. - - - + + + The filter could not be set up. Der Filter konnte nicht eingerichtet werden. - - + + Error: no post processing object selected. Fehler: Kein Objekt zur Nachbearteitung ausgewählt. @@ -6091,13 +6014,13 @@ Bitte wählen Sie zuerst einen Ergebnistyp. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6143,17 +6066,17 @@ Bitte wählen Sie zuerst einen Ergebnistyp. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Elektromagnetische Gleichungen - + Electromagnetic equations for the Elmer solver Elektromagnetische Gleichungen für den Gleichungslöser Elmer @@ -6161,17 +6084,17 @@ Bitte wählen Sie zuerst einen Ergebnistyp. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Konturenfilter - + Define/create a contours filter which displays iso contours Definiert/erstellt einen Konturenfilter zur Darstellung von Iso-Konturen @@ -6179,7 +6102,7 @@ Bitte wählen Sie zuerst einen Ergebnistyp. FemGui::TaskPostContours - + Contours filter options Konturenfilter-Optionen @@ -6242,7 +6165,7 @@ Bitte wählen Sie zuerst einen Ergebnistyp. x - х + x @@ -6273,17 +6196,17 @@ Bitte wählen Sie zuerst einen Ergebnistyp. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanische Gleichungen - + Mechanical equations for the Elmer solver Mechanische Gleichungen für den Gleichungslöser Elmer diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_el.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_el.ts index 283d754b7e..aa797e9c81 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_el.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_el.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Μετατόπιση περιορισμού + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Σταθερός περιορισμός + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Οριακή κατάσταση ρευστού - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Δημιουργία οριακής συνθήκης ρευστού στην περιοχή για Υπολογιστική Ρευστοδυναμική @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Περιορισμός δύναμης + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature - Initial temperature + Αρχική θερμοκρασία - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,35 +202,35 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint - Pulley constraint + Περιορισμός τροχαλίας - + Creates a pulley constraint - Creates a pulley constraint + Δημιουργεί έναν περιορισμό τροχαλίας CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Περιορισμό θερμοκρασίας + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,45 +256,45 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Περιορισμός μετατόπισης + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face - Create a local coordinate system on a face + Δημιουργεί ένα τοπικό σύστημα συντεταγμένων σε μια όψη CmdFemCreateNodesSet - + Fem Fem - + Nodes set Σύνολο κόμβων - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Λάθος επιλογή - + Select a single FEM mesh or nodes set, please. Επιλέξτε ένα μεμονωμένο πλέγμα FEM ή σύνολο κόμβων, παρακαλώ. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Δημιουργήστε ένα σύνολο κόμβων με τη χρήση Πολυγώνων @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Λάθος επιλογή - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Φίλτρο κοπής λειτουργίας - + Cut the data along an implicit function Κόψτε τα δεδομένα κατά μήκος μιας έμμεσης συνάρτησης @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Ορίστε/δημιουργήστε ένα φίλτρο που κόβει ένα πεδίο κατά μήκος μιας γραμμής @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Επίπεδο - + Sphere Σφαίρα - + Cylinder Κύλινδρος - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Πάχος [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Σύνολο - - - Fem - Fem - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Λάθος επιλογή - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Θέση αγωγού από αποτέλεσμα - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Λάθος επιλογή + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Θέση αγωγού από αποτέλεσμα + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Δημιουργία φίλτρου - + Create function Δημιουργία συνάρτησης - + Create pipeline from result Create pipeline from result - + Edit Mirror Edit Mirror @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1016,12 +1016,12 @@ Όριο χαμηλής συχνότητας - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1118,12 +1118,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1134,20 +1134,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1384,12 +1384,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1461,83 +1461,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Υλικό - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - Οι κάρτες που είναι ενσωματωμένες στο FreeCAD θα αναφέρονται ως διαθέσιμες. - - - - Use built-in materials - Χρησιμοποιήστε ενδογενή υλικά - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Επίσης οι κάρτες από τον κατάλογο προτιμήσεων του FreeCAD θα εμφανίζονται ως διαθέσιμες. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Χρησιμοποιήστε υλικά από τον κατάλογο Υλικά του FreeCAD - - - - Also material cards also from the specified directory -will be listed as available. - Επίσης, κάρτες υλικών από τον καθορισμένο κατάλογο -θα καταχωρούνται ως διαθέσιμες. - - - - Use materials from user defined directory - Χρησιμοποιήστε υλικά από ευρετήριο ορισμένο από τον χρήστη - - - - User directory - Ευρετήριο χρήστη - - - - Card sorting and duplicates - Ταξινόμηση και αντίγραφα καρτών - - - - Duplicate cards will be deleted from the displayed material card list. - Οι διπλότυπες κάρτες θα διαγραφούν από την εμφανιζόμενη λίστα υλικού. - - - - Delete card duplicates - Διαγραφή διπλότυπων καρτών - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Οι κάρτες υλικών εμφανίζονται ταξινομημένες κατά την τοποθέτησή τους -Αν δεν επιλεχθεί, θα ταξινομηθούν με βάση το όνομά τους. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1576,12 +1499,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1685,12 +1608,12 @@ that "MAXKOI" needs to be increased. σφάλματος ότι πρέπει να αυξηθεί το "MAXKOI". - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1701,18 +1624,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1736,13 +1659,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Σφάλμα εισαγωγής - + You must specify at least one reference Πρέπει να καθορίσετε τουλάχιστον μια αναφορά @@ -1750,7 +1673,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Σφάλμα εισαγωγής @@ -1758,7 +1681,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Σφάλμα εισαγωγής @@ -1766,7 +1689,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Σφάλμα εισαγωγής @@ -1774,7 +1697,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Σφάλμα εισαγωγής @@ -1782,13 +1705,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Σφάλμα εισαγωγής - + Please specify a force greater than 0 Παρακαλώ καθορίστε μια δύναμη μεγαλύτερη του 0 @@ -1796,7 +1719,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Σφάλμα εισαγωγής @@ -1804,7 +1727,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Σφάλμα εισαγωγής @@ -1812,8 +1735,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Σφάλμα εισαγωγής @@ -1821,7 +1744,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Σφάλμα εισαγωγής @@ -1829,7 +1752,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Σφάλμα εισαγωγής @@ -1837,7 +1760,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Σφάλμα εισαγωγής @@ -1845,7 +1768,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Σφάλμα εισαγωγής @@ -1853,7 +1776,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Σφάλμα εισαγωγής @@ -1861,12 +1784,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Επεξεργασία πλέγματος FEM - + Meshing failure Αποτυχία πλεγματοποίησης @@ -1874,7 +1797,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Σφάλμα εισαγωγής @@ -1890,12 +1813,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Διαγραφή @@ -1903,42 +1826,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Σφάλμα επιλογής - + Please use only a single reference for bearing constraint Παρακαλώ χρησιμοποιήστε μόνο μια μεμονωμένη αναφορά για τον περιορισμό υποστηρίγματος άξονος - + Only faces can be picked Μόνο όψεις μπορούν να επιλεχθούν - + Only cylindrical faces can be picked Μόνο κυλινδρικές όψεις μπορούν να επιλεχθούν - + Only planar faces can be picked Μόνο επίπεδες επιφάνειες μπορούν να επιλεχθούν - + Only linear edges can be picked Μόνο γραμμικές ακμές μπορούν να επιλεχθούν - + Only faces and edges can be picked Μόνο επιφάνειες και ακμές μπορούν να επιλεχθούν @@ -1947,77 +1870,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Διαγραφή - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Σφάλμα επιλογής - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Τίποτα δεν επιλέχθηκε! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - - + + Only faces can be picked Μόνο όψεις μπορούν να επιλεχθούν - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2025,28 +1948,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2054,28 +1977,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2083,128 +2006,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Ένταση [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Λάθος επιλογή - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2212,39 +2135,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Λάθος επιλογή - + Select an edge or a face, please. Select an edge or a face, please. @@ -2252,24 +2175,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Σφάλμα επιλογής - + Only planar faces can be picked Μόνο επίπεδες επιφάνειες μπορούν να επιλεχθούν - + Only linear edges can be picked Μόνο γραμμικές ακμές μπορούν να επιλεχθούν - + Only faces and edges can be picked Μόνο επιφάνειες και ακμές μπορούν να επιλεχθούν @@ -2277,30 +2200,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2308,42 +2231,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Σφάλμα επιλογής - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - + Only faces can be picked Μόνο όψεις μπορούν να επιλεχθούν - + Only planar faces can be picked Μόνο επίπεδες επιφάνειες μπορούν να επιλεχθούν @@ -2351,28 +2274,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - + Only faces can be picked Μόνο όψεις μπορούν να επιλεχθούν @@ -2380,12 +2303,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Διάμετρος τροχαλίας - + Torque [Nm] Ροπή [Nm] @@ -2393,28 +2316,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - + Only faces can be picked Μόνο όψεις μπορούν να επιλεχθούν @@ -2422,22 +2345,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! @@ -2445,64 +2368,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Οι μετατοπισμένες όψεις έχουν αλλάξει. Προσθέστε μόνο τις μετατοπιζόμενες όψεις και αφαιρέστε τις μη μετατοπίσιμες όψεις! - - - - - - - - - - + + + + + + + + + + Selection error Σφάλμα επιλογής - - + + Nothing selected! Τίποτα δεν επιλέχθηκε! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Το επιλεγμένο αντικείμενο δεν είναι εξάρτημα! - + Only faces can be picked Μόνο όψεις μπορούν να επιλεχθούν - + Only cylindrical faces can be picked Μόνο κυλινδρικές όψεις μπορούν να επιλεχθούν @@ -2510,7 +2433,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName ΌνομαΑντικειμένουΕργασίας @@ -2518,7 +2441,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2526,7 +2449,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2534,12 +2457,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Μήκος @@ -2548,12 +2471,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2561,7 +2484,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Επιλογές εμφάνισης αποτελεσμάτων @@ -2569,7 +2492,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2577,7 +2500,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2585,7 +2508,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2609,12 +2532,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Αποτυχία πλεγματοποίησης - + The FEM module is built without NETGEN support. Meshing will not work!!! Η λειτουργική μονάδα FEM έχει δημιουργηθεί χωρίς υποστήριξη NETGEN. Η πλεγματοποίηση δεν θα λειτουργήσει!!! @@ -3586,46 +3509,45 @@ Note: for 2D only setting for x is possible, Πρέπει να δημιουργήσετε ή να ενεργοποιήσετε μια Ανάλυση - + Ok OK - + Cancel Ακύρωση - - - - - - - - + + + + + + + + A dialog is already open in the task panel A dialog is already open in the task panel - - - - - - - - + + + + + + + + Do you want to close this dialog? Do you want to close this dialog? - + Meshing Πλεγματοποίηση - @@ -3642,22 +3564,22 @@ Note: for 2D only setting for x is possible, Εισαγωγή-Εξαγωγή - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Περιορισμό τροχαλίας - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3697,62 +3619,62 @@ Note: for 2D only setting for x is possible, Ομάδες - + Are you sure you want to continue? Are you sure you want to continue? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Οριακή κατάσταση ρευστού - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4090,7 +4012,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Εξαρτήσεις αντικειμένου @@ -5370,20 +5292,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6098,13 +6020,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6150,17 +6072,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6168,17 +6090,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6186,7 +6108,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6280,17 +6202,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_es-AR.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_es-AR.ts index 3a862cf12f..d51fd22df9 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_es-AR.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_es-AR.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem FEM - + Bearing constraint Restricción de rodamiento - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem FEM - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem FEM - - Constraint displacement - Restricción de desplazamiento + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem FEM - - Constraint fixed - Restricción fija + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Crea una condición límite fija para una entidad geométrica @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem FEM - + Fluid boundary condition Condición límite del Fluido - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Crear una condición límite del fluido en la entidad de cara para Dinámica de Fluidos Computacional @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem FEM - - Constraint force - Restringir fuerza + + Force load + Force load - + Creates a force load applied to a geometric entity Crea una carga de fuerza aplicada a una entidad geométrica @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem FEM - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem FEM - + Heat flux load Carga de flujo calorífico - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem FEM - + Initial temperature Temperatura Inicial - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem FEM - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Crea una restricción plano de multipunto para una cara @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem FEM - - Constraint pressure - Restricción de presión + + Pressure load + Pressure load - + Creates a pressure load acting on a face Crea una carga de presión actuando sobre una cara @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem FEM - + Pulley constraint restricción de polea - + Creates a pulley constraint Crear una restriccíón de polea @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem FEM - + Spring Resorte - + Creates a spring acting on a face Crea un resorte que actúa sobre una cara @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem FEM - - Constraint temperature - Restricción de temperatura + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem FEM - - Constraint transform - Restricción de transformación + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem FEM - + Nodes set Conjunto de nodos - + Creates a FEM mesh nodes set Crea un conjunto de malla de nodos MEF - + Wrong selection Selección Incorrecta - + Select a single FEM mesh or nodes set, please. Seleccione una única malla MEF o conjunto de nodos, por favor. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem FEM - + Node set by poly Nodo establecido por polea - - + + Create node set by Poly Crear conjunto de nodos por Polígonos @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem FEM - + Apply changes to pipeline Aplicar cambios a tubería - + Apply changes to parameters directly and not on recompute only... Aplicar cambios a los parámetros directamente y no sólo en el recálculo... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem FEM - + Region clip filter Filtro de región de recorte - + Define/create a clip filter which uses functions to define the clipped region Definir/crear un filtro de recorte que utiliza funciones para definir la región recortada - + Wrong selection Selección Incorrecta - + Select a pipeline, please. Seleccionar una tubería, por favor. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem FEM - + Function cut filter Filtro de corte de función - + Cut the data along an implicit function Cortar los datos a lo largo de una función implícita @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem FEM - + Line clip filter Filtro de recorte de línea - + Define/create a clip filter which clips a field along a line Definir/crear un filtro de recorte que recorta un campo a lo largo de una línea @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem FEM - + Data at point clip filter Filtro de datos en el clip de punto - + Define/create a clip filter which clips a field data at point Definir/crear un filtro de clip que recorte un campo de datos en el punto @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem FEM - + Filter functions Funciones de filtro - + Functions for use in postprocessing filter... Funciones para uso en el filtro de postprocesamiento... - + Plane Plano - + Sphere Esfera - + Cylinder Cilindro - + Box Caja @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Espesor [mm] - + Stress [MPa] Plot Y-Axis Label Esfuerzo [MPa] - + Linearized Stresses Plot title Esfuerzos linealizados - + Membrane Plot legend item label Membrana - + Membrane and Bending Plot legend item label Membrana y flexión - + Total Plot legend item label Total - - - Fem - FEM - - - - Stress linearization plot - Gráfica de linearización de esfuerzo - - - - Define/create stress linearization plots - Definir/crear gráficas de linearización de esfuerzo - - - - - Wrong selection - Selección Incorrecta - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Seleccione un filtro de clip que recorra un campo de ESFUERZO a lo largo de una línea, por favor. - - - - CmdFemPostPipelineFromResult - - - Fem - FEM - - - - Post pipeline from result - Publicar tubería del resultado - - - - Creates a post processing pipeline from a result object - Crea una tubería de post-procesamiento a partir de un objeto resultado - - - - Wrong selection type - Tipo de selección incorrecta - - - - Select a result object, please. - Seleccione un objeto de resultado, por favor. - - - - CmdFemPostScalarClipFilter - - - Fem - FEM - - - - Scalar clip filter - Filtro de clip escalar - - - - Define/create a clip filter which clips a field with a scalar value - Definir/crear un filtro de clip que recorte un campo con un valor escalar - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Gráfica de linearización de esfuerzo + + + + Define/create stress linearization plots + Definir/crear gráficas de linearización de esfuerzo + + + + + Wrong selection + Selección Incorrecta + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Seleccione un filtro de clip que recorra un campo de ESFUERZO a lo largo de una línea, por favor. + + + + CmdFemPostPipelineFromResult + + + Fem + FEM + + + + Post pipeline from result + Publicar tubería del resultado + + + + Creates a post processing pipeline from a result object + Crea una tubería de post-procesamiento a partir de un objeto resultado + + + + Wrong selection type + Tipo de selección incorrecta + + + + Select a result object, please. + Seleccione un objeto de resultado, por favor. + + + + CmdFemPostScalarClipFilter + + + Fem + FEM + + + + Scalar clip filter + Filtro de clip escalar + + + + Define/create a clip filter which clips a field with a scalar value + Definir/crear un filtro de clip que recorte un campo con un valor escalar + + + + CmdFemPostWarpVectorFilter + + + Fem + FEM + + + Warp filter Filtro de deformación - + Warp the geometry along a vector field by a certain factor Deformar la geometría a lo largo de un campo vectorial por un factor determinado @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Crear condición límite de fluido - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Colocar robot - + Edit nodes set Editar conjunto de nodos - + Create nodes set Crear conjunto de nodos - + Create filter Crear filtro - + Create function Crear función - + Create pipeline from result Crear tubería desde resultado - + Edit Mirror Editar Reflejo en Espejo @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Crear un plano de función, definida por su origen y normal - + Create a sphere function, defined by its center and radius Crear una función de esfera, definida por su centro y radio - + Create a cylinder function, defined by its center, axis and radius Crear una función de cilindro, definida por su centro, eje y radio - + Create a box function, defined by its center, length, width and height Crear una función de caja, definida por su centro, longitud, anchura y altura @@ -1016,20 +1016,20 @@ Límite de baja frecuencia - + File does not exist El archivo no existe - + The specified executable '%1' does not exist! Specify another file please. - El ejecutable especificado + The specified executable '%1' - no existe! -Por favor, especifique otro archivo. + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ se fusionarán para que los límites de volumen sean invisibles. <html><head/><body><p><span style=" font-weight:600;">Nota:</span> Se recomienda usar un número par de núcleos para beneficiarse de las simetrías de la malla. (Usar 8 núcleos puede ser más rápido que 9 núcleos.<br/><span style=" font-weight:600;">Nota también:</span> En casos extremos, ElmerSolver podría no converger si el número central es demasiado alto.</p></body></html> - + File does not exist El archivo no existe - + The specified executable '%1' does not exist! Specify another file please. - El ejecutable especificado + The specified executable '%1' - no existe! -Por favor, especifique otro archivo. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: No apto para hilos múltiples - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Configuración de Elmer incorrecta: Utiliza más de un núcleo de CPU. Por lo tanto se requiere un ejecutable con el sufijo '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Configuración de Elmer incorrecta: Utiliza más de un núcleo de CPU. @@ -1250,7 +1250,7 @@ the constraint or material is applied. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + Permitir que la apliación administre (cree, elimine) el directorio funcionando para todos los solucionadores. Usar directorios temporales. @@ -1384,20 +1384,20 @@ añadir un contenedor de análisis Dejar en blanco para usar el archivo binario por defecto de gmsh - + File does not exist El archivo no existe - + The specified executable '%1' does not exist! Specify another file please. - El ejecutable especificado + The specified executable '%1' - no existe! -Por favor, especifique otro archivo. + does not exist! +Specify another file please. @@ -1461,83 +1461,6 @@ exportados desde FreeCAD. Objeto resultado de FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Recursos de la tarjeta - - - - The cards built-in to FreeCAD will be listed as available. - Las tarjetas incorporadas a FreeCAD se mostrarán como disponibles. - - - - Use built-in materials - Use materiales incorporados - - - - Also cards from FreeCAD's preferences directory will be listed as available. - También las tarjetas del directorio de preferencias de FreeCAD se mostrarán como disponibles. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Utilizar materiales del directorio de materiales en el directorio de preferencias de FreeCAD del usuario - - - - Also material cards also from the specified directory -will be listed as available. - También tarjetas de materiales del directorio especificado -aparecerán como disponibles. - - - - Use materials from user defined directory - Usar materiales del directorio definido por el usuario - - - - User directory - Directorio de usuario - - - - Card sorting and duplicates - Clasificación de tarjetas y duplicados - - - - Duplicate cards will be deleted from the displayed material card list. - Las tarjetas duplicadas se eliminarán de la lista de tarjetas de materiales mostradas. - - - - Delete card duplicates - Eliminar duplicados de tarjeta - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Las cartas de material aparecen ordenadas por sus recursos (ubicaciones). -Si no están marcadas, serán ordenadas por su nombre. - - - - Sort by resources - Ordenar por recursos - - FemGui::DlgSettingsFemMystranImp @@ -1576,20 +1499,20 @@ Si no están marcadas, serán ordenadas por su nombre. Escribir comentarios en el archivo de entrada - + File does not exist El archivo no existe - + The specified executable '%1' does not exist! Specify another file please. - El ejecutable especificado + The specified executable '%1' - no existe! -Por favor, especifique otro archivo. + does not exist! +Specify another file please. @@ -1688,34 +1611,34 @@ solver iterativo y reciba el mensaje de error de que "MAXKOI" necesita ser aumentado. - + File does not exist El archivo no existe - + The specified z88r executable '%1' does not exist! Specify another file please. - El ejecutable z88r especificado + The specified z88r executable '%1' - no existe! -Especifique otro archivo, por favor. + does not exist! +Specify another file please. - - + + Wrong file Archivo incorrecto - + You must specify the path to the z88r.exe! ¡Debe especificar la ruta a z88r.exe! - + You must specify the path to the z88r! ¡Debe especificar la ruta a z88r! @@ -1739,13 +1662,13 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraint - - + + Input error Error de entrada - + You must specify at least one reference Debe especificar al menos una referencia @@ -1753,7 +1676,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintBearing - + Input error Error de entrada @@ -1761,7 +1684,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintContact - + Input error Error de entrada @@ -1769,7 +1692,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintDisplacement - + Input error Error de entrada @@ -1777,7 +1700,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Error de entrada @@ -1785,13 +1708,13 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintForce - - + + Input error Error de entrada - + Please specify a force greater than 0 Por favor especifique una fuerza mayor que 0 @@ -1799,7 +1722,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintGear - + Input error Error de entrada @@ -1807,7 +1730,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintHeatflux - + Input error Error de entrada @@ -1815,8 +1738,8 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Error de entrada @@ -1824,7 +1747,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintPressure - + Input error Error de entrada @@ -1832,7 +1755,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintPulley - + Input error Error de entrada @@ -1840,7 +1763,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintSpring - + Input error Error de entrada @@ -1848,7 +1771,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintTemperature - + Input error Error de entrada @@ -1856,7 +1779,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintTransform - + Input error Error de entrada @@ -1864,12 +1787,12 @@ Especifique otro archivo, por favor. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Editar malla MEF - + Meshing failure Falla de mallado @@ -1877,7 +1800,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgPost - + Input error Error de entrada @@ -1893,12 +1816,12 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Eliminar @@ -1906,42 +1829,42 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Error de selección - + Please use only a single reference for bearing constraint Por favor, utilice sólo una referencia para la restricción de rodamiento - + Only faces can be picked Sólo se pueden seleccionar caras - + Only cylindrical faces can be picked Sólo se pueden elegir caras cilíndricas - + Only planar faces can be picked Solo se pueden seleccionar caras planas - + Only linear edges can be picked Sólo se pueden seleccionar aristas lineales - + Only faces and edges can be picked Sólo se pueden seleccionar caras y aristas @@ -1950,77 +1873,77 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintContact - + Delete Eliminar - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Error de selección - + Only one face in object! - moved to master face ¡Solo una cara en el objeto! - movida a la cara maestra - - + + Only one master face and one slave face for a contact constraint! ¡Solo una cara maestra y una cara esclavizada para una restricción de contacto! - - - - + + + + Nothing selected! ¡Nada seleccionado! - + Only one slave face for a contact constraint! ¡Solo una cara esclavizada para una restricción de contacto! - - - - + + + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - - + + Only faces can be picked Sólo se pueden seleccionar caras - + Only one master for a contact constraint! ¡Solo un maestro por una restricción de contacto! - + Only one master face for a contact constraint! ¡Solo una cara maestra para restricción de contacto! @@ -2028,28 +1951,28 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2057,28 +1980,28 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2086,128 +2009,128 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintFluidBoundary - + Basic Básico - + Turbulence Turbulencia - + Thermal Térmico - + select boundary type, faces and set value seleccione tipo de límite, cara y conjunto de valores - + Intensity [0~1] Intensidad [0~1] - + Dissipation Rate [m2/s3] Relación de disipación [m2/s3] - + Length Scale[m] Escala de longitud [m] - + Viscosity Ratio [1] Relación de viscosidad [1] - + Hydraulic Diameter [m] Diámetro Hidráulico [m] - - + + Gradient [K/m] Gradiente [K/m] - + Flux [W/m2] Flujo [W/m2] - + Empty selection Selección vacía - + Select an edge or a face, please. Seleccione una arista o una cara, por favor. - - - - - + + + + + Wrong selection Selección Incorrecta - + Selected object is not a part object! ¡El objeto seleccionado no es una parte de objeto! - + Only one planar face or edge can be selected! ¡Solo la cara planar o arista puede ser seleccionada! - + Only planar faces can be picked for 3D Solo las caras planares pueden ser escogidas para 3D - + Only planar edges can be picked for 2D Solo aristas planares pueden ser escogidos para 2D - + Only faces for 3D part or edges for 2D can be picked Solo caras para partes 3D o aristas para 2D pueden ser tomados - - + - - + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2215,39 +2138,39 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Selección Incorrecta - + Select an edge or a face, please. Seleccione una arista o una cara, por favor. @@ -2255,24 +2178,24 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintGear - - - + + + Selection error Error de selección - + Only planar faces can be picked Solo se pueden seleccionar caras planas - + Only linear edges can be picked Sólo se pueden seleccionar aristas lineales - + Only faces and edges can be picked Sólo se pueden seleccionar caras y aristas @@ -2280,30 +2203,30 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - - + + Selection must only consist of faces! ¡La selección solo debe consistir en caras! @@ -2311,42 +2234,42 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Error de selección - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only faces can be picked Sólo se pueden seleccionar caras - + Only planar faces can be picked Solo se pueden seleccionar caras planas @@ -2354,28 +2277,28 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only faces can be picked Sólo se pueden seleccionar caras @@ -2383,12 +2306,12 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintPulley - + Pulley diameter Diámetro de polea - + Torque [Nm] Torque [Nm] @@ -2396,28 +2319,28 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only faces can be picked Sólo se pueden seleccionar caras @@ -2425,22 +2348,22 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! @@ -2448,64 +2371,64 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Las caras transformables han cambiado. ¡Por favor, añada solo las caras transformables y elimine las caras no transformables! - - - - - - - - - - + + + + + + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only faces can be picked Sólo se pueden seleccionar caras - + Only cylindrical faces can be picked Sólo se pueden elegir caras cilíndricas @@ -2513,7 +2436,7 @@ Especifique otro archivo, por favor. FemGui::TaskObjectName - + TaskObjectName NombreObjetoTarea @@ -2521,7 +2444,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostClip - + Clip region, choose implicit function Región de recorte, elija función implícita @@ -2529,7 +2452,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostCut - + Function cut, choose implicit function Función cortada, elegir función implícita @@ -2537,12 +2460,12 @@ Especifique otro archivo, por favor. FemGui::TaskPostDataAlongLine - + Data along a line options Opciones de datos a lo largo de una línea - + Length X-Axis plot label Longitud @@ -2551,12 +2474,12 @@ Especifique otro archivo, por favor. FemGui::TaskPostDataAtPoint - + Data at point options Opciones de datos de punto - + %1 at (%2; %3; %4) is: %5 %6 %1 en (%2; %3; %4) es: %5 %6 @@ -2564,7 +2487,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostDisplay - + Result display options Opciones de despliegue de resultados @@ -2572,7 +2495,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostFunction - + Implicit function Función implícita @@ -2580,7 +2503,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostScalarClip - + Scalar clip options Opciones de clip escalar @@ -2588,7 +2511,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostWarpVector - + Warp options Opciones de deformación @@ -2612,12 +2535,12 @@ Especifique otro archivo, por favor. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Falla de mallado - + The FEM module is built without NETGEN support. Meshing will not work!!! El módulo MEF está compilado sin soporte NETGEN. ¡¡¡¡El mallado no funcionará!!! @@ -3589,46 +3512,45 @@ Nota: para 2D solo la configuración para x es posible, Necesita crear o activar un análisis - + Ok Aceptar - + Cancel Cancelar - - - - - - - - + + + + + + + + A dialog is already open in the task panel Un diálogo ya está abierto en el panel de tareas - - - - - - - - + + + + + + + + Do you want to close this dialog? ¿Desea cerrar este diálogo? - + Meshing Mallado - @@ -3645,22 +3567,22 @@ Nota: para 2D solo la configuración para x es posible, Importar-Exportar - + Constraint initial temperature Restricción de temperatura inicial - + Constraint pulley Restricción de polea - + Constraint spring Restricción de resorte - + Edit post processing object Editar objeto de post-procesamiento @@ -3700,62 +3622,62 @@ Nota: para 2D solo la configuración para x es posible, Grupos - + Are you sure you want to continue? ¿Estás seguro/a de que quieres continuar? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Condición límite del Fluido - + Force load Force load - + Heat flux load Carga de flujo calorífico - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4093,7 +4015,7 @@ Para posibles variables, vea el cuadro de descripción a continuación. Std_Delete - + Object dependencies Dependencias del objeto @@ -5373,20 +5295,20 @@ usada por el solver Elmer setupFilter - + Error: A filter can only be applied to a single object. Error: Un filtro sólo se puede aplicar a un solo objeto. - - - + + + The filter could not be set up. No se pudo configurar el filtro. - - + + Error: no post processing object selected. Error: no se ha seleccionado ningún objeto de post-procesamiento. @@ -6101,13 +6023,13 @@ para fuerzas magnetodinámicas 2D CmdFemCompEmConstraints - + Fem FEM - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6153,17 +6075,17 @@ fuerzas magnetodinámicas CmdFemCompEmEquations - + Fem FEM - + Electromagnetic equations Ecuaciones electromagnéticas - + Electromagnetic equations for the Elmer solver Ecuaciones electromagnéticas para el solucionador Elmer @@ -6171,17 +6093,17 @@ fuerzas magnetodinámicas CmdFemPostContoursFilter - + Fem FEM - + Contours filter Filtro de contornos - + Define/create a contours filter which displays iso contours Definir/crear un filtro de contornos que muestre los contornos iso @@ -6189,7 +6111,7 @@ fuerzas magnetodinámicas FemGui::TaskPostContours - + Contours filter options Opciones de filtro de contornos @@ -6283,17 +6205,17 @@ deformación (elasticidad no lineal) CmdFemCompMechEquations - + Fem FEM - + Mechanical equations Ecuaciones mecánicas - + Mechanical equations for the Elmer solver Ecuaciones mecánicas para el solucionador Elmer diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_es-ES.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_es-ES.ts index ee7f74ee6d..b52410bdff 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_es-ES.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_es-ES.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem FEM - + Bearing constraint Restricción de rodamiento - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem FEM - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem FEM - - Constraint displacement - Restricción de desplazamiento + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem FEM - - Constraint fixed - Restricción fija + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Crea una condición límite fija para una entidad geométrica @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem FEM - + Fluid boundary condition Condición límite del Fluido - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Crear una condición límite del fluido en la entidad de cara para Dinámica de Fluidos Computacional @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem FEM - - Constraint force - Restringir fuerza + + Force load + Force load - + Creates a force load applied to a geometric entity Crea una carga de fuerza aplicada a una entidad geométrica @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem FEM - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem FEM - + Heat flux load Carga de flujo calorífico - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem FEM - + Initial temperature Temperatura Inicial - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem FEM - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Crea una restricción plano de multipunto para una cara @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem FEM - - Constraint pressure - Restricción de presión + + Pressure load + Pressure load - + Creates a pressure load acting on a face Crea una carga de presión actuando sobre una cara @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem FEM - + Pulley constraint restricción de polea - + Creates a pulley constraint Crear una restriccíón de polea @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem FEM - + Spring Resorte - + Creates a spring acting on a face Crea un resorte que actúa sobre una cara @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem FEM - - Constraint temperature - Restricción de temperatura + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem FEM - - Constraint transform - Restricción de transformación + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem FEM - + Nodes set Conjunto de nodos - + Creates a FEM mesh nodes set Crea un conjunto de malla de nodos MEF - + Wrong selection Selección incorrecta - + Select a single FEM mesh or nodes set, please. Seleccione una única malla FEM o conjunto de nodos, por favor. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem FEM - + Node set by poly Nodo establecido por polea - - + + Create node set by Poly Crear conjunto de nodos por Polígonos @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem FEM - + Apply changes to pipeline Aplicar cambios a tubería - + Apply changes to parameters directly and not on recompute only... Aplicar cambios a los parámetros directamente y no sólo en el recálculo... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem FEM - + Region clip filter Filtro de región de recorte - + Define/create a clip filter which uses functions to define the clipped region Definir/crear un filtro de recorte que utiliza funciones para definir la región recortada - + Wrong selection Selección incorrecta - + Select a pipeline, please. Seleccionar una tubería, por favor. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem FEM - + Function cut filter Filtro de corte de función - + Cut the data along an implicit function Cortar los datos a lo largo de una función implícita @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem FEM - + Line clip filter Filtro de recorte de línea - + Define/create a clip filter which clips a field along a line Definir/crear un filtro de recorte que recorta un campo a lo largo de una línea @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem FEM - + Data at point clip filter Filtro de datos en el clip de punto - + Define/create a clip filter which clips a field data at point Definir/crear un filtro de clip que recorte un campo de datos en el punto @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem FEM - + Filter functions Funciones de filtro - + Functions for use in postprocessing filter... Funciones para uso en el filtro de postprocesamiento... - + Plane Plano - + Sphere Esfera - + Cylinder Cilindro - + Box Caja @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Espesor [mm] - + Stress [MPa] Plot Y-Axis Label Esfuerzo [MPa] - + Linearized Stresses Plot title Esfuerzos linealizados - + Membrane Plot legend item label Membrana - + Membrane and Bending Plot legend item label Membrana y flexión - + Total Plot legend item label Total - - - Fem - FEM - - - - Stress linearization plot - Gráfica de linearización de esfuerzo - - - - Define/create stress linearization plots - Definir/crear gráficas de linearización de esfuerzo - - - - - Wrong selection - Selección incorrecta - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Seleccione un filtro de clip que recorra un campo de ESFUERZO a lo largo de una línea, por favor. - - - - CmdFemPostPipelineFromResult - - - Fem - FEM - - - - Post pipeline from result - Publicar tubería del resultado - - - - Creates a post processing pipeline from a result object - Crea una tubería de post-procesamiento a partir de un objeto resultado - - - - Wrong selection type - Tipo de selección incorrecta - - - - Select a result object, please. - Seleccione un objeto de resultado, por favor. - - - - CmdFemPostScalarClipFilter - - - Fem - FEM - - - - Scalar clip filter - Filtro de clip escalar - - - - Define/create a clip filter which clips a field with a scalar value - Definir/crear un filtro de clip que recorte un campo con un valor escalar - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Gráfica de linearización de esfuerzo + + + + Define/create stress linearization plots + Definir/crear gráficas de linearización de esfuerzo + + + + + Wrong selection + Selección incorrecta + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Seleccione un filtro de clip que recorra un campo de ESFUERZO a lo largo de una línea, por favor. + + + + CmdFemPostPipelineFromResult + + + Fem + FEM + + + + Post pipeline from result + Publicar tubería del resultado + + + + Creates a post processing pipeline from a result object + Crea una tubería de post-procesamiento a partir de un objeto resultado + + + + Wrong selection type + Tipo de selección incorrecta + + + + Select a result object, please. + Seleccione un objeto de resultado, por favor. + + + + CmdFemPostScalarClipFilter + + + Fem + FEM + + + + Scalar clip filter + Filtro de clip escalar + + + + Define/create a clip filter which clips a field with a scalar value + Definir/crear un filtro de clip que recorte un campo con un valor escalar + + + + CmdFemPostWarpVectorFilter + + + Fem + FEM + + + Warp filter Filtro de deformación - + Warp the geometry along a vector field by a certain factor Deformar la geometría a lo largo de un campo vectorial por un factor determinado @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Crear condición límite de fluido - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Colocar robot - + Edit nodes set Editar conjunto de nodos - + Create nodes set Crear conjunto de nodos - + Create filter Crear filtro - + Create function Crear función - + Create pipeline from result Crear tubería desde resultado - + Edit Mirror Editar Reflejo en Espejo @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Crear un plano de función, definida por su origen y normal - + Create a sphere function, defined by its center and radius Crear una función de esfera, definida por su centro y radio - + Create a cylinder function, defined by its center, axis and radius Crear una función de cilindro, definida por su centro, eje y radio - + Create a box function, defined by its center, length, width and height Crear una función de caja, definida por su centro, longitud, anchura y altura @@ -1016,20 +1016,20 @@ Límite de baja frecuencia - + File does not exist El archivo no existe - + The specified executable '%1' does not exist! Specify another file please. - El ejecutable especificado + The specified executable '%1' - no existe! -Por favor, especifique otro archivo. + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ se fusionarán para que los límites de volumen sean invisibles. <html><head/><body><p><span style=" font-weight:600;">Nota:</span> Se recomienda usar un número par de núcleos para beneficiarse de las simetrías de la malla. (Usar 8 núcleos puede ser más rápido que 9 núcleos.<br/><span style=" font-weight:600;">Nota también:</span> En casos extremos, ElmerSolver podría no converger si el número central es demasiado alto.</p></body></html> - + File does not exist El archivo no existe - + The specified executable '%1' does not exist! Specify another file please. - El ejecutable especificado + The specified executable '%1' - no existe! -Por favor, especifique otro archivo. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: No apto para hilos múltiples - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Configuración de Elmer incorrecta: Utiliza más de un núcleo de CPU. Por lo tanto se requiere un ejecutable con el sufijo '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Configuración de Elmer incorrecta: Utiliza más de un núcleo de CPU. @@ -1250,7 +1250,7 @@ the constraint or material is applied. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + Permitir que la apliación administre (cree, elimine) el directorio funcionando para todos los solucionadores. Usar directorios temporales. @@ -1384,20 +1384,20 @@ añadir un contenedor de análisis Dejar en blanco para usar el archivo binario por defecto de gmsh - + File does not exist El archivo no existe - + The specified executable '%1' does not exist! Specify another file please. - El ejecutable especificado + The specified executable '%1' - no existe! -Por favor, especifique otro archivo. + does not exist! +Specify another file please. @@ -1461,83 +1461,6 @@ exportados desde FreeCAD. Objeto resultado de FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Recursos de la tarjeta - - - - The cards built-in to FreeCAD will be listed as available. - Las tarjetas incorporadas a FreeCAD se mostrarán como disponibles. - - - - Use built-in materials - Utilice materiales incorporados - - - - Also cards from FreeCAD's preferences directory will be listed as available. - También las tarjetas del directorio de preferencias de FreeCAD se mostrarán como disponibles. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Utilizar materiales del directorio de materiales en el directorio de preferencias de FreeCAD del usuario - - - - Also material cards also from the specified directory -will be listed as available. - También tarjetas de materiales del directorio especificado -aparecerán como disponibles. - - - - Use materials from user defined directory - Utilizar materiales de directorio definido por el usuario - - - - User directory - Directorio de usuario - - - - Card sorting and duplicates - Clasificación de tarjetas y duplicados - - - - Duplicate cards will be deleted from the displayed material card list. - Las tarjetas duplicadas se eliminarán de la lista de tarjetas de materiales mostradas. - - - - Delete card duplicates - Eliminar duplicados de tarjeta - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Las cartas de material aparecen ordenadas por sus recursos (ubicaciones). -Si no están marcadas, serán ordenadas por su nombre. - - - - Sort by resources - Ordenar por recursos - - FemGui::DlgSettingsFemMystranImp @@ -1576,20 +1499,20 @@ Si no están marcadas, serán ordenadas por su nombre. Escribir comentarios en el archivo de entrada - + File does not exist El archivo no existe - + The specified executable '%1' does not exist! Specify another file please. - El ejecutable especificado + The specified executable '%1' - no existe! -Por favor, especifique otro archivo. + does not exist! +Specify another file please. @@ -1688,34 +1611,34 @@ solver iterativo y reciba el mensaje de error de que "MAXKOI" necesita ser aumentado. - + File does not exist El archivo no existe - + The specified z88r executable '%1' does not exist! Specify another file please. - El ejecutable z88r especificado + The specified z88r executable '%1' - no existe! -Especifique otro archivo, por favor. + does not exist! +Specify another file please. - - + + Wrong file Archivo incorrecto - + You must specify the path to the z88r.exe! ¡Debe especificar la ruta a z88r.exe! - + You must specify the path to the z88r! ¡Debe especificar la ruta a z88r! @@ -1739,13 +1662,13 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraint - - + + Input error Error de entrada - + You must specify at least one reference Debe especificar al menos una referencia @@ -1753,7 +1676,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintBearing - + Input error Error de entrada @@ -1761,7 +1684,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintContact - + Input error Error de entrada @@ -1769,7 +1692,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintDisplacement - + Input error Error de entrada @@ -1777,7 +1700,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Error de entrada @@ -1785,13 +1708,13 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintForce - - + + Input error Error de entrada - + Please specify a force greater than 0 Por favor especifique una fuerza mas grande que 0 @@ -1799,7 +1722,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintGear - + Input error Error de entrada @@ -1807,7 +1730,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintHeatflux - + Input error Error de entrada @@ -1815,8 +1738,8 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Error de entrada @@ -1824,7 +1747,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintPressure - + Input error Error de entrada @@ -1832,7 +1755,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintPulley - + Input error Error de entrada @@ -1840,7 +1763,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintSpring - + Input error Error de entrada @@ -1848,7 +1771,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintTemperature - + Input error Error de entrada @@ -1856,7 +1779,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgFemConstraintTransform - + Input error Error de entrada @@ -1864,12 +1787,12 @@ Especifique otro archivo, por favor. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Editar malla FEM - + Meshing failure Falla de mallado @@ -1877,7 +1800,7 @@ Especifique otro archivo, por favor. FemGui::TaskDlgPost - + Input error Error de entrada @@ -1893,12 +1816,12 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Borrar @@ -1906,42 +1829,42 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Error de selección - + Please use only a single reference for bearing constraint Por favor use solamente una referencia para restricción de rodamiento - + Only faces can be picked Se pueden seleccionar caras únicamente - + Only cylindrical faces can be picked Se pueden seleccionar únicamente caras cilíndricas - + Only planar faces can be picked Se pueden seleccionar únicamente caras planas - + Only linear edges can be picked Se pueden seleccionar únicamente aristas rectas - + Only faces and edges can be picked Se pueden seleccionar caras y aristas únicamente @@ -1950,77 +1873,77 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintContact - + Delete Borrar - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Error de selección - + Only one face in object! - moved to master face ¡Solo una cara en el objeto! - movida a la cara maestra - - + + Only one master face and one slave face for a contact constraint! ¡Solo una cara maestra y una cara esclavizada para una restricción de contacto! - - - - + + + + Nothing selected! ¡Nada seleccionado! - + Only one slave face for a contact constraint! ¡Solo una cara esclavizada para una restricción de contacto! - - - - + + + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - - + + Only faces can be picked Se pueden seleccionar caras únicamente - + Only one master for a contact constraint! ¡Solo un maestro por una restricción de contacto! - + Only one master face for a contact constraint! ¡Solo una cara maestra para restricción de contacto! @@ -2028,28 +1951,28 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2057,28 +1980,28 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2086,128 +2009,128 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintFluidBoundary - + Basic Básico - + Turbulence Turbulencia - + Thermal Térmico - + select boundary type, faces and set value seleccione tipo de límite, cara y conjunto de valores - + Intensity [0~1] Intensidad [0~1] - + Dissipation Rate [m2/s3] Relación de disipación [m2/s3] - + Length Scale[m] Escala de longitud [m] - + Viscosity Ratio [1] Relación de viscosidad [1] - + Hydraulic Diameter [m] Diámetro Hidráulico [m] - - + + Gradient [K/m] Gradiente [K/m] - + Flux [W/m2] Flujo [W/m2] - + Empty selection Selección vacía - + Select an edge or a face, please. Seleccione una arista o una cara, por favor. - - - - - + + + + + Wrong selection Selección incorrecta - + Selected object is not a part object! ¡El objeto seleccionado no es una parte de objeto! - + Only one planar face or edge can be selected! ¡Solo la cara planar o arista puede ser seleccionada! - + Only planar faces can be picked for 3D Solo las caras planares pueden ser escogidas para 3D - + Only planar edges can be picked for 2D Solo aristas planares pueden ser escogidos para 2D - + Only faces for 3D part or edges for 2D can be picked Solo caras para partes 3D o aristas para 2D pueden ser tomados - - + - - + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2215,39 +2138,39 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Selección incorrecta - + Select an edge or a face, please. Seleccione una arista o una cara, por favor. @@ -2255,24 +2178,24 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintGear - - - + + + Selection error Error de selección - + Only planar faces can be picked Se pueden seleccionar únicamente caras planas - + Only linear edges can be picked Se pueden seleccionar únicamente aristas rectas - + Only faces and edges can be picked Se pueden seleccionar caras y aristas únicamente @@ -2280,30 +2203,30 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - - + + Selection must only consist of faces! ¡La selección solo debe consistir en caras! @@ -2311,42 +2234,42 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Error de selección - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only faces can be picked Se pueden seleccionar caras únicamente - + Only planar faces can be picked Se pueden seleccionar únicamente caras planas @@ -2354,28 +2277,28 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only faces can be picked Se pueden seleccionar caras únicamente @@ -2383,12 +2306,12 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintPulley - + Pulley diameter Diámetro de la polea - + Torque [Nm] Par torsor [Nm] @@ -2396,28 +2319,28 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only faces can be picked Se pueden seleccionar caras únicamente @@ -2425,22 +2348,22 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! @@ -2448,64 +2371,64 @@ Especifique otro archivo, por favor. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Las caras transformables han cambiado. ¡Por favor, añada solo las caras transformables y elimine las caras no transformables! - - - - - - - - - - + + + + + + + + + + Selection error Error de selección - - + + Nothing selected! ¡Nada seleccionado! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! ¡El objeto seleccionado no es una pieza! - + Only faces can be picked Se pueden seleccionar caras únicamente - + Only cylindrical faces can be picked Se pueden seleccionar únicamente caras cilíndricas @@ -2513,7 +2436,7 @@ Especifique otro archivo, por favor. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2521,7 +2444,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostClip - + Clip region, choose implicit function Región de recorte, elija función implícita @@ -2529,7 +2452,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostCut - + Function cut, choose implicit function Función cortada, elegir función implícita @@ -2537,12 +2460,12 @@ Especifique otro archivo, por favor. FemGui::TaskPostDataAlongLine - + Data along a line options Opciones de datos a lo largo de una línea - + Length X-Axis plot label Longitud @@ -2551,12 +2474,12 @@ Especifique otro archivo, por favor. FemGui::TaskPostDataAtPoint - + Data at point options Opciones de datos de punto - + %1 at (%2; %3; %4) is: %5 %6 %1 en (%2; %3; %4) es: %5 %6 @@ -2564,7 +2487,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostDisplay - + Result display options Opciones de despliegue de resultados @@ -2572,7 +2495,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostFunction - + Implicit function Función implícita @@ -2580,7 +2503,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostScalarClip - + Scalar clip options Opciones de clip escalar @@ -2588,7 +2511,7 @@ Especifique otro archivo, por favor. FemGui::TaskPostWarpVector - + Warp options Opciones de deformación @@ -2612,12 +2535,12 @@ Especifique otro archivo, por favor. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Falla de mallado - + The FEM module is built without NETGEN support. Meshing will not work!!! El módulo FEM está construido sin el soporte NETGEN. ¡El mallado no funcionará! @@ -3589,46 +3512,45 @@ Nota: para 2D solo la configuración para x es posible, Tienes que crear o activar un análisis - + Ok Aceptar - + Cancel Cancelar - - - - - - - - + + + + + + + + A dialog is already open in the task panel Un diálogo ya está abierto en el panel de tareas - - - - - - - - + + + + + + + + Do you want to close this dialog? ¿Desea cerrar este diálogo? - + Meshing Mallado - @@ -3645,22 +3567,22 @@ Nota: para 2D solo la configuración para x es posible, Importar/Exportar - + Constraint initial temperature Restricción de temperatura inicial - + Constraint pulley Restricción de polea - + Constraint spring Restricción de resorte - + Edit post processing object Editar objeto de post-procesamiento @@ -3700,62 +3622,62 @@ Nota: para 2D solo la configuración para x es posible, Grupos - + Are you sure you want to continue? ¿Está seguro de que desea continuar? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Condición límite del Fluido - + Force load Force load - + Heat flux load Carga de flujo calorífico - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4093,7 +4015,7 @@ Para posibles variables, vea el cuadro de descripción a continuación. Std_Delete - + Object dependencies Dependencias del objeto @@ -5373,20 +5295,20 @@ usada por el solver Elmer setupFilter - + Error: A filter can only be applied to a single object. Error: Un filtro sólo se puede aplicar a un solo objeto. - - - + + + The filter could not be set up. No se pudo configurar el filtro. - - + + Error: no post processing object selected. Error: no se ha seleccionado ningún objeto de post-procesamiento. @@ -6101,13 +6023,13 @@ para fuerzas magnetodinámicas 2D CmdFemCompEmConstraints - + Fem FEM - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6153,17 +6075,17 @@ fuerzas magnetodinámicas CmdFemCompEmEquations - + Fem FEM - + Electromagnetic equations Ecuaciones electromagnéticas - + Electromagnetic equations for the Elmer solver Ecuaciones electromagnéticas para el solucionador Elmer @@ -6171,17 +6093,17 @@ fuerzas magnetodinámicas CmdFemPostContoursFilter - + Fem FEM - + Contours filter Filtro de contornos - + Define/create a contours filter which displays iso contours Definir/crear un filtro de contornos que muestre los contornos iso @@ -6189,7 +6111,7 @@ fuerzas magnetodinámicas FemGui::TaskPostContours - + Contours filter options Opciones de filtro de contornos @@ -6283,17 +6205,17 @@ deformación (elasticidad no lineal) CmdFemCompMechEquations - + Fem FEM - + Mechanical equations Ecuaciones mecánicas - + Mechanical equations for the Elmer solver Ecuaciones mecánicas para el solucionador Elmer diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_eu.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_eu.ts index 0bcf01dc7f..f66a630b6e 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_eu.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_eu.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Kojinete-murrizketa - + Creates a bearing constraint Kojinete-murrizketa sortzen du @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Kontaktu-murrizketa - + Creates a contact constraint between faces Aurpegien arteko kontaktu-murrizketa sortzen du @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Murriztu desplazamendua + + Displacement boundary condition + Desplazamenduaren muga-baldintza - + Creates a displacement boundary condition for a geometric entity Desplazamenduaren muga-baldintza bat sortzen du entitate geometriko baterako @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Murriztu finkoa + + Fixed boundary condition + Muga finkoaren baldintza - + Creates a fixed boundary condition for a geometric entity Muga finkoaren baldintza bat sortzen du entitate geometriko baterako @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Jariakinen muga-baldintza - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Sortu jariakinen muga-baldintza aurpegi-entitatean, Ordenagailu bidezko Jariakinen Dinamikarako @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Murrizketa-indarra + + Force load + Indar-karga - + Creates a force load applied to a geometric entity Entitate geometriko bati aplikatutako indar-karga bat sortzen du @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Engranaje-murrizketa - + Creates a gear constraint Engranaje-murrizketa sortzen du @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Bero-fluxuaren karga - + Creates a heat flux load acting on a face Aurpegi batean eragiten duen bero-fluxuaren karga bat sortzen du @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Hasierako tenperatura - + Creates an initial temperature acting on a body Hasierako tenperatura bat sortzen du gorputz baterako @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Planoaren puntu anitzeko murrizketa - + Creates a plane multi-point constraint for a face Planoaren puntu anitzeko murrizketa bat sortzen du aurpegi baterako @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Murriztu presioa + + Pressure load + Presio-karga - + Creates a pressure load acting on a face Aurpegi batean eragiten duen presio-karga bat sortzen du @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Polea-murrizketa - + Creates a pulley constraint Polea-murrizketa sortzen du @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Malgukia - + Creates a spring acting on a face Aurpegi batean eragiten duen malguki bat sortzen du @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Murriztu tenperatura + + Temperature boundary condition + Tenperaturaren muga-baldintza - + Creates a temperature/concentrated heat flux load acting on a face Aurpegi batean eragiten duen tenperaturaren/bero-fluxu kontzentratuaren karga bat sortzen du @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Murriztu transformazioa + + Local coordinate system + Koordenatuen sistema lokala - + Create a local coordinate system on a face Sortu koordenatuen sistema lokala aurpegi batean @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Nodoen multzoa - + Creates a FEM mesh nodes set FEM amaraun-nodoen multzo bat sortzen du - + Wrong selection Hautapen okerra - + Select a single FEM mesh or nodes set, please. Hautatu FEM amaraun bakar bat edo nodoen multzo bat. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Poligonoaren arabera ezarritako nodoa - - + + Create node set by Poly Sortu nodo multzoa poligono baten arabera @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Aplikatu aldaketak kanalizazioari - + Apply changes to parameters directly and not on recompute only... Aplikatu parametroak aldaketak zuzenean eta ez birkalkulatzean soilik... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Eskualde-ebaketako iragazkia - + Define/create a clip filter which uses functions to define the clipped region Definitu/sortu eskualde ebaki bat definitzeko funtzioak erabiltzen dituen ebaketa-iragazki bat - + Wrong selection Hautapen okerra - + Select a pipeline, please. Hautatu kanalizazio bat, mesedez. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Eskualde-mozketako iragazkia - + Cut the data along an implicit function Moztu datuak funtzio inplizitu baten luzeran @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Lerro-ebaketako iragazkia - + Define/create a clip filter which clips a field along a line Definitu/sortu eremu bat lerro batean zehar ebakitzen duen ebaketa-iragazki bat @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Datuak puntuan ebakitzeko iragazkia - + Define/create a clip filter which clips a field data at point Definitu/sortu eremu bateko datuak puntu baten ebakitzen duen ebaketa-iragazki bat @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Iragazki-funtzioak - + Functions for use in postprocessing filter... Post-prozesatzeko iragazkian erabiliko diren funtzioak... - + Plane Planoa - + Sphere Esfera - + Cylinder Zilindroa - + Box Kutxa @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Lodiera [mm] - + Stress [MPa] Plot Y-Axis Label Estresa [MPa] - + Linearized Stresses Plot title Estres linealizatua - + Membrane Plot legend item label Mintza - + Membrane and Bending Plot legend item label Mintza eta makurdura - + Total Plot legend item label Totala - - - Fem - Fem - - - - Stress linearization plot - Estresa linealizatzeko trazaketa - - - - Define/create stress linearization plots - Definitu/sortu estresa linealizatzeko trazaketak - - - - - Wrong selection - Hautapen okerra - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Hautatu ESTRES eremu bat lerro batean zehar ebakitzen duen ebaketa-iragazki bat. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Argitaratu kanalizazioa emaitzatik - - - - Creates a post processing pipeline from a result object - Post-prozesuko kanalizazio bat sortzen du emaitza-objektu batetik abiatuta - - - - Wrong selection type - Hautapen mota okerra - - - - Select a result object, please. - Hautatu emaitzako objektua. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Ebaketa-iragazki eskalarra - - - - Define/create a clip filter which clips a field with a scalar value - Definitu/sortu eremu bat balio eskalar batekin ebakitzen duen ebaketa-iragazki bat - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Estresa linealizatzeko trazaketa + + + + Define/create stress linearization plots + Definitu/sortu estresa linealizatzeko trazaketak + + + + + Wrong selection + Hautapen okerra + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Hautatu ESTRES eremu bat lerro batean zehar ebakitzen duen ebaketa-iragazki bat. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Argitaratu kanalizazioa emaitzatik + + + + Creates a post processing pipeline from a result object + Post-prozesuko kanalizazio bat sortzen du emaitza-objektu batetik abiatuta + + + + Wrong selection type + Hautapen mota okerra + + + + Select a result object, please. + Hautatu emaitzako objektua. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Ebaketa-iragazki eskalarra + + + + Define/create a clip filter which clips a field with a scalar value + Definitu/sortu eremu bat balio eskalar batekin ebakitzen duen ebaketa-iragazki bat + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Bihurritze-iragazkia - + Warp the geometry along a vector field by a certain factor Bihurritu geometria eremu bektorial baten luzeran, faktore jakin bat erabilita @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Sortu jariakinen muga-baldintza - + Make bearing constraint Sortu kojinete-murrizketa - + Make contact constraint on a face Sortu kontaktu-murrizketa aurpegi batean - + Make displacement boundary condition on face Sortu desplazamenduaren muga-baldintza aurpegian - + Make fixed boundary condition for geometry Sortu muga finkoaren baldintza geometriarako - + Make force load on geometry Sortu indar-karga geometrian - + Make gear constraint Sortu engranaje-murrizketa - + Make heat flux load on face Sortu bero-fluxuaren karga aurpegian - + Make initial temperature condition on body Sortu hasierako tenperatura-baldintza gorputzean - + Make plane multi-point constraint on face Sortu planoaren puntu anitzeko murrizketa aurpegian - + Make pressure load on face Sortu presio-karga aurpegian - + Make spring on face Sortu malgukia aurpegian - + Make pulley constraint Sortu polea-murrizketa - + Make temperature boundary condition on face Sortu tenperaturaren muga-baldintza aurpegian - + Make local coordinate system on face Sortu koordenatuen sistema lokala aurpegian - + Place robot Kokatu robota - + Edit nodes set Editatu nodo multzoa - + Create nodes set Sortu nodo multzoa - + Create filter Sortu iragazkia - + Create function Sortu funtzioa - + Create pipeline from result Sortu kanalizazioa emaitzatik - + Edit Mirror Editatu ispilua @@ -776,22 +776,22 @@ hasierako tenperatura: FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Sortu plano-funtzioa, bere jatorria eta normala abiapuntutzat hartuta - + Create a sphere function, defined by its center and radius Sortu esfera-funtzioa, bere zentroa eta erradioa abiapuntutzat hartuta - + Create a cylinder function, defined by its center, axis and radius Sortu zilindro-funtzioa, bere zentroa, ardatza eta erradioa abiapuntutzat hartuta - + Create a box function, defined by its center, length, width and height Sortu koadro-funtzioa, bere zentroa, luzera, zabalera eta altuera abiapuntutzat hartuta @@ -1017,20 +1017,20 @@ hasierako tenperatura: Behe maiztasuneko muga - + File does not exist Fitxategia ez da existitzen - + The specified executable '%1' does not exist! Specify another file please. - Zehaztutako exekutagarria: + The specified executable '%1' -ez da existitzen. -Zehaztu beste fitxategi bat. + does not exist! +Specify another file please. @@ -1119,36 +1119,36 @@ fusionatuko dira bolumenaren mugak ikusgai izan daitezen. <html><head/><body><p><span style=" font-weight:600;">Oharra:</span> Nukleoen kopuru bikoitia erabiltzea gomendatzen da, amaraunen simetriaren abantailaz baliatzeko (8 nukleo erabiltzea, 9 erabiltzea baino azkarragoa izan daiteke).<br/><span style=" font-weight:600;">Bigarren oharra:</span> Muturreko kasuetan, ElmerSolver ebazleak ez du konbergituko nukleo kopurua handiegia bada.</p></body></html> - + File does not exist Fitxategia ez da existitzen - + The specified executable '%1' does not exist! Specify another file please. - Zehaztutako exekutagarria: + The specified executable '%1' -ez da existitzen. -Zehaztu beste fitxategi bat. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Ez da egokia hari anitz erabiltzeko - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Elmer ezarpen okerra: PUZ nukleo bat baino gehiago erabili behar da. Hortaz, '_mpi.exe' atzizkia duen exekutagarria behar da. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Elmer ezarpen okerra: PUZ nukleo bat baino gehiago erabili behar da. @@ -1252,7 +1252,7 @@ non murrizketa edo materiala aplikatzen den. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + Utzi aplikazioari ebazle guztien laneko direktorioak kudeatzen (sortzen, ezabatzen). Erabili aldi baterako direktorioak. @@ -1386,20 +1386,20 @@ gehituko den ebazle lehenetsia Utzi hutsik gmsh fitxategi bitar lehenetsia erabiltzeko - + File does not exist Fitxategia ez da existitzen - + The specified executable '%1' does not exist! Specify another file please. - Zehaztutako exekutagarria: + The specified executable '%1' -ez da existitzen. -Zehaztu beste fitxategi bat. + does not exist! +Specify another file please. @@ -1463,83 +1463,6 @@ funtzionatzen du. Emaitzako FreeCAD objektua - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materiala - - - - Card resources - Txartel-baliabideak - - - - The cards built-in to FreeCAD will be listed as available. - FreeCADen integratutako txartelak erabilgarri gisa zerrendatuko dira. - - - - Use built-in materials - Erabili inkorporatutako materialak - - - - Also cards from FreeCAD's preferences directory will be listed as available. - FreeCADen hobespen-direktorioko txartelak ere erabilgarri gisa zerrendatuko dira. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Erabili erabiltzailearen FreeCAD hobespenen 'Materialak' direktorioko materialak - - - - Also material cards also from the specified directory -will be listed as available. - Zehaztutako direktorioko material-txartelak ere -erabilgarri gisa zerrendatuko dra. - - - - Use materials from user defined directory - Erabili erabiltzaileak definitutako direktorioko materialak - - - - User directory - Erabiltzaile-direktorioa - - - - Card sorting and duplicates - Txartelak ordenatzea eta bikoiztuak - - - - Duplicate cards will be deleted from the displayed material card list. - Bikoiztutako txartelak ezabatu egingo dira bistaratutako material-txartelen zerrendatik. - - - - Delete card duplicates - Ezabatu txartel bikoiztuak - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material-txartelak beren baliabideen (kokapenen) arabera ordenatuta agertuko dra. -Hau ez badago markatuta, izenaren arabera ordenatuko dira. - - - - Sort by resources - Ordenatu baliabideen arabera - - FemGui::DlgSettingsFemMystranImp @@ -1578,20 +1501,20 @@ Hau ez badago markatuta, izenaren arabera ordenatuko dira. Idatzi iruzkinak sarrerako fitxategian - + File does not exist Fitxategia ez da existitzen - + The specified executable '%1' does not exist! Specify another file please. - Zehaztutako exekutagarria: + The specified executable '%1' -ez da existitzen. -Zehaztu beste fitxategi bat. + does not exist! +Specify another file please. @@ -1690,34 +1613,34 @@ erabiltzean. "MAXKOI" handitu behar dela dioen mezu bat jaso daiteke. - + File does not exist Fitxategia ez da existitzen - + The specified z88r executable '%1' does not exist! Specify another file please. - Zehaztutako z88r exekutagarria: + The specified z88r executable '%1' -ez da existitzen. -Zehaztu beste fitxategi bat. + does not exist! +Specify another file please. - - + + Wrong file Fitxategi okerra - + You must specify the path to the z88r.exe! z88r.exe fitxategiaren bide-izena zehaztu behar da. - + You must specify the path to the z88r! z88r aplikazioaren bide-izena zehaztu behar da. @@ -1741,13 +1664,13 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraint - - + + Input error Sarrera-errorea - + You must specify at least one reference Gutxienez erreferentzia bat adierazi behar duzu @@ -1755,7 +1678,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintBearing - + Input error Sarrera-errorea @@ -1763,7 +1686,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintContact - + Input error Sarrera-errorea @@ -1771,7 +1694,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintDisplacement - + Input error Sarrera-errorea @@ -1779,7 +1702,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Sarrera-errorea @@ -1787,13 +1710,13 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintForce - - + + Input error Sarrera-errorea - + Please specify a force greater than 0 Adierazi 0 baino handiagoa den indar bat @@ -1801,7 +1724,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintGear - + Input error Sarrera-errorea @@ -1809,7 +1732,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintHeatflux - + Input error Sarrera-errorea @@ -1817,8 +1740,8 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Sarrera-errorea @@ -1826,7 +1749,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintPressure - + Input error Sarrera-errorea @@ -1834,7 +1757,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintPulley - + Input error Sarrera-errorea @@ -1842,7 +1765,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintSpring - + Input error Sarrera-errorea @@ -1850,7 +1773,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintTemperature - + Input error Sarrera-errorea @@ -1858,7 +1781,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgFemConstraintTransform - + Input error Sarrera-errorea @@ -1866,12 +1789,12 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Editatu FEM amarauna - + Meshing failure Hutsegitea amarauna sortzean @@ -1879,7 +1802,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskDlgPost - + Input error Sarrera-errorea @@ -1895,12 +1818,12 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraint - + Analysis feature parameters Analisi-elementuaren parametroak - + Delete Ezabatu @@ -1908,42 +1831,42 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Hautapen-errorea - + Please use only a single reference for bearing constraint Erabili erreferentzia bakarra kojinete-murrizketarako - + Only faces can be picked Aurpegiak soilik aukera daitezke - + Only cylindrical faces can be picked Aurpegi zilindrikoak soilik aukera daitezke - + Only planar faces can be picked Aurpegi planarrak soilik aukera daitezke - + Only linear edges can be picked Ertz linealak soilik aukera daitezke - + Only faces and edges can be picked Aurpegiak eta ertzak soilik aukera daitezke @@ -1952,77 +1875,77 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintContact - + Delete Ezabatu - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Hautapen-errorea - + Only one face in object! - moved to master face Aurpegi bakarra dago objektuan! - Aurpegi maisura eraman da - - + + Only one master face and one slave face for a contact constraint! Aurpegi nagusi bakarra eta mendeko aurpegi bakarra kontaktu-murrizketako! - - - - + + + + Nothing selected! Ez da ezer hautatu! - + Only one slave face for a contact constraint! Mendeko aurpegi bakarra kontaktu-murrizketako! - - - - + + + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - - + + Only faces can be picked Aurpegiak soilik aukera daitezke - + Only one master for a contact constraint! Nagusi bakarra kontaktu-murrizketako! - + Only one master face for a contact constraint! Aurpegi nagusi bakarra kontaktu-murrizketako! @@ -2030,28 +1953,28 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Hautapen mota bakarra (erpina, aurpegia edo ertza) onartzen da analisi-elementu bakoitzeko @@ -2059,28 +1982,28 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Hautapen mota bakarra (erpina, aurpegia edo ertza) onartzen da analisi-elementu bakoitzeko @@ -2088,128 +2011,128 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintFluidBoundary - + Basic Oinarrizkoa - + Turbulence Turbulentzia - + Thermal Termikoa - + select boundary type, faces and set value Hautatu muga mota, aurpegiak eta ezarri balioa - + Intensity [0~1] Intentsitatea [0~1] - + Dissipation Rate [m2/s3] Barreiadura-tasa [m2/s3] - + Length Scale[m] Luzera-eskala [m] - + Viscosity Ratio [1] Biskositate-erlazioa [1] - + Hydraulic Diameter [m] Diametro hidraulikoa [m] - - + + Gradient [K/m] Gradientea [K/m] - + Flux [W/m2] Fluxua [W/m2] - + Empty selection Hautapen hutsa - + Select an edge or a face, please. Hautatu ertz bat edo aurpegi bat. - - - - - + + + + + Wrong selection Hautapen okerra - + Selected object is not a part object! Hautatutako objektua ez da pieza-objektu bat! - + Only one planar face or edge can be selected! Aurpegi edo ertz planar bakar bat hautatu daiteke! - + Only planar faces can be picked for 3D Aurpegi planarrak soilik aukeratu daitezke 3Drako - + Only planar edges can be picked for 2D Ertz planarrak soilik aukeratu daitezke 2Drako - + Only faces for 3D part or edges for 2D can be picked Aurpegiak soilik (3D piezetarako) edo ertzak soilik (2D piezetarako) aukeratu daitezke - - + - - + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Hautapen mota bakarra (erpina, aurpegia edo ertza) onartzen da analisi-elementu bakoitzeko @@ -2217,39 +2140,39 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Hautapen mota bakarra (erpina, aurpegia edo ertza) onartzen da analisi-elementu bakoitzeko - - + + Wrong selection Hautapen okerra - + Select an edge or a face, please. Hautatu ertz bat edo aurpegi bat. @@ -2257,24 +2180,24 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintGear - - - + + + Selection error Hautapen-errorea - + Only planar faces can be picked Aurpegi planarrak soilik aukera daitezke - + Only linear edges can be picked Ertz linealak soilik aukera daitezke - + Only faces and edges can be picked Aurpegiak eta ertzak soilik aukera daitezke @@ -2282,30 +2205,30 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - - + + Selection must only consist of faces! Hautapenean aurpegiak soilik onartzen dira! @@ -2313,42 +2236,42 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Hautapen-errorea - - + + Only one face can be selected for a plane multi-point constraint! Aurpegi bakarra hautatu daiteke planoaren puntu anitzeko murrizketa baterako! - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - + Only faces can be picked Aurpegiak soilik aukera daitezke - + Only planar faces can be picked Aurpegi planarrak soilik aukera daitezke @@ -2356,28 +2279,28 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - + Only faces can be picked Aurpegiak soilik aukera daitezke @@ -2385,12 +2308,12 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintPulley - + Pulley diameter Polea-diametroa - + Torque [Nm] Bihurdura [Nm] @@ -2398,28 +2321,28 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - + Only faces can be picked Aurpegiak soilik aukera daitezke @@ -2427,22 +2350,22 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! @@ -2450,64 +2373,64 @@ Zehaztu beste fitxategi bat. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analisi-elementuaren eguneratze-errorea - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Aurpegi transformagarriak aldatu dira. Gehitu aurpegi transformagarriak soilik eta kendu transformatu ezin direnak. - - - - - - - - - - + + + + + + + + + + Selection error Hautapen-errorea - - + + Nothing selected! Ez da ezer hautatu! - - + + Only one face for rectangular local coordinate system! Aurpegi bakar bat koordenatuen sistema lokal laukizuzen bakoizeko! - + Only one face for local coordinate system! Aurpegi bakar bat koordenatuen sistema lokal bakoizeko! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Aurpegi transformagarriak soilik hautatu daitezke! Aplikatu desplazamenduaren muga-baldintza gainazalari lehenengo, gero aplikatu koordenatu-sistema gainazalari - - + + Selected object is not a part! Hautatutako objektua ez da pieza bat! - + Only faces can be picked Aurpegiak soilik aukera daitezke - + Only cylindrical faces can be picked Aurpegi zilindrikoak soilik aukera daitezke @@ -2515,7 +2438,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2523,7 +2446,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskPostClip - + Clip region, choose implicit function Ebaki eskualdea, aukeratu funtzio inplizitua @@ -2531,7 +2454,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskPostCut - + Function cut, choose implicit function Funtzio moztua, aukeratu funtzio inplizitua @@ -2539,12 +2462,12 @@ Zehaztu beste fitxategi bat. FemGui::TaskPostDataAlongLine - + Data along a line options Lerro baten luzeran dauden datuen aukerak - + Length X-Axis plot label Luzera @@ -2553,12 +2476,12 @@ Zehaztu beste fitxategi bat. FemGui::TaskPostDataAtPoint - + Data at point options Puntu bateko datuek aukerak - + %1 at (%2; %3; %4) is: %5 %6 %1 hemen: (%2; %3; %4) honakoa da: %5 %6 @@ -2566,7 +2489,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskPostDisplay - + Result display options Emaitza erakusteko aukerak @@ -2574,7 +2497,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskPostFunction - + Implicit function Funtzio inplizitua @@ -2582,7 +2505,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskPostScalarClip - + Scalar clip options Ebaketa eskalarraren aukerak @@ -2590,7 +2513,7 @@ Zehaztu beste fitxategi bat. FemGui::TaskPostWarpVector - + Warp options Bihurritze-aukerak @@ -2614,12 +2537,12 @@ Zehaztu beste fitxategi bat. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Hutsegitea amarauna sortzean - + The FEM module is built without NETGEN support. Meshing will not work!!! FEM modulua NETGEN euskarririk gabe sortu da. Amaraunek ez dute funtzionatuko!!! @@ -3591,46 +3514,45 @@ Oharra: 2D kasuetan soilik, X-en ezarpena posible da, Analisi bat sortu edo aktibatu behar duzu - + Ok Ados - + Cancel Utzi - - - - - - - - + + + + + + + + A dialog is already open in the task panel Elkarrizketa-koadro bat irekita dago ataza-panelean - - - - - - - - + + + + + + + + Do you want to close this dialog? Koadro hori itxi nahi duzu? - + Meshing Amarauna sortzea - @@ -3647,22 +3569,22 @@ Oharra: 2D kasuetan soilik, X-en ezarpena posible da, Inportatu-Esportatu - + Constraint initial temperature Murriztu hasierako tenperatura - + Constraint pulley Polea-murrizketa - + Constraint spring Murriztu malgukia - + Edit post processing object Editatu post-prozesuko objektua @@ -3702,62 +3624,62 @@ Oharra: 2D kasuetan soilik, X-en ezarpena posible da, Taldeak - + Are you sure you want to continue? Ziur zaude jarraitu nahi duzula? - + Contact constraint Kontaktu-murrizketa - + Displacement boundary condition Desplazamenduaren muga-baldintza - + Fixed boundary condition Muga finkoaren baldintza - + Fluid boundary condition Jariakinen muga-baldintza - + Force load Indar-karga - + Heat flux load Bero-fluxuaren karga - + Plane multi-point constraint Planoaren puntu anitzeko murrizketa - + Pressure load Presio-karga - + Temperature boundary condition Tenperaturaren muga-baldintza - + Local coordinate system Koordenatuen sistema lokala - + Edit analysis feature Editatu analisi-elementua @@ -4095,7 +4017,7 @@ Balizko aldagaietarako, ikusi beheko deskribapen-koadroa. Std_Delete - + Object dependencies Objektuaren mendekotasunak @@ -5375,20 +5297,20 @@ Elmer ebazlean setupFilter - + Error: A filter can only be applied to a single object. Errorea: Iragazki bat objektu bakar bati soilik aplikatu dakioke. - - - + + + The filter could not be set up. Ezin izan da iragazkia konfiguratu. - - + + Error: no post processing object selected. Errorea: Ez da hautatu post-prozesuko objektua. @@ -6103,13 +6025,13 @@ Hasteko, hautatu emaitza mota bat. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Muga-baldintza elektromagnetikoak @@ -6155,17 +6077,17 @@ indar magnetodinamikoetarako CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Ekuazio elektromagnetikoak - + Electromagnetic equations for the Elmer solver Elmer ebazlerako ekuazio elektromagnetikoak @@ -6173,17 +6095,17 @@ indar magnetodinamikoetarako CmdFemPostContoursFilter - + Fem Fem - + Contours filter Ingeraden iragazkia - + Define/create a contours filter which displays iso contours Definitu/sortu ingeradak bistaratzen dituen iragazkia @@ -6191,7 +6113,7 @@ indar magnetodinamikoetarako FemGui::TaskPostContours - + Contours filter options Ingeraden iragazkiaren aukerak @@ -6285,17 +6207,17 @@ deformaziorako (elastikotasun ez linealerako) CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Ekuazio mekanikoak - + Mechanical equations for the Elmer solver Elmer ebazlerako ekuazio mekanikoak diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_fi.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_fi.ts index 47f4cab21d..6b23ae2f2e 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_fi.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_fi.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem FEM-Elementtimenetelmä - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem FEM-Elementtimenetelmä - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem FEM-Elementtimenetelmä - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem FEM-Elementtimenetelmä - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem FEM-Elementtimenetelmä - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem FEM-Elementtimenetelmä - - Constraint force - Rajoitevoima + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem FEM-Elementtimenetelmä - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem FEM-Elementtimenetelmä - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem FEM-Elementtimenetelmä - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem FEM-Elementtimenetelmä - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem FEM-Elementtimenetelmä - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem FEM-Elementtimenetelmä - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem FEM-Elementtimenetelmä - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem FEM-Elementtimenetelmä - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem FEM-Elementtimenetelmä - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem FEM-Elementtimenetelmä - + Nodes set Solmukohtien määrittely - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Virheellinen valinta - + Select a single FEM mesh or nodes set, please. Valitse yksi verkko tai solmusetti. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem FEM-Elementtimenetelmä - + Node set by poly Node set by poly - - + + Create node set by Poly Luo monikulmion määrittämä solmukohtien joukko @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem FEM-Elementtimenetelmä - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem FEM-Elementtimenetelmä - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Virheellinen valinta - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem FEM-Elementtimenetelmä - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem FEM-Elementtimenetelmä - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem FEM-Elementtimenetelmä - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem FEM-Elementtimenetelmä - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Taso - + Sphere Pallo - + Cylinder Lieriö - + Box Laatikko @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Paksuus [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Total - - - Fem - FEM-Elementtimenetelmä - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Virheellinen valinta - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - FEM-Elementtimenetelmä - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - FEM-Elementtimenetelmä - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Virheellinen valinta + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + FEM-Elementtimenetelmä + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + FEM-Elementtimenetelmä + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + FEM-Elementtimenetelmä + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Luo suodatin - + Create function Luo funktio - + Create pipeline from result Create pipeline from result - + Edit Mirror Edit Mirror @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Taajuuden alaraja - + File does not exist Tiedostoa ei ole olemassa - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist Tiedostoa ei ole olemassa - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist Tiedostoa ei ole olemassa - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materiaali - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Käytä ohjelman omia materiaaleja - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Käytä käyttäjän oman hakemiston materiaaleja - - - - User directory - Käyttäjän hakemisto - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist Tiedostoa ei ole olemassa - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist Tiedostoa ei ole olemassa - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Väärä tiedosto - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Syötteen virhe - + You must specify at least one reference Sinun on määritettävä vähintään yksi viittaus @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Syötteen virhe @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Syötteen virhe @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Syötteen virhe @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Syötteen virhe @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Syötteen virhe - + Please specify a force greater than 0 Anna nollasta eroava kuorma @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Syötteen virhe @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Syötteen virhe @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Syötteen virhe @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Syötteen virhe @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Syötteen virhe @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Syötteen virhe @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Syötteen virhe @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Syötteen virhe @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Muokkaa verkkoa - + Meshing failure Verkotusvirhe @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Syötteen virhe @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Poista @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Valintavirhe - + Please use only a single reference for bearing constraint Käytä vain yhtä viitettä suuntiman rajoitteessa - + Only faces can be picked Vain tahkoja voidaan poimia - + Only cylindrical faces can be picked Vain sylinteripintoja voidaan poimia - + Only planar faces can be picked Vain tasopinnat on poimittavissa - + Only linear edges can be picked Vain lineaariset reunat on poimittavissa - + Only faces and edges can be picked Vain tahkot ja reunat on poimittavissa @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Poista - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Valintavirhe - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Mitään ei ole valittu! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Valittu objekti ei ole osa (part)! - - + + Only faces can be picked Vain tahkoja voidaan poimia - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Tyhjä valinta - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Virheellinen valinta - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Virheellinen valinta - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Valintavirhe - + Only planar faces can be picked Vain tasopinnat on poimittavissa - + Only linear edges can be picked Vain lineaariset reunat on poimittavissa - + Only faces and edges can be picked Vain tahkot ja reunat on poimittavissa @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Valintavirhe - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - + Only faces can be picked Vain tahkoja voidaan poimia - + Only planar faces can be picked Vain tasopinnat on poimittavissa @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - + Only faces can be picked Vain tahkoja voidaan poimia @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Hihnapyörän halkaisija - + Torque [Nm] Vääntömomentti [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - + Only faces can be picked Vain tahkoja voidaan poimia @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Valintavirhe - - + + Nothing selected! Mitään ei ole valittu! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Valittu objekti ei ole osa (part)! - + Only faces can be picked Vain tahkoja voidaan poimia - + Only cylindrical faces can be picked Vain sylinteripintoja voidaan poimia @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TehtäväKohteenNimi @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Pituus @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Verkotusvirhe - + The FEM module is built without NETGEN support. Meshing will not work!!! FEM-moduuli in käännetty ilman NETGEN tukea. Verkotus ei toimi! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, Sinun täytyy luoda tai aktivoida analyysi - + Ok Ok - + Cancel Peruuta - - - - - - - - + + + + + + + + A dialog is already open in the task panel Valintaikkuna on jo avoinna tehtäväpaneelissa - - - - - - - - + + + + + + + + Do you want to close this dialog? Haluatko sulkea tämän valintaikkunan? - + Meshing Verkkopinnan käyttö - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Tuo/Vie - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Ryhmät - + Are you sure you want to continue? Haluatko varmasti jatkaa? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Objektin riippuvuudet @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem FEM-Elementtimenetelmä - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem FEM-Elementtimenetelmä - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem FEM-Elementtimenetelmä - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem FEM-Elementtimenetelmä - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_fr.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_fr.ts index 7a6ce787cf..e4ad321738 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_fr.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_fr.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem FEM - + Bearing constraint Contrainte de roulement - + Creates a bearing constraint Créer une contrainte de roulement @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem FEM - + Contact constraint Contrainte de contact - + Creates a contact constraint between faces Créer une contrainte de contact entre les faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem FEM - - Constraint displacement - Contrainte de déplacement + + Displacement boundary condition + Condition limite de déplacement - + Creates a displacement boundary condition for a geometric entity Créer une condition limite de déplacement pour une entité géométrique @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem FEM - - Constraint fixed - Contrainte d'immobilisation + + Fixed boundary condition + Condition limite fixe - + Creates a fixed boundary condition for a geometric entity Créer une condition de limite fixe pour une entité géométrique @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem FEM - + Fluid boundary condition Contrainte de limite du fluide - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Créer une condition limite de fluide sur une face pour la Mécanique des fluides numérique @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem FEM - - Constraint force - Contrainte de force + + Force load + Charge d'effort - + Creates a force load applied to a geometric entity Créer une charge de force appliquée à une entité géométrique @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem FEM - + Gear constraint Contrainte d'engrenage - + Creates a gear constraint Créer une contrainte d'engrenage @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem FEM - + Heat flux load Charge de flux de chaleur - + Creates a heat flux load acting on a face Créer une charge de flux de chaleur agissant sur une face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem FEM - + Initial temperature Température initiale - + Creates an initial temperature acting on a body Créer une température initiale agissant sur un corps @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem FEM - + Plane multi-point constraint Contrainte multi-points de plan - + Creates a plane multi-point constraint for a face Créer une contrainte multi-points de plan pour une face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem FEM - - Constraint pressure - Contrainte de pression + + Pressure load + Charge de pression - + Creates a pressure load acting on a face Créer une charge de pression agissant sur une face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem FEM - + Pulley constraint Contrainte de poulie - + Creates a pulley constraint Créer une contrainte de poulie @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem FEM - + Spring Ressort - + Creates a spring acting on a face Créer un ressort agissant sur une face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem FEM - - Constraint temperature - Contrainte de température + + Temperature boundary condition + Condition limite de température - + Creates a temperature/concentrated heat flux load acting on a face Créer une charge de température/flux de chaleur concentrée agissant sur une face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem FEM - - Constraint transform - Contrainte de déformation + + Local coordinate system + Système de coordonnées locales - + Create a local coordinate system on a face Créer un système de coordonnées sur une face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem FEM - + Nodes set Ensemble de nœuds - + Creates a FEM mesh nodes set Créer un ensemble de nœuds de maillage FEM - + Wrong selection Sélection incorrecte - + Select a single FEM mesh or nodes set, please. Sélectionner maillage FEM seul ou des nœuds s'il vous plaît. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem FEM - + Node set by poly Nœud défini par poly - - + + Create node set by Poly Créer un nœud défini par Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem FEM - + Apply changes to pipeline Appliquer les modifications au pipeline - + Apply changes to parameters directly and not on recompute only... Appliquer les changements aux paramètres directement et non lors du recalcul seulement... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem FEM - + Region clip filter Filtre de découpe selon une région - + Define/create a clip filter which uses functions to define the clipped region Définir/créer un filtre d'écrêtage qui utilisera des fonctions pour définir la région écrêtée - + Wrong selection Sélection incorrecte - + Select a pipeline, please. Sélectionnez un pipeline, s'il vous plaît. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem FEM - + Function cut filter Filtre de fonction de découpe - + Cut the data along an implicit function Couper les données le long d'une fonction implicite @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem FEM - + Line clip filter Filtre d'écrêtage selon une ligne - + Define/create a clip filter which clips a field along a line Définir/créer un filtre d'écrêtage qui écrêtera un champ le long d'une ligne @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem FEM - + Data at point clip filter Données du filtre d'écrêtage du point - + Define/create a clip filter which clips a field data at point Définir/créer un filtre d'écrêtage qui écrêtera les données d'un champ à un point donné @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem FEM - + Filter functions Fonctions de filtrage - + Functions for use in postprocessing filter... Fonctions pour le filtrage de post-traitement... - + Plane Plan - + Sphere Sphère - + Cylinder Cylindre - + Box Boîte @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Épaisseur [mm] - + Stress [MPa] Plot Y-Axis Label Contrainte [MPa] - + Linearized Stresses Plot title Contraintes linéarisées - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane et Pliage - + Total Plot legend item label Total - - - Fem - FEM - - - - Stress linearization plot - Graphique de linéarisation des contraintes - - - - Define/create stress linearization plots - Définir/créer des graphiques de linéarisation des contraintes - - - - - Wrong selection - Sélection incorrecte - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Sélectionner un filtre d'écrêtage qui écrête un champ de contrainte le long d'une ligne. - - - - CmdFemPostPipelineFromResult - - - Fem - FEM - - - - Post pipeline from result - Afficher le pipeline des résultats - - - - Creates a post processing pipeline from a result object - Créer un pipeline de post-traitement à partir d'un objet résultat - - - - Wrong selection type - Type de sélection incorrect - - - - Select a result object, please. - Sélectionnez un objet résultat, s'il vous plaît. - - - - CmdFemPostScalarClipFilter - - - Fem - FEM - - - - Scalar clip filter - Filtre d'écrêtage scalaire - - - - Define/create a clip filter which clips a field with a scalar value - Définir/créer un filtre d'écrêtage qui écrêtera un champ avec une valeur scalaire - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Graphique de linéarisation des contraintes + + + + Define/create stress linearization plots + Définir/créer des graphiques de linéarisation des contraintes + + + + + Wrong selection + Sélection incorrecte + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Sélectionner un filtre d'écrêtage qui écrête un champ de contrainte le long d'une ligne. + + + + CmdFemPostPipelineFromResult + + + Fem + FEM + + + + Post pipeline from result + Afficher le pipeline des résultats + + + + Creates a post processing pipeline from a result object + Créer un pipeline de post-traitement à partir d'un objet résultat + + + + Wrong selection type + Type de sélection incorrect + + + + Select a result object, please. + Sélectionnez un objet résultat, s'il vous plaît. + + + + CmdFemPostScalarClipFilter + + + Fem + FEM + + + + Scalar clip filter + Filtre d'écrêtage scalaire + + + + Define/create a clip filter which clips a field with a scalar value + Définir/créer un filtre d'écrêtage qui écrêtera un champ avec une valeur scalaire + + + + CmdFemPostWarpVectorFilter + + + Fem + FEM + + + Warp filter Filtre des déformations - + Warp the geometry along a vector field by a certain factor Déforme la géométrie le long d'un champ vectoriel d'un certain facteur @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Créer une condition limite de fluide - + Make bearing constraint Faire une contrainte de roulement - + Make contact constraint on a face Faire une contrainte de contact sur une face - + Make displacement boundary condition on face Faire une condition limite de déplacement sur une face - + Make fixed boundary condition for geometry Faire une condition limite fixe pour la géométrie - + Make force load on geometry Faire une force d'effort sur la géométrie - + Make gear constraint Faire une contrainte d'engrenage - + Make heat flux load on face Faire une charge de flux de chaleur sur une face - + Make initial temperature condition on body Faire une condition de température initiale sur le corps - + Make plane multi-point constraint on face Faire une contrainte multi-points de plan sur une face - + Make pressure load on face Faire une charge de pression sur une face - + Make spring on face Faire un ressort sur une face - + Make pulley constraint Faire une contrainte de poulie - + Make temperature boundary condition on face Faire une condition limite de température sur une face - + Make local coordinate system on face Faire un système local de coordonnées sur une face - + Place robot Placer le robot - + Edit nodes set Modifier le jeu de noeuds - + Create nodes set Créer un jeu de nœuds - + Create filter Créer un filtre - + Create function Créer une fonction - + Create pipeline from result Créer un pipeline à partir du résultat - + Edit Mirror Éditer le miroir @@ -711,7 +711,7 @@ Mesh groups detected. Please choose values for the different groups. - Groupes de mailles détectés. Veuillez choisir des valeurs pour les différents groupes. + Groupes de mailles détectés. Choisir des valeurs pour les différents groupes. @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Créer une fonction de plan, définie par son origine et sa normale - + Create a sphere function, defined by its center and radius Créer une fonction de sphère, définie par son centre et son rayon - + Create a cylinder function, defined by its center, axis and radius Créer une fonction cylindre, définie par son centre, son axe et son rayon - + Create a box function, defined by its center, length, width and height Créer une fonction boîte, définie par son centre, sa longueur, sa largeur et sa hauteur @@ -827,7 +827,7 @@ Input file Editor - Éditeur de fichier d'entrée + Éditeur des fichiers sources @@ -842,7 +842,7 @@ Input file splitting - Division des fichiers d'entrée + Division des fichiers sources @@ -892,7 +892,7 @@ Solver defaults - Valeurs par défaut du solveur + Valeurs du solveur par défaut @@ -927,7 +927,7 @@ Non-linear geometry - Géométrie non linéaire + Géométrie non-linéaire @@ -958,7 +958,7 @@ Time End - Fin du temps d'exécution + Fin du temps de calcul @@ -1017,20 +1017,20 @@ Limite de la fréquence basse - + File does not exist Le fichier n'existe pas - + The specified executable '%1' does not exist! Specify another file please. - L'exécutable + The specified executable '%1' - spécifié n'existe pas ! -Veuillez spécifiez un autre fichier. + does not exist! +Specify another file please. @@ -1121,36 +1121,36 @@ Remarque : pour utiliser le multithreading, spécifier ici la variante exécutab <html><head/><body><p><span style=" font-weight:600;">Remarque :</span> il est recommandé d'utiliser un nombre pair de cœurs pour bénéficier de la symétrie de maillage. (utiliser 8 cœurs peut être plus rapide qu'avec 9 cœurs.)<br/><span style=" font-weight:600;">Autre remarque :</span> dans les cas extrêmes, le solveur Elmer ne peut pas converger si le nombre de coeurs est trop élevé.</p></body></html> - + File does not exist Le fichier n'existe pas - + The specified executable '%1' does not exist! Specify another file please. - L'exécutable + The specified executable '%1' - spécifié n'existe pas ! -Veuillez spécifiez un autre fichier. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading Elmer FEM : ne convient pas pour le multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Mauvais réglage d'Elmer : vous utilisez plus d'un cœur du CPU. Un exécutable avec le suffixe "_mpi.exe" est donc requis. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Mauvais réglage d'Elmer : vous utilisez plus d'un cœur du CPU. @@ -1257,7 +1257,7 @@ où la contrainte ou le matériau est appliqué. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + Laisser l'application gérer (créer, supprimer) les répertoires de travail pour tous les solveurs. Utiliser des répertoires temporaires. @@ -1268,7 +1268,7 @@ où la contrainte ou le matériau est appliqué. Create a directory in the same folder in which the FCStd file of the document is located. Use Subfolder for each solver (e.g. for a file ./mydoc.FCStd and a solver with the label Elmer002 use ./mydoc/Elmer002). Créer un répertoire dans le même dossier où se trouve le fichier FCStd. -Utiliser un sous-dossier pour chaque solveur (par exemple, pour un fichier ./mydoc.FCStd et un solveur avec l'étiquette Elmer002, utiliser ./mydoc/Elmer002). +Utiliser un sous-dossier pour chaque solveur (par ex : pour un fichier ./mydoc.FCStd et un solveur Elmer002, utiliser ./mydoc/Elmer002). @@ -1316,7 +1316,7 @@ ils seront écrasés par une nouvelle exécution du solveur Keep results on calculation re-run - Conserver les résultats lors de la ré-exécution du calcul + Conserver les résultats après un nouveau calcul @@ -1392,18 +1392,20 @@ adding an analysis container Laisser vide pour utiliser le fichier binaire de Gmsh par défaut - + File does not exist Le fichier n'existe pas - + The specified executable '%1' does not exist! Specify another file please. - L'exécutable '%1' spécifié n'existe pas ! -Veuillez spécifiez un autre fichier. + The specified executable +'%1' + does not exist! +Specify another file please. @@ -1465,83 +1467,6 @@ exportés depuis FreeCAD. Objet résultat FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Matériau - - - - Card resources - Ressources de la carte - - - - The cards built-in to FreeCAD will be listed as available. - Les cartes intégrées à FreeCAD seront listées comme disponibles. - - - - Use built-in materials - Utiliser des matériaux intégrés - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Les cartes du répertoire des préférences de FreeCAD seront également listées comme disponibles. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Utiliser les matériaux du répertoire Matériaux du répertoire des préférences FreeCAD de l'utilisateur - - - - Also material cards also from the specified directory -will be listed as available. - Les cartes de matériaux provenant également du répertoire -spécifié seront listées comme étant disponibles. - - - - Use materials from user defined directory - Utiliser les matériaux du répertoire défini par l'utilisateur - - - - User directory - Répertoire de l'utilisateur - - - - Card sorting and duplicates - Tri des cartes et doublons - - - - Duplicate cards will be deleted from the displayed material card list. - Les cartes en doublon seront supprimées de la liste des cartes de matériaux affichées. - - - - Delete card duplicates - Supprimer les doublons de cartes - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Les cartes de matériaux apparaissent triées par leurs ressources (emplacements). -Si elles ne sont pas cochées, elles seront triées par leur nom. - - - - Sort by resources - Trier par ressources - - FemGui::DlgSettingsFemMystranImp @@ -1577,21 +1502,23 @@ Si elles ne sont pas cochées, elles seront triées par leur nom. Write comments to input file - Écrire des commentaires dans le fichier d'entrée + Écrire des commentaires dans les fichier sources - + File does not exist Le fichier n'existe pas - + The specified executable '%1' does not exist! Specify another file please. - L'exécutable '%1' spécifié n'existe pas ! -Veuillez spécifiez un autre fichier. + The specified executable +'%1' + does not exist! +Specify another file please. @@ -1688,34 +1615,34 @@ un solveur itératif et que vous obtenez le message d'erreur indiquant que "MAXKOI" doit être augmenté. - + File does not exist Le fichier n'existe pas - + The specified z88r executable '%1' does not exist! Specify another file please. - L'exécutable z88r + The specified z88r executable '%1' - spécifié n'existe pas! -Veuillez spécifier un autre fichier. + does not exist! +Specify another file please. - - + + Wrong file Fichier incorrect - + You must specify the path to the z88r.exe! Vous devez spécifier le chemin vers z88r.exe ! - + You must specify the path to the z88r! Vous devez spécifier le chemin vers Z88! @@ -1739,13 +1666,13 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraint - - + + Input error Erreur de saisie - + You must specify at least one reference Vous devez spécifier au moins une référence @@ -1753,7 +1680,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintBearing - + Input error Erreur de saisie @@ -1761,7 +1688,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintContact - + Input error Erreur de saisie @@ -1769,7 +1696,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintDisplacement - + Input error Erreur de saisie @@ -1777,7 +1704,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Erreur de saisie @@ -1785,13 +1712,13 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintForce - - + + Input error Erreur de saisie - + Please specify a force greater than 0 Veuillez préciser une force supérieure à 0 @@ -1799,7 +1726,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintGear - + Input error Erreur de saisie @@ -1807,7 +1734,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintHeatflux - + Input error Erreur de saisie @@ -1815,8 +1742,8 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Erreur de saisie @@ -1824,7 +1751,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintPressure - + Input error Erreur de saisie @@ -1832,7 +1759,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintPulley - + Input error Erreur de saisie @@ -1840,7 +1767,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintSpring - + Input error Erreur de saisie @@ -1848,7 +1775,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintTemperature - + Input error Erreur de saisie @@ -1856,7 +1783,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgFemConstraintTransform - + Input error Erreur de saisie @@ -1864,12 +1791,12 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Modifier le maillage FEM - + Meshing failure Échec du maillage @@ -1877,7 +1804,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskDlgPost - + Input error Erreur de saisie @@ -1893,12 +1820,12 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraint - + Analysis feature parameters Paramètres des fonctions d'analyse - + Delete Supprimer @@ -1906,42 +1833,42 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Erreur de sélection - + Please use only a single reference for bearing constraint Veuillez utiliser une unique référence pour la contrainte de roulement - + Only faces can be picked Seules des faces peuvent être selectionnées - + Only cylindrical faces can be picked Seules des faces cylindriques peuvent être sélectionnées - + Only planar faces can be picked Seulement les faces planes peuvent être sélectionnées - + Only linear edges can be picked Seulement des arêtes rectilignes peuvent être sélectionnées - + Only faces and edges can be picked Seulement des faces et des arètes peuvent être sélectionnées @@ -1950,77 +1877,77 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintContact - + Delete Supprimer - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Erreur de sélection - + Only one face in object! - moved to master face Une seule face dans l'objet ! - déplacé vers la face principale - - + + Only one master face and one slave face for a contact constraint! Une seule face maître et une seule face esclave pour une contrainte de contact! - - - - + + + + Nothing selected! Aucune sélection ! - + Only one slave face for a contact constraint! Une seule face esclave pour une contrainte de contact! - - - - + + + + Selected object is not a part! L'élément sélectionné n'est pas une part ! - - + + Only faces can be picked Seules des faces peuvent être selectionnées - + Only one master for a contact constraint! Un seul maître pour une contrainte de contact! - + Only one master face for a contact constraint! Une seule face maître pour une contrainte de contact! @@ -2028,28 +1955,28 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Erreur de sélection - - + + Nothing selected! - Aucune sélection ! + Rien n'a été sélectionné ! - - + + Selected object is not a part! - L'élément sélectionné n'est pas une part ! + L'objet sélectionné n'est pas une pièce ! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Un seul type de sélection (sommet, face ou arête) est autorisé par fonction d'analyse ! @@ -2057,28 +1984,28 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Erreur de sélection - - + + Nothing selected! Rien n'a été sélectionné ! - - + + Selected object is not a part! L'objet sélectionné n'est pas une pièce ! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Un seul type de sélection (sommet, face ou arête) est autorisé par fonction d'analyse ! @@ -2086,128 +2013,128 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintFluidBoundary - + Basic Simple - + Turbulence Turbulence - + Thermal Thermique - + select boundary type, faces and set value sélectionner le type de limite, les faces et affecter la valeur - + Intensity [0~1] Intensité [0~1] - + Dissipation Rate [m2/s3] Taux de dissipation [m2/s3] - + Length Scale[m] Échelle de longueur [m] - + Viscosity Ratio [1] Taux de viscosité [1] - + Hydraulic Diameter [m] Diamètre hydraulique [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Sélection Vide - + Select an edge or a face, please. Sélectionnez une arête ou une face, s'il vous plaît. - - - - - + + + + + Wrong selection Sélection incorrecte - + Selected object is not a part object! L'objet sélectionné n'est pas un objet de pièce ! - + Only one planar face or edge can be selected! Une seule face plane ou une seule arête peut être sélectionnée ! - + Only planar faces can be picked for 3D Seules les faces planes peuvent être sélectionnées en 3D - + Only planar edges can be picked for 2D Seules les arêtes planes peuvent être sélectionnées en 2D - + Only faces for 3D part or edges for 2D can be picked Seules les faces en 3D ou les arêtes en 2D peuvent être sélectionnées - - + - - + + + Selection error Erreur de sélection - - + + Nothing selected! Rien n'a été sélectionné ! - - + + Selected object is not a part! L'objet sélectionné n'est pas une pièce ! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Un seul type de sélection (sommet, face ou arête) est autorisé par fonction d'analyse ! @@ -2215,39 +2142,39 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Erreur de sélection - - + + Nothing selected! Rien n'a été sélectionné ! - - + + Selected object is not a part! L'objet sélectionné n'est pas une pièce ! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Un seul type de sélection (sommet, face ou arête) est autorisé par fonction d'analyse ! - - + + Wrong selection - Sélection incorrecte + Sélection invalide - + Select an edge or a face, please. Sélectionnez une arête ou une face, s'il vous plaît. @@ -2255,24 +2182,24 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintGear - - - + + + Selection error Erreur de sélection - + Only planar faces can be picked Seulement les faces planes peuvent être sélectionnées - + Only linear edges can be picked Seulement des arêtes rectilignes peuvent être sélectionnées - + Only faces and edges can be picked Seulement des faces et des arètes peuvent être sélectionnées @@ -2280,30 +2207,30 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Erreur de sélection - - + + Nothing selected! Rien n'a été sélectionné ! - - + + Selected object is not a part! L'objet sélectionné n'est pas une pièce ! - - + + Selection must only consist of faces! La sélection ne doit se composer que de faces ! @@ -2311,42 +2238,42 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Erreur de sélection - - + + Only one face can be selected for a plane multi-point constraint! Une seule face peut être sélectionnée pour une contrainte multi-points de plan ! - - + + Nothing selected! Rien n'a été sélectionné ! - - + + Selected object is not a part! L'objet sélectionné n'est pas une pièce ! - + Only faces can be picked Seules des faces peuvent être selectionnées - + Only planar faces can be picked Seulement les faces planes peuvent être sélectionnées @@ -2354,28 +2281,28 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Erreur de sélection - - + + Nothing selected! Rien n'a été sélectionné ! - - + + Selected object is not a part! L'objet sélectionné n'est pas une pièce ! - + Only faces can be picked Seules des faces peuvent être selectionnées @@ -2383,12 +2310,12 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintPulley - + Pulley diameter Diamètre de la poulie - + Torque [Nm] Крутящий момент [Nm] @@ -2396,28 +2323,28 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Erreur de sélection - - + + Nothing selected! Rien n'a été sélectionné ! - - + + Selected object is not a part! L'objet sélectionné n'est pas une pièce ! - + Only faces can be picked Seules des faces peuvent être selectionnées @@ -2425,87 +2352,87 @@ Veuillez spécifier un autre fichier. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Erreur de sélection - - + + Nothing selected! - Rien n'a été sélectionné ! + Aucune sélection ! - - + + Selected object is not a part! - L'objet sélectionné n'est pas une pièce ! + L'élément sélectionné n'est pas une part ! FemGui::TaskFemConstraintTransform - + Analysis feature update error Erreur de la mise à jour de la fonction d'analyse - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Les faces déformables ont changé. Veuillez ajouter uniquement les faces déformables et supprimer les faces non déformables! - - - - - - - - - - + + + + + + + + + + Selection error Erreur de sélection - - + + Nothing selected! Aucune sélection ! - - + + Only one face for rectangular local coordinate system! Une seule face pour le système de coordonnées locales rectangulaires ! - + Only one face for local coordinate system! Une seule face pour le système de coordonnées locales ! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Seules les faces transformables peuvent être sélectionnées ! Appliquer d'abord les conditions limites de déplacement à la surface, puis appliquer le système de coordonnées locales à la surface. - - + + Selected object is not a part! L'élément sélectionné n'est pas une part ! - + Only faces can be picked Seules des faces peuvent être selectionnées - + Only cylindrical faces can be picked Seules des faces cylindriques peuvent être sélectionnées @@ -2513,7 +2440,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskObjectName - + TaskObjectName Nom de l'objet @@ -2521,7 +2448,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskPostClip - + Clip region, choose implicit function Région d'écrêtage, choisissez une fonction implicite @@ -2529,7 +2456,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskPostCut - + Function cut, choose implicit function Coupe de fonction, choisissez une fonction implicite @@ -2537,12 +2464,12 @@ Veuillez spécifier un autre fichier. FemGui::TaskPostDataAlongLine - + Data along a line options Options des données le long d'une ligne - + Length X-Axis plot label Longueur @@ -2551,12 +2478,12 @@ Veuillez spécifier un autre fichier. FemGui::TaskPostDataAtPoint - + Data at point options Options des données au point - + %1 at (%2; %3; %4) is: %5 %6 %1 à (%2; %3; %4) est : %5 %6 @@ -2564,7 +2491,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskPostDisplay - + Result display options Options d'affichage des résultats @@ -2572,7 +2499,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskPostFunction - + Implicit function Fonction implicite @@ -2580,7 +2507,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskPostScalarClip - + Scalar clip options Options de l'écrêtage scalaire @@ -2588,7 +2515,7 @@ Veuillez spécifier un autre fichier. FemGui::TaskPostWarpVector - + Warp options Options de la déformation @@ -2612,12 +2539,12 @@ Veuillez spécifier un autre fichier. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Échec du maillage - + The FEM module is built without NETGEN support. Meshing will not work!!! Le module FEM est construit sans le support de NETGEN. Le maillage ne fonctionnera pas!!! @@ -3589,46 +3516,45 @@ Remarque : pour la 2D, seul le réglage en x est possible, Vous devez créer ou activer une analyse - + Ok Ok - + Cancel Annuler - - - - - - - - + + + + + + + + A dialog is already open in the task panel Une fenêtre de dialogue est déjà ouverte dans le panneau des tâches - - - - - - - - + + + + + + + + Do you want to close this dialog? Voulez-vous fermer cette fenêtre de dialogue? - + Meshing Maillage - @@ -3645,22 +3571,22 @@ Remarque : pour la 2D, seul le réglage en x est possible, Importer-Exporter - + Constraint initial temperature Contrainte de température initiale - + Constraint pulley Contrainte de poulie - + Constraint spring Contrainte de ressort - + Edit post processing object Modifier le post-traitement de l'objet @@ -3700,62 +3626,62 @@ Remarque : pour la 2D, seul le réglage en x est possible, Groupes - + Are you sure you want to continue? Êtes-vous sûr de vouloir continuer ? - + Contact constraint Contrainte de contact - + Displacement boundary condition Condition limite de déplacement - + Fixed boundary condition Condition limite fixe - + Fluid boundary condition Contrainte de limite du fluide - + Force load Charge d'effort - + Heat flux load Charge de flux de chaleur - + Plane multi-point constraint Contrainte multi-points de plan - + Pressure load Charge de pression - + Temperature boundary condition Condition limite de température - + Local coordinate system Système de coordonnées locales - + Edit analysis feature Éditer la fonction d'analyse @@ -3775,7 +3701,7 @@ Remarque : pour la 2D, seul le réglage en x est possible, None - Rien + Aucun @@ -4029,7 +3955,7 @@ Pour les variables possibles, voir la zone de description ci-dessous. Thermo mechanical - Thermodynamique + Thermomécanique @@ -4093,7 +4019,7 @@ Pour les variables possibles, voir la zone de description ci-dessous. Std_Delete - + Object dependencies Dépendances des objets @@ -4922,7 +4848,7 @@ used for the Elmer solver Create Plot - Créer un tracé + Créer un graphique @@ -5370,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Erreur : un filtre ne peut être appliqué qu'à un seul objet. - - - + + + The filter could not be set up. Le filtre n'a pas pu être configuré. - - + + Error: no post processing object selected. Erreur: aucun objet de post-traitement sélectionné. @@ -5463,7 +5389,7 @@ used for the Elmer solver Creates a FEM beam cross section - Crée une coupe FEM transversale d'un élément de type poutre + Créer une coupe FEM transversale d'un élément de type poutre @@ -5476,7 +5402,7 @@ used for the Elmer solver Creates a FEM shell plate thickness - Crée une épaisseur FEM d'un élément de type coque + Créer une épaisseur FEM d'un élément de type coque @@ -5489,7 +5415,7 @@ used for the Elmer solver Creates a FEM beam rotation - Crée une rotation FEM d'un élément de type poutre + Créer une rotation FEM d'un élément de type poutre @@ -5502,7 +5428,7 @@ used for the Elmer solver Creates a FEM equation for electrostatic - Crée une équation FEM pour l'électrostatique + Créer une équation FEM pour l'électrostatique @@ -5529,7 +5455,7 @@ used for the Elmer solver Creates a FEM equation for flow - Crée une équation FEM pour un écoulement + Créer une équation FEM pour un écoulement @@ -5542,7 +5468,7 @@ used for the Elmer solver Creates a FEM equation for flux - Crée une équation FEM pour un flux + Créer une équation FEM pour un flux @@ -5555,7 +5481,7 @@ used for the Elmer solver Creates a FEM equation for electric forces - Crée une équation FEM pour des forces électriques + Créer une équation FEM pour des forces électriques @@ -5568,7 +5494,7 @@ used for the Elmer solver Creates a FEM equation for heat - Crée une équation FEM pour la chaleur + Créer une équation FEM pour la chaleur @@ -5594,7 +5520,7 @@ used for the Elmer solver Opens the FreeCAD material editor - Ouvre l’éditeur de matériaux de FreeCAD + Ouvrir l’éditeur de matériaux de FreeCAD @@ -5607,7 +5533,7 @@ used for the Elmer solver Creates a FEM material for fluid - Crée un matériau FEM pour fluide + Créer un matériau FEM pour un fluide @@ -5615,7 +5541,7 @@ used for the Elmer solver Nonlinear mechanical material - Matériau mécanique non linéaire + Matériau mécanique non-linéaire @@ -5646,7 +5572,7 @@ used for the Elmer solver Creates a FEM material for solid - Créer un matériau FEM pour solide + Créer un matériau FEM pour un solide @@ -5672,7 +5598,7 @@ used for the Elmer solver Creates a FEM mesh boundary layer - Créer une couche limite FEM du maillage + Créer une couche limite de maillage FEM @@ -5789,7 +5715,7 @@ used for the Elmer solver Creates a standard FEM solver CalculiX with ccx tools - Créer un solveur standard CalculiX FEM avec les outils ccx + Créer un solveur standard FEM CalculiX avec les outils ccx @@ -5802,7 +5728,7 @@ used for the Elmer solver Changes solver attributes and runs the calculations for the selected solver - Modifie les attributs du solveur et lance les calculs pour le solveur sélectionné + Modifier les attributs du solveur et lancer les calculs pour le solveur sélectionné @@ -5841,7 +5767,7 @@ used for the Elmer solver Runs the calculations for the selected solver - Lance les calculs pour le solveur sélectionné + Lancer les calculs pour le solveur sélectionné @@ -6096,13 +6022,13 @@ Veuillez d'abord sélectionner un type de résultat. CmdFemCompEmConstraints - + Fem FEM - - + + Electromagnetic boundary conditions Conditions limites électromagnétiques @@ -6147,17 +6073,17 @@ Veuillez d'abord sélectionner un type de résultat. CmdFemCompEmEquations - + Fem FEM - + Electromagnetic equations Équations électromagnétiques - + Electromagnetic equations for the Elmer solver Équations électromagnétiques pour le solveur Elmer @@ -6165,17 +6091,17 @@ Veuillez d'abord sélectionner un type de résultat. CmdFemPostContoursFilter - + Fem FEM - + Contours filter Filtre par contours - + Define/create a contours filter which displays iso contours Définir/créer un filtre par contours qui affichera des iso-contours @@ -6183,7 +6109,7 @@ Veuillez d'abord sélectionner un type de résultat. FemGui::TaskPostContours - + Contours filter options Options du filtre par contours @@ -6276,17 +6202,17 @@ Veuillez d'abord sélectionner un type de résultat. CmdFemCompMechEquations - + Fem FEM - + Mechanical equations Équations mécaniques - + Mechanical equations for the Elmer solver Équations mécaniques pour le solveur Elmer @@ -6301,7 +6227,7 @@ Veuillez d'abord sélectionner un type de résultat. Creates a FEM solver CalculiX new framework (less result error handling) - Créer un solveur FEM nouveau modèle de CalculiX (moins de traitement des erreurs de résultat) + Créer un solveur nouveau modèle FEM CalculiX (moins de traitement des erreurs de résultat) @@ -6418,7 +6344,7 @@ Veuillez d'abord sélectionner un type de résultat. Creates a section print feature - Créer une fonction d'affichage de variables de sortie + Créer une fonction d'affichage des variables de sortie diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_gl.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_gl.ts index 27d3c1415c..08280176a6 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_gl.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_gl.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Constrición de forza + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Conxunto de nós - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Escolma errada - + Select a single FEM mesh or nodes set, please. Escolme unha única malla FEM ou un conxunto de nós, por favor. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Crear conxunto de nós por Polígonos @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Escolma errada - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Plano - + Sphere Esfera - + Cylinder Cilindro - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Grosor [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Total - - - Fem - Fem - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Escolma errada - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Escolma errada + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Edit Mirror @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Limite de baixa frecuencia - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Usar materiais incorporados - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Usar materiais dun cartafol definido polo usuario - - - - User directory - Directorio de usuario - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Input error - + You must specify at least one reference Debe especificar polo menos unha referencia @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Input error @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Input error @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Input error @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Input error @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Input error - + Please specify a force greater than 0 Por favor especifique unha forza maior que 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Input error @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Input error @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Input error @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Input error @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Input error @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Input error @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Input error @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Input error @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Editar malla FEM - + Meshing failure Falla na xeración de malla @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Input error @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Desbotar @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Erro de selección - + Please use only a single reference for bearing constraint Por favor, use só unha referencia por constrición de rodamento - + Only faces can be picked Sómente se poden coller faces - + Only cylindrical faces can be picked Sómente se poden coller faces cilíndricas - + Only planar faces can be picked Sómente se poden coller faces planas - + Only linear edges can be picked Sómente se poden coller bordos lineais - + Only faces and edges can be picked Sómente se poden coller faces e bordos @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Desbotar - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Erro de selección - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Nada escolmado! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! O obxecto escolmado non é unha peza! - - + + Only faces can be picked Sómente se poden coller faces - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Básico - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Escolma errada - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Escolma errada - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Erro de selección - + Only planar faces can be picked Sómente se poden coller faces planas - + Only linear edges can be picked Sómente se poden coller bordos lineais - + Only faces and edges can be picked Sómente se poden coller faces e bordos @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Erro de selección - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - + Only faces can be picked Sómente se poden coller faces - + Only planar faces can be picked Sómente se poden coller faces planas @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - + Only faces can be picked Sómente se poden coller faces @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Diámetro da polea - + Torque [Nm] Torque [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - + Only faces can be picked Sómente se poden coller faces @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Selected object is not a part! O obxecto escolmado non é unha peza! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Erro de selección - - + + Nothing selected! Nada escolmado! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! O obxecto escolmado non é unha peza! - + Only faces can be picked Sómente se poden coller faces - + Only cylindrical faces can be picked Sómente se poden coller faces cilíndricas @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Lonxitude @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Falla na xeración de malla - + The FEM module is built without NETGEN support. Meshing will not work!!! O módulo FEM está construído sen soporte NETGEN. O xerador de mallas non funcionará!!! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, É preciso crear ou activar unha análise - + Ok Aceptar - + Cancel Cancelar - - - - - - - - + + + + + + + + A dialog is already open in the task panel A dialog is already open in the task panel - - - - - - - - + + + + + + + + Do you want to close this dialog? Do you want to close this dialog? - + Meshing Malla - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Importar-Exportar - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Grupos - + Are you sure you want to continue? Are you sure you want to continue? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Dependencias do obxecto @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_hr.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_hr.ts index 2b659cc93e..a907ed9f8d 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_hr.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_hr.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Ograničenje premještanja + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Ograničenje učvršćeno + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Granično stanje tekučine - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Stvorite granični uvjet fluida na entitetu lica za Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Sila ograničenja + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Ograničenje tlaka + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Ograničenje temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Ograničenje deformacije + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Set čvorova - + Creates a FEM mesh nodes set Stvara skup čvorova FEM mreže - + Wrong selection Pogrešan odabir - + Select a single FEM mesh or nodes set, please. Odaberi jednu FEM mrežu ili set čvorova. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Stvara skup čvorova od polygona - - + + Create node set by Poly Stvori set čvorova sa Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Primijeni promjene na cjevovodu - + Apply changes to parameters directly and not on recompute only... Primijeni promjene na parametre izravno, a ne samo na ponovno izračunavanje... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Filtar odječka regije - + Define/create a clip filter which uses functions to define the clipped region Definiraj/kreiraj filtar isječka koji koristi funkciju kako bi definirao isječenu regiju - + Wrong selection Pogrešan odabir - + Select a pipeline, please. Molimo odaberite sekvencijski cjevovod @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Filtar funkcijskog odreza - + Cut the data along an implicit function Odreži podatke uzduž implicitne funkcije @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Filtar linijskog odsječka - + Define/create a clip filter which clips a field along a line Definiraj/izradi filtar odsječka koji odsjeca polje uzduž linije @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Podaci na točki filtra odsječka - + Define/create a clip filter which clips a field data at point Definiraj/izradi filtar odsječka koji odsjeca polje podataka na točki @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Funkcije filtra - + Functions for use in postprocessing filter... Fukcije za upotrebu kod filtara postprocesiranja... - + Plane Površina - + Sphere Kugla - + Cylinder Valjak - + Box Kutija @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Debljina [mm] - + Stress [MPa] Plot Y-Axis Label Naprezanje [MPa] - + Linearized Stresses Plot title Linearizirana naprezanja - + Membrane Plot legend item label Membrana - + Membrane and Bending Plot legend item label Membrana i savijanje - + Total Plot legend item label Ukupno - - - Fem - Fem - - - - Stress linearization plot - Lineariziran prikaz naprezanja - - - - Define/create stress linearization plots - Definiraj/izradi linearizirani prikaz naprezanja - - - - - Wrong selection - Pogrešan odabir - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Molimo odaberte odsječak koji odsjeca područje NAPREZANJA uzduž linije - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Objavi sekvencijski cijevovod iz rezultata - - - - Creates a post processing pipeline from a result object - Kreira post-procesnu pipeline iz objekta rezultata. - - - - Wrong selection type - Pogrešan tip odabira - - - - Select a result object, please. - Molim odaberite rezultatni objekt - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Skalarni isječak filter - - - - Define/create a clip filter which clips a field with a scalar value - Definiraj/izradi filtar isječka koji odsjeca polje sa skalarnom vrijednosti - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Lineariziran prikaz naprezanja + + + + Define/create stress linearization plots + Definiraj/izradi linearizirani prikaz naprezanja + + + + + Wrong selection + Pogrešan odabir + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Molimo odaberte odsječak koji odsjeca područje NAPREZANJA uzduž linije + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Objavi sekvencijski cijevovod iz rezultata + + + + Creates a post processing pipeline from a result object + Kreira post-procesnu pipeline iz objekta rezultata. + + + + Wrong selection type + Pogrešan tip odabira + + + + Select a result object, please. + Molim odaberite rezultatni objekt + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Skalarni isječak filter + + + + Define/create a clip filter which clips a field with a scalar value + Definiraj/izradi filtar isječka koji odsjeca polje sa skalarnom vrijednosti + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Filtar umotavanja - + Warp the geometry along a vector field by a certain factor Izobličite geometriju duž vektorskog polja određenim faktorom @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Napravite granični uvjet tekućine - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Postavi robota - + Edit nodes set Uredi set čvorova - + Create nodes set Stvori set čvorova - + Create filter Izradi Filtar - + Create function Stvori funkciju - + Create pipeline from result Stvori proces od rezultata - + Edit Mirror Uredi zrcaljenje @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Izradi funkciju ravnine, definiranu ishodištem i normalom - + Create a sphere function, defined by its center and radius Izradi fukciju sfere, definiranu središtem i polumjerom - + Create a cylinder function, defined by its center, axis and radius Izradi fukciju cilindra, definiranu središtem, osi i polumjerom - + Create a box function, defined by its center, length, width and height Izradi fukciju kocke definiranu središtem, dužinom, širinom i visinom @@ -1017,20 +1017,20 @@ Ograničenje donje frekvencije - + File does not exist Datoteka ne postoji - + The specified executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka + The specified executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. @@ -1121,36 +1121,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Napomena:</span> Preporuča se koristiti paran broj jezgri kako bi se iskoristile simetrije mreže. (Korištenje 8 jezgri može biti brže od korištenja 9 jezgri.)<br/><span style=" font-weight:600;">Napomena:</span> U ekstremnim slučajevima, ElmerSolver se možda neće konvergirati ako je broj jezgri previsok.</p></body></html> - + File does not exist Datoteka ne postoji - + The specified executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka + The specified executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Nije prikladno za multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Netočna Elmer postavka: Koristite više od jednog CPU jezgra. Stoga je potreban izvršni program s nastavkom '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Netočna Elmer postavka: Koristite više od jednog CPU jezgra. @@ -1392,20 +1392,20 @@ se dodaje kontejner za analizu Ostavite prazno za korištenje zadane gmsh binarne datoteke - + File does not exist Datoteka ne postoji - + The specified executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka + The specified executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. @@ -1465,82 +1465,6 @@ Objekt FreeCAD rezultata: Uvezeni podaci bit će pretvoreni u FreeCAD FEM objekt - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materijal - - - - Card resources - Biblioteka kartica - - - - The cards built-in to FreeCAD will be listed as available. - Ugrađene kartice u FreeCAD bit će navedene kao dostupne. - - - - Use built-in materials - Koristite ugrađene materijale - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Takođe kartice iz FreeCAD direktorija postavki bit će navedene kao dostupne. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Koristi materijale iz direktorija Materijali u korisničkom direktoriju postavke FreeCAD-a. - - - - Also material cards also from the specified directory -will be listed as available. - Takođe kartice materijala iz navedenog direktorija bit će navedene kao dostupne. - - - - Use materials from user defined directory - Koristite materijale iz korisnički definiranog direktorija - - - - User directory - Korisnički direktorij - - - - Card sorting and duplicates - Sortiranje kartica i duplikati - - - - Duplicate cards will be deleted from the displayed material card list. - Duplikati kartica će biti obrisani sa prikazane liste kartica materijala. - - - - Delete card duplicates - Izbriši duplikate kartice - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Kartice materijala će se pojavljivati sortirane prema bibliotekama kojima pripadaju (lokacijama). -Ako nije označeno, one će biti sortirane po imenima. - - - - Sort by resources - Sortiraj po bibliotekama - - FemGui::DlgSettingsFemMystranImp @@ -1579,20 +1503,20 @@ Ako nije označeno, one će biti sortirane po imenima. Napiši komentare u datoteku unosa - + File does not exist Datoteka ne postoji - + The specified executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka + The specified executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. @@ -1691,34 +1615,34 @@ iterativni rješavač i dobijete poruku o pogrešci da se "MAXKOI" mora povećati - + File does not exist Datoteka ne postoji - + The specified z88r executable '%1' does not exist! Specify another file please. - Navedena z88r izvršna datoteka + The specified z88r executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. - - + + Wrong file Pogrešna datoteka - + You must specify the path to the z88r.exe! Moraš odrediti stazu za ovu z88r.exe! - + You must specify the path to the z88r! Moraš odrediti stazu za ovu z88r! @@ -1742,13 +1666,13 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraint - - + + Input error Pogreška na ulazu - + You must specify at least one reference Morate odabrati najmanje jednu referencu @@ -1756,7 +1680,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintBearing - + Input error Pogreška na ulazu @@ -1764,7 +1688,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintContact - + Input error Pogreška na ulazu @@ -1772,7 +1696,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintDisplacement - + Input error Pogreška na ulazu @@ -1780,7 +1704,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Pogreška na ulazu @@ -1788,13 +1712,13 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintForce - - + + Input error Pogreška na ulazu - + Please specify a force greater than 0 Molimo odredite silu koja je veća od 0 @@ -1802,7 +1726,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintGear - + Input error Pogreška na ulazu @@ -1810,7 +1734,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintHeatflux - + Input error Pogreška na ulazu @@ -1818,8 +1742,8 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Pogreška na ulazu @@ -1827,7 +1751,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintPressure - + Input error Pogreška na ulazu @@ -1835,7 +1759,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintPulley - + Input error Pogreška na ulazu @@ -1843,7 +1767,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintSpring - + Input error Pogreška na ulazu @@ -1851,7 +1775,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintTemperature - + Input error Pogreška na ulazu @@ -1859,7 +1783,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintTransform - + Input error Pogreška na ulazu @@ -1867,12 +1791,12 @@ Navedi drugu datoteku. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Uredi FEM mrežu - + Meshing failure Greška umrežavanja @@ -1880,7 +1804,7 @@ Navedi drugu datoteku. FemGui::TaskDlgPost - + Input error Pogreška na ulazu @@ -1896,12 +1820,12 @@ Navedi drugu datoteku. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Izbriši @@ -1909,42 +1833,42 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Greška odabira - + Please use only a single reference for bearing constraint Molimo koristite samo jednu referencu za ograničenje ležaja - + Only faces can be picked Samo naličja se mogu odabrati - + Only cylindrical faces can be picked Samo cilindrična naličja se mogu odabrati - + Only planar faces can be picked Samo ravna naličja se mogu odabrati - + Only linear edges can be picked Samo pravocrtni rubovi se mogu odabrati - + Only faces and edges can be picked Samo naličja i rubovi se mogu odabrati @@ -1953,77 +1877,77 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintContact - + Delete Izbriši - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Greška odabira - + Only one face in object! - moved to master face Samo jedna površina u objektu! - premještena u glavnu površinu - - + + Only one master face and one slave face for a contact constraint! Samo jedna glavna površina i jedna podređena površina za ograničenje kontakta! - - - - + + + + Nothing selected! Ništa nije odabrano! - + Only one slave face for a contact constraint! Samo jedna podređena površina za ograničenje kontakta! - - - - + + + + Selected object is not a part! Odabrani objekt nije jedan dio! - - + + Only faces can be picked Samo naličja se mogu odabrati - + Only one master for a contact constraint! Samo jedan glavni za ograničenje kontakta! - + Only one master face for a contact constraint! Samo jedna glavna površina za ograničenje kontakta! @@ -2031,28 +1955,28 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2060,28 +1984,28 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2089,128 +2013,128 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintFluidBoundary - + Basic Osnove - + Turbulence Turbulencija - + Thermal Termalno - + select boundary type, faces and set value odaberite vrstu granice, površine i postavite vrijednost - + Intensity [0~1] Intenzitet [0~1] - + Dissipation Rate [m2/s3] Stopa disipacije [m2/s3] - + Length Scale[m] Skala dužine [m] - + Viscosity Ratio [1] Omjer viskoznosti [1] - + Hydraulic Diameter [m] Hidraulički Promjer [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Protok [W/m2] - + Empty selection Prazan odabir - + Select an edge or a face, please. Molim odaberi rub ili plohu. - - - - - + + + + + Wrong selection Pogrešan odabir - + Selected object is not a part object! Odabrani objekt nije jedan dio! - + Only one planar face or edge can be selected! Samo jedna ravan ili rub mogu biti odabrani - + Only planar faces can be picked for 3D Samo ravna naličja se mogu odabrati za 3D - + Only planar edges can be picked for 2D Samo ravna naličja se mogu odabrati za 2D - + Only faces for 3D part or edges for 2D can be picked Samo plohe za 3D dio ili rubovi za 2D mogu se pokupiti - - + - - + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2218,39 +2142,39 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Pogrešan odabir - + Select an edge or a face, please. Molim odaberi rub ili plohu. @@ -2258,24 +2182,24 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintGear - - - + + + Selection error Greška odabira - + Only planar faces can be picked Samo ravna naličja se mogu odabrati - + Only linear edges can be picked Samo pravocrtni rubovi se mogu odabrati - + Only faces and edges can be picked Samo naličja i rubovi se mogu odabrati @@ -2283,30 +2207,30 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - - + + Selection must only consist of faces! Odabrati možete samo plohe! @@ -2314,42 +2238,42 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Greška odabira - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - + Only faces can be picked Samo naličja se mogu odabrati - + Only planar faces can be picked Samo ravna naličja se mogu odabrati @@ -2357,28 +2281,28 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - + Only faces can be picked Samo naličja se mogu odabrati @@ -2386,12 +2310,12 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintPulley - + Pulley diameter Promjer valjka - + Torque [Nm] Obrtna sila [Nm] @@ -2399,28 +2323,28 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - + Only faces can be picked Samo naličja se mogu odabrati @@ -2428,22 +2352,22 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Selected object is not a part! Odabrani objekt nije jedan dio! @@ -2451,64 +2375,64 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Transformabilna lica su se promijenila. Molimo dodajte samo transformabilna lica i uklonite netransformabilna lica! - - - - - - - - - - + + + + + + + + + + Selection error Greška odabira - - + + Nothing selected! Ništa nije odabrano! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Odabrani objekt nije jedan dio! - + Only faces can be picked Samo naličja se mogu odabrati - + Only cylindrical faces can be picked Samo cilindrična naličja se mogu odabrati @@ -2516,7 +2440,7 @@ Navedi drugu datoteku. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2524,7 +2448,7 @@ Navedi drugu datoteku. FemGui::TaskPostClip - + Clip region, choose implicit function Područje isječka, odaberi implicitnu funkciju @@ -2532,7 +2456,7 @@ Navedi drugu datoteku. FemGui::TaskPostCut - + Function cut, choose implicit function Funkcijski rez, odaberi implicitnu funkciju @@ -2540,12 +2464,12 @@ Navedi drugu datoteku. FemGui::TaskPostDataAlongLine - + Data along a line options Opcije za podatke uzduž linije - + Length X-Axis plot label Dužina @@ -2554,12 +2478,12 @@ Navedi drugu datoteku. FemGui::TaskPostDataAtPoint - + Data at point options Opcije za podatke kod točke - + %1 at (%2; %3; %4) is: %5 %6 %1 kod (%2; %3; %4) je: %5 %6 @@ -2567,7 +2491,7 @@ Navedi drugu datoteku. FemGui::TaskPostDisplay - + Result display options Opcije prikaza rezultata @@ -2575,7 +2499,7 @@ Navedi drugu datoteku. FemGui::TaskPostFunction - + Implicit function Implicitna funkcija @@ -2583,7 +2507,7 @@ Navedi drugu datoteku. FemGui::TaskPostScalarClip - + Scalar clip options Opcije skalarnog rezanja @@ -2591,7 +2515,7 @@ Navedi drugu datoteku. FemGui::TaskPostWarpVector - + Warp options Opcije izobličenja @@ -2615,12 +2539,12 @@ Navedi drugu datoteku. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Greška umrežavanja - + The FEM module is built without NETGEN support. Meshing will not work!!! FEM modul je izgrađen bez NETGEN podrške.Putanje mreže (Meshing) neće raditi!!! @@ -3595,46 +3519,45 @@ Napomena: u 2D je moguće samo podešavanje za x Trebate stvoriti ili aktivirati analizu - + Ok "Ok" - + Cancel Otkazati - - - - - - - - + + + + + + + + A dialog is already open in the task panel Dijalog je već otvoren u ploči zadataka - - - - - - - - + + + + + + + + Do you want to close this dialog? Želite li zatvoriti ovaj dijalog? - + Meshing Meshing (Putanje mreže) - @@ -3651,22 +3574,22 @@ Napomena: u 2D je moguće samo podešavanje za x Uvoz / izvoz - + Constraint initial temperature Ograničenje početne temperature - + Constraint pulley Ograničenje kolotura - + Constraint spring Ograničenje opruge - + Edit post processing object Uredi postprocesiranje objekta @@ -3706,62 +3629,62 @@ Napomena: u 2D je moguće samo podešavanje za x Grupe - + Are you sure you want to continue? Jeste li sigurni da želite nastaviti? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Granično stanje tekučine - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4099,7 +4022,7 @@ Za moguće varijable, pogledaj okvir za opis ispod. Std_Delete - + Object dependencies Zavisnosti objekta @@ -5378,20 +5301,20 @@ koristiti za Elmerov rješavač setupFilter - + Error: A filter can only be applied to a single object. Greška: Filter se može primijeniti samo na jedan objekt. - - - + + + The filter could not be set up. Nije moguće postaviti filter. - - + + Error: no post processing object selected. Greška: Nije odabran nijedan objekt za naknadnu obradu @@ -6107,13 +6030,13 @@ Molimo odaberite vrstu rezultata prvo. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6159,17 +6082,17 @@ magnetodinamičke sile CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Elektromagnetne jednadžbe - + Electromagnetic equations for the Elmer solver Elektromagnetne jednadžbe za Elmer alat za rješavanje @@ -6177,17 +6100,17 @@ magnetodinamičke sile CmdFemPostContoursFilter - + Fem Fem - + Contours filter Filter konture - + Define/create a contours filter which displays iso contours Definiraj/stvori filter kontura koji prikazuje ISO konture @@ -6195,7 +6118,7 @@ magnetodinamičke sile FemGui::TaskPostContours - + Contours filter options Opcije filtera kontura @@ -6289,17 +6212,17 @@ magnetodinamičke sile CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mehaničke jednadžbe - + Mechanical equations for the Elmer solver Mehaničke jednadžbe za Elmer alat za rješavanje diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_hu.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_hu.ts index ca800992ef..efc810070b 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_hu.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_hu.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Végeselemes analízis FEM - + Bearing constraint Csapágy kényszerítés - + Creates a bearing constraint Létrehoz egy csapágy kényszerítést @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem - Végeselemes analízis FEM + Végeselemes analízis Vem - + Contact constraint Kapcsolat kényszerítés - + Creates a contact constraint between faces Érintkezési kényszerítést hoz létre a felületek közt @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Végeselemes analízis Vem - - Constraint displacement - Kényszerítés elmozdulása + + Displacement boundary condition + Elmozdulás peremfeltétele - + Creates a displacement boundary condition for a geometric entity Kiszorítási peremfeltételt hoz létre egy geometriai egységhez @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem - Végeselemes analízis Vem + Vem - - Constraint fixed - Kényszerítés rögzített + + Fixed boundary condition + Rögzített peremfeltétel - + Creates a fixed boundary condition for a geometric entity Rögzített peremfeltételt hoz létre egy geometriai egységhez @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem - Vem + Végeselemes analízis Vem - + Fluid boundary condition Folyadékhatár állapota - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Folyadékhatár feltétel létrehozása a felület szerkezeten a Számítógépes áramlástan részére @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Végeselemes analízis Vem - - Constraint force - Kényszerítés erőltetése + + Force load + Erőterhelés - + Creates a force load applied to a geometric entity Létrehoz egy geometriai egységre alkalmazott erőterhelést @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem - Végeselemes analízis Vem + Vem - + Gear constraint Fogaskerék kényszerítés - + Creates a gear constraint Létrehoz egy fogaskerék kényszerítést @@ -130,171 +130,171 @@ CmdFemConstraintHeatflux - + Fem Vem - + Heat flux load Hőáram terhelés - + Creates a heat flux load acting on a face - Creates a heat flux load acting on a face + Egy felületre ható hőáramterhelést hoz létre CmdFemConstraintInitialTemperature - + Fem Vem - + Initial temperature - Initial temperature + Kezdeti hőmérséklet - + Creates an initial temperature acting on a body - Creates an initial temperature acting on a body + Egy testre ható kezdeti hőmérsékletet hoz létre CmdFemConstraintPlaneRotation - + Fem Vem - + Plane multi-point constraint - Plane multi-point constraint + Síkbeli többpontos kényszerítés - + Creates a plane multi-point constraint for a face - Creates a plane multi-point constraint for a face + Síkbeli többpontos kényszerïtést hoz létre egy felülethez CmdFemConstraintPressure - + Fem Vem - - Constraint pressure - Nyomásterhelés + + Pressure load + Nyomás terhelés - + Creates a pressure load acting on a face - Creates a pressure load acting on a face + Egy felületre ható nyomóterhelést hoz létre CmdFemConstraintPulley - + Fem Vem - + Pulley constraint - Pulley constraint + Csigás kényszerítés - + Creates a pulley constraint - Creates a pulley constraint + Csiga kényszerítés létrehozása CmdFemConstraintSpring - + Fem Vem - + Spring - Spring + Rugó - + Creates a spring acting on a face - Creates a spring acting on a face + Egy felületre ható rugót hoz létre CmdFemConstraintTemperature - + Fem Vem - - Constraint temperature - Rögzített hőmérséklet + + Temperature boundary condition + Hőmérséklet határfeltétel - + Creates a temperature/concentrated heat flux load acting on a face - Creates a temperature/concentrated heat flux load acting on a face + Egy felületre ható hőmérséklet/koncentrált hőáram terhelést hoz létre CmdFemConstraintTransform - + Fem Vem - - Constraint transform - Kényszerítés átalakítás + + Local coordinate system + Helyi koordináta rendszer - + Create a local coordinate system on a face - Create a local coordinate system on a face + Helyi koordináta rendszer létrehozása a felületen CmdFemCreateNodesSet - + Fem Vem - + Nodes set Csomópontok beálítása - + Creates a FEM mesh nodes set VEM háló csomópont csoportot hoz lére - + Wrong selection Rossz kijelölés - + Select a single FEM mesh or nodes set, please. Egyetlen VEM háló vagy csomópontok beállítás kiválasztását kérem. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Vem - + Node set by poly Csomópont beállítása sokszög által - - + + Create node set by Poly Csomópont létrehozása Poly-ban @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Vem - + Apply changes to pipeline Változások alkalmazása a folyamatokra - + Apply changes to parameters directly and not on recompute only... Változtatások mentése a paraméterekre közvetlenül és nem csak újraszámolása... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem - Vem + Végeselemes analízis Vem - + Region clip filter Terület kivágási szűrő - + Define/create a clip filter which uses functions to define the clipped region Kivágás szűrő definiálása/létrehozása, amely függvények segítségével határozza meg a vágott régiót - + Wrong selection Rossz kijelölés - + Select a pipeline, please. Kérjük, válasszon ki egy folyamatot. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem - Végeselemes analízis Vem + Vem - + Function cut filter Kivágási szűrő funkció - + Cut the data along an implicit function Az adatok kivágása egy implicit függvény mentén @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Vem - + Line clip filter Vonal kivágó szűrő - + Define/create a clip filter which clips a field along a line Kivágás szűrő definiálása/létrehozása, amely egy mezőt egy vonal mentén vág le @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Vem - + Data at point clip filter Adat a pont kivágó szűrőjén - + Define/create a clip filter which clips a field data at point Kivágó szűrő definiálása/létrehozása, amely pontnál vág egy mezőadatot @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem - Vem + Végeselemes analízis Vem - + Filter functions Szűrési funkciók - + Functions for use in postprocessing filter... Az utófeldolgozási szűrőben használható funkciók... - + Plane Sík - + Sphere Gömb - + Cylinder Henger - + Box Doboz @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Vastagság [mm] - + Stress [MPa] Plot Y-Axis Label Nyomás [MPa] - + Linearized Stresses Plot title Linearizált nyomások - + Membrane Plot legend item label Membrán - + Membrane and Bending Plot legend item label Membrán és hajlítás - + Total Plot legend item label Összesen - - - Fem - Végeselemes analízis Vem - - - - Stress linearization plot - Nyomás linearizációs diagram - - - - Define/create stress linearization plots - Nyomés linearizációs diagramok definiálása/létrehozása - - - - - Wrong selection - Rossz kijelölés - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Kérjük, válasszon ki egy Kivágás szűrőt, amely egy VONAL MENTÉN rögzíti a NYOMÁS mezőt. - - - - CmdFemPostPipelineFromResult - - - Fem - Vem - - - - Post pipeline from result - Folyamat feladása az eredményből - - - - Creates a post processing pipeline from a result object - Utófeldolgozási folyamatot hoz létre egy eredmény tárgyból - - - - Wrong selection type - Hibás kiválasztási típus - - - - Select a result object, please. - Jelöljön ki egy eredmény tárgyat. - - - - CmdFemPostScalarClipFilter - - - Fem - Vem - - - - Scalar clip filter - Skaláris vágószűrő - - - - Define/create a clip filter which clips a field with a scalar value - Vágásszűrő definiálása/hozzáadása, amely skaláris értékkel vágja le a mezőt - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Nyomás linearizációs diagram + + + + Define/create stress linearization plots + Nyomés linearizációs diagramok definiálása/létrehozása + + + + + Wrong selection + Rossz kijelölés + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Kérjük, válasszon ki egy Kivágás szűrőt, amely egy VONAL MENTÉN rögzíti a NYOMÁS mezőt. + + + + CmdFemPostPipelineFromResult + + + Fem + Vem + + + + Post pipeline from result + Folyamat feladása az eredményből + + + + Creates a post processing pipeline from a result object + Utófeldolgozási folyamatot hoz létre egy eredmény tárgyból + + + + Wrong selection type + Hibás kiválasztási típus + + + + Select a result object, please. + Jelöljön ki egy eredmény tárgyat. + + + + CmdFemPostScalarClipFilter + + + Fem + Vem + + + + Scalar clip filter + Skaláris vágószűrő + + + + Define/create a clip filter which clips a field with a scalar value + Vágásszűrő definiálása/hozzáadása, amely skaláris értékkel vágja le a mezőt + + + + CmdFemPostWarpVectorFilter + + + Fem + Végeselemes analízis FEM + + + Warp filter Deformációs vizualizációs szűrő - + Warp the geometry along a vector field by a certain factor Deformálja a geometriát egy vektormező mentén egy bizonyos tényezővel @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Adjon hozzá egy határfeltételt a folyadékhoz - + Make bearing constraint - Make bearing constraint + Csapágyazási kényszerítés készítése - + Make contact constraint on a face - Make contact constraint on a face + Érintkezési kényszerítés készítése egy felületen - + Make displacement boundary condition on face - Make displacement boundary condition on face + Készítsünk elmozdulási peremfeltételt a felületre - + Make fixed boundary condition for geometry - Make fixed boundary condition for geometry + Készítsen rögzített peremfeltételt a geometriához - + Make force load on geometry - Make force load on geometry + Erőterhelés készítése a geometriára - + Make gear constraint - Make gear constraint + Fogaskerék kényszerítés készítése - + Make heat flux load on face - Make heat flux load on face + Hőáram terhelés készítése a felületre - + Make initial temperature condition on body - Make initial temperature condition on body + A test kezdeti hőmérsékleti állapotának beállítása - + Make plane multi-point constraint on face - Make plane multi-point constraint on face + Síkbeli többpontos kényszerítés a felületen - + Make pressure load on face - Make pressure load on face + Nyomás terhelés készítése a felületen - + Make spring on face - Make spring on face + Rugó készítése a felületen - + Make pulley constraint - Make pulley constraint + Csiga kényszerítés készítése - + Make temperature boundary condition on face - Make temperature boundary condition on face + Készítsünk hőmérséklet peremfeltételt a felületre - + Make local coordinate system on face - Make local coordinate system on face + Helyi koordináta rendszer készítése a felületen - + Place robot Robot hozzáadása - + Edit nodes set Csomópontkészlet szerkesztése - + Create nodes set Csomópontkészlet létrehozása - + Create filter Szűrő létrehozása - + Create function Függvény létrehozása - + Create pipeline from result Folyamat létrehozása az eredményből - + Edit Mirror Tükrözés szerkesztése @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Kezdőpont és aktuális pont alapján definiált rétegfüggvény létrehozása - + Create a sphere function, defined by its center and radius Gömbfüggvény létrehozása, amelyet a középpontja és a sugara határoz meg - + Create a cylinder function, defined by its center, axis and radius Hengerfüggvény létrehozása, amelyet a középpontja, tengelye és sugara határoz meg - + Create a box function, defined by its center, length, width and height Hozzon létre egy doboz funkciót, amelyet a középpontja, hossza, szélessége és magassága határoz meg @@ -1017,20 +1017,20 @@ Alacsony frekvenciájú limit - + File does not exist Fájl nem létezik - + The specified executable '%1' does not exist! Specify another file please. - A megadott végrehajtható fájl + The specified executable '%1' - nem létezik! -Kérjük, adjon meg egy másik fájlt. + does not exist! +Specify another file please. @@ -1119,36 +1119,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Megjegyzés:</span> A hálószimmetriák kihasználásához ajánlott páros számú magot használni. (8 mag használata gyorsabb lehet, mint 9 mag.)<br/> <span style=" font-weight:600;">Ez is megjegyzés:</span> Szélsőséges esetekben előfordulhat, hogy az ElmerSolver nem konvergál, ha a magszám túl magas.</p></body></html> - + File does not exist Fájl nem létezik - + The specified executable '%1' does not exist! Specify another file please. - A megadott végrehajtható fájl + The specified executable '%1' - nem létezik! -Kérjük, adjon meg egy másik fájlt. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading VEM Elmer: Nem alkalmas többszálúhoz - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Nem megfelelő Elmer beállítás: Egynél több CPU-magot használ. Ezért szükség van egy végrehajtható fájlra a '_mpi.exe' utótaggal. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Nem megfelelő Elmer beállítás: Egynél több CPU-magot használ. @@ -1217,10 +1217,10 @@ VEM: Csak VEM-elemeket exportálunk. Ez csak olyan éleket jelent, amelyek nem t Every analysis feature and, if there are different materials, material consists of two mesh groups, faces and nodes where the constraint or material is applied. - Mesh groups are exported too. -Every analysis feature and, if there are different materials, -material consists of two mesh groups, faces and nodes where -the constraint or material is applied. + A hálócsoportok is exportálásra kerülnek. +Minden elemzési funkció és, ha vannak különböző anyagok, anyag két hálócsoportból, felületből és csomópontból áll, +ahol +a kényszerítést vagy az anyagot alkalmazzák. @@ -1248,7 +1248,7 @@ the constraint or material is applied. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + Lehetővé teszi az alkalmazás számára az összes megoldó munkakönyvtárainak kezelését (létrehozását, törlését). Használjon ideiglenes könyvtárakat. @@ -1323,13 +1323,13 @@ az utoljára használt párbeszédpanel beállításaival All analysis features are hidden in the model view when the results dialog is opened - All analysis features are hidden in the model view -when the results dialog is opened + Összes elemzési funkció el van rejtve a modell nézetben +az eredmények párbeszédpanel megnyitásakor Hide analysis features when open result dialog - Hide analysis features when open result dialog + Elemzési funkciók elrejtése az eredmény párbeszédpanel megnyitásakor @@ -1382,20 +1382,20 @@ elemzési konténer hozzáadásakor Hagyja üresen az alapértelmezett a Gmsh bináris fájl használatához - + File does not exist Fájl nem létezik - + The specified executable '%1' does not exist! Specify another file please. - A megadott végrehajtható fájl + The specified executable '%1' - nem létezik! -Kérjük, adjon meg egy másik fájlt. + does not exist! +Specify another file please. @@ -1454,83 +1454,6 @@ FreeCAD eredménytárgy: Az importált adatok FreeCAD VEM eredménytárgyá alak FreeCAD eredmény tárgy - - FemGui::DlgSettingsFemMaterialImp - - - Material - Anyag - - - - Card resources - Kártya források - - - - The cards built-in to FreeCAD will be listed as available. - A FreeCAD-be integrált kártyák elérhetőként jelennek meg. - - - - Use built-in materials - Használja a beépített anyagokat - - - - Also cards from FreeCAD's preferences directory will be listed as available. - A FreeCAD felhasználói beállítások könyvtárából származó kártyák is elérhetőként jelennek meg. - - - - Use materials from Materials directory in user's FreeCAD preference directory - A FreeCAD felhasználói beállítások könyvtárában található anyagkönyvtárból származó anyagok használata - - - - Also material cards also from the specified directory -will be listed as available. - A megadott könyvtárból származó anyagkártyák is -elérhetőként jelennek meg. - - - - Use materials from user defined directory - Anyagok használata a felhasználó által megadott könyvtárából - - - - User directory - Felhasználó könyvtár - - - - Card sorting and duplicates - Kártyarendezés és ismétlődések - - - - Duplicate cards will be deleted from the displayed material card list. - A duplikált kártyák törlődnek a megjelenített anyagok listájáról. - - - - Delete card duplicates - Duplikált kártyák törlése - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Az anyagkártyák erőforrásaik (tárolási helyek) szerint vannak rendezve. -Ha le van tiltva, név szerint vannak rendezve. - - - - Sort by resources - Rendezés források szerint - - FemGui::DlgSettingsFemMystranImp @@ -1569,20 +1492,20 @@ Ha le van tiltva, név szerint vannak rendezve. Megjegyzések írása a bemeneti fájlba - + File does not exist Fájl nem létezik - + The specified executable '%1' does not exist! Specify another file please. - A megadott végrehajtható fájl + The specified executable '%1' - nem létezik! -Kérjük, adjon meg egy másik fájlt. + does not exist! +Specify another file please. @@ -1679,34 +1602,34 @@ egy iteratív megoldó használata esetén a "MAXKOI" paraméter értékét növelni kell hibaüzenet jelenik meg. - + File does not exist Fájl nem létezik - + The specified z88r executable '%1' does not exist! Specify another file please. - A megadott z88r végrehajtható + The specified z88r executable '%1' - nem létezik! -Kérjük, adjon meg egy másik fájlt. + does not exist! +Specify another file please. - - + + Wrong file Hibás fájl - + You must specify the path to the z88r.exe! Meg kell adnia a z88r.exe elérési útját! - + You must specify the path to the z88r! Meg kell adnia a z88r elérési útját! @@ -1716,7 +1639,7 @@ Kérjük, adjon meg egy másik fájlt. Nodes set - Csomópontok beálítása + Csomópontok beállítása @@ -1724,19 +1647,19 @@ Kérjük, adjon meg egy másik fájlt. Nodes set - Csomópontok beállítása + Csomópontok beálítása FemGui::TaskDlgFemConstraint - - + + Input error Bemeneti hiba - + You must specify at least one reference Meg kell adnia legalább egy hivatkozást @@ -1744,7 +1667,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintBearing - + Input error Bemeneti hiba @@ -1752,7 +1675,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintContact - + Input error Bemeneti hiba @@ -1760,7 +1683,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintDisplacement - + Input error Bemeneti hiba @@ -1768,7 +1691,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Bemeneti hiba @@ -1776,13 +1699,13 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintForce - - + + Input error Bemeneti hiba - + Please specify a force greater than 0 Kérem adjon meg egy 0-nál nagyobb erőt @@ -1790,7 +1713,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintGear - + Input error Bemeneti hiba @@ -1798,7 +1721,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintHeatflux - + Input error Bemeneti hiba @@ -1806,8 +1729,8 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Bemeneti hiba @@ -1815,7 +1738,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintPressure - + Input error Bemeneti hiba @@ -1823,7 +1746,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintPulley - + Input error Bemeneti hiba @@ -1831,7 +1754,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintSpring - + Input error Bemeneti hiba @@ -1839,7 +1762,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintTemperature - + Input error Bemeneti hiba @@ -1847,7 +1770,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgFemConstraintTransform - + Input error Bemeneti hiba @@ -1855,12 +1778,12 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh VEM háló szerkesztés - + Meshing failure Hálólétrehozás hiba @@ -1868,7 +1791,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskDlgPost - + Input error Bemeneti hiba @@ -1884,12 +1807,12 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraint - + Analysis feature parameters - Analysis feature parameters + Elemzési funkció paraméterei - + Delete Törlés @@ -1897,42 +1820,42 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Kiválasztási hiba - + Please use only a single reference for bearing constraint Kérjük csak egy hivatkozást használjon a csapágy kényszerítéséhez - + Only faces can be picked Csak felületek választhatók ki - + Only cylindrical faces can be picked Csak hengeres felületek választhatóak - + Only planar faces can be picked Csak a síkbeli felületek választhatók ki - + Only linear edges can be picked Csak lineáris élek választhatók ki - + Only faces and edges can be picked Csak a felületek és élek választhatók ki @@ -1941,77 +1864,77 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintContact - + Delete Törlés - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Kiválasztási hiba - + Only one face in object! - moved to master face Csak egy felület a tárgyon! - a fő felületre költözött - - + + Only one master face and one slave face for a contact constraint! Csak egy fő felület és egy másodlagos felület a kényszerítés érintkezéséhez! - - - - + + + + Nothing selected! Semmi sincs kiválasztva! - + Only one slave face for a contact constraint! Csak egy másodlagos felület a kényszerítés érintkezéséhez! - - - - + + + + Selected object is not a part! A kijelölt objektum nem alkotórész! - - + + Only faces can be picked Csak felületek választhatók ki - + Only one master for a contact constraint! Csak egy mester egy érintkezési kényszerhez! - + Only one master face for a contact constraint! Csak egy fő felület a kényszerítés érintkezéséhez! @@ -2019,226 +1942,226 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! - Only one type of selection (vertex,face or edge) per analysis feature allowed! + Elemzési jellemzőnként csak egyféle kijelölés (csúcs, felület vagy él) megengedett! FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! - Only one type of selection (vertex, face or edge) per analysis feature allowed! + Elemzési jellemzőnként csak egyféle kijelölés (csúcs, felület vagy él) megengedett! FemGui::TaskFemConstraintFluidBoundary - + Basic Alapkifejezések - + Turbulence Turbulencia - + Thermal Termikus - + select boundary type, faces and set value válassza ki a szegély típusát, a felületeket és állítsa be az értéket - + Intensity [0~1] Intenzitás [0~1] - + Dissipation Rate [m2/s3] Disszipációs sebesség [m2/s3] - + Length Scale[m] Hosszskála [m] - + Viscosity Ratio [1] Viszkozitási arány [1] - + Hydraulic Diameter [m] Hidraulikus átmérő [m] - - + + Gradient [K/m] Lejtés [K/m] - + Flux [W/m2] Fluxus [W/m2] - + Empty selection Üres kijelölés - + Select an edge or a face, please. Jelöljön ki egy szegélyt vagy felületet. - - - - - + + + + + Wrong selection Rossz kijelölés - + Selected object is not a part object! A kiválasztott tárgy nem egy rész tárgy! - + Only one planar face or edge can be selected! Csak sík felület vagy él választható! - + Only planar faces can be picked for 3D 3D-hez csak sík felületek választhatók ki - + Only planar edges can be picked for 2D A 2D-hez csak sík élek választhatók - + Only faces for 3D part or edges for 2D can be picked Csak a 3D alkatrészek felületei vagy a 2D élei választhatók ki - - + - - + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! - Only one type of selection (vertex, face or edge) per analysis feature allowed! + Elemzési jellemzőnként csak egyféle kijelölés (csúcs, felület vagy él) megengedett! FemGui::TaskFemConstraintForce - - - - + + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! - Only one type of selection (vertex, face or edge) per analysis feature allowed! + Elemzési jellemzőnként csak egyféle kijelölés (csúcs, felület vagy él) megengedett! - - + + Wrong selection Rossz kijelölés - + Select an edge or a face, please. Jelöljön ki egy szegélyt vagy felületet. @@ -2246,24 +2169,24 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintGear - - - + + + Selection error Kiválasztási hiba - + Only planar faces can be picked Csak a síkbeli felületek választhatók ki - + Only linear edges can be picked Csak lineáris élek választhatók ki - + Only faces and edges can be picked Csak a felületek és élek választhatók ki @@ -2271,30 +2194,30 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - - + + Selection must only consist of faces! A kiválasztás csak felületekből állhat! @@ -2302,42 +2225,42 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Kiválasztási hiba - - + + Only one face can be selected for a plane multi-point constraint! - Only one face can be selected for a plane multi-point constraint! + Egy síkbeli többpontos kényszerítéshez csak egy felületet lehet kiválasztani! - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - + Only faces can be picked Csak felületek választhatók ki - + Only planar faces can be picked Csak a síkbeli felületek választhatók ki @@ -2345,28 +2268,28 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - + Only faces can be picked Csak felületek választhatók ki @@ -2374,12 +2297,12 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintPulley - + Pulley diameter Csiga átmérője - + Torque [Nm] Nyomaték [Nm] @@ -2387,28 +2310,28 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - + Only faces can be picked Csak felületek választhatók ki @@ -2416,22 +2339,22 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! @@ -2439,64 +2362,64 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskFemConstraintTransform - + Analysis feature update error - Analysis feature update error + Elemzési funkció frissítési hiba - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Az átalakítható felületek megváltoztak. Kérjük, csak átalakítható felületeket adjon hozzá, és távolítsa el a nem átalakítható felületeket! - - - - - - - - - - + + + + + + + + + + Selection error Kiválasztási hiba - - + + Nothing selected! Semmi sincs kiválasztva! - - + + Only one face for rectangular local coordinate system! - Only one face for rectangular local coordinate system! + Csak egy felület a téglalap alakú helyi koordinátarendszerhez! - + Only one face for local coordinate system! - Only one face for local coordinate system! + Csak egy felület a helyi koordinátarendszerhez! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface + Csak az átalakítható felületek választhatók ki! Először az elmozdulási peremfeltételt alkalmazza a felületre, majd alkalmazza a helyi koordinátarendszert a felületre - - + + Selected object is not a part! A kijelölt objektum nem alkotórész! - + Only faces can be picked Csak felületek választhatók ki - + Only cylindrical faces can be picked Csak hengeres felületek választhatóak @@ -2504,7 +2427,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2512,7 +2435,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskPostClip - + Clip region, choose implicit function Vágási régió, válassza ki az implicit funkciót @@ -2520,7 +2443,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskPostCut - + Function cut, choose implicit function Vágási funkció, implicit funkció kiválasztása @@ -2528,12 +2451,12 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskPostDataAlongLine - + Data along a line options Adatok egy vonal lehetőségek mentén - + Length X-Axis plot label Hossz @@ -2542,12 +2465,12 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskPostDataAtPoint - + Data at point options Adatok a pont lehetőségein - + %1 at (%2; %3; %4) is: %5 %6 %1 a (%2; %3; %4) pontnál: %5 %6 @@ -2555,7 +2478,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskPostDisplay - + Result display options Megjelenítési lehetőségek eredménye @@ -2563,7 +2486,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskPostFunction - + Implicit function Implicit függvény @@ -2571,7 +2494,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskPostScalarClip - + Scalar clip options Skaláris vágási lehetőségek @@ -2579,7 +2502,7 @@ Kérjük, adjon meg egy másik fájlt. FemGui::TaskPostWarpVector - + Warp options Deformációs vizualizációs lehetőségek @@ -2603,12 +2526,12 @@ Kérjük, adjon meg egy másik fájlt. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Hálólétrehozás hiba - + The FEM module is built without NETGEN support. Meshing will not work!!! A Végeselemes módszer VEM modul NETGEN támogatás nélküli. Hálólétrehozás nem fog működni!!! @@ -3059,7 +2982,7 @@ Kérjük, adjon meg egy másik fájlt. Analysis feature properties - Analysis feature properties + Elemzési funkció tulajdonságai @@ -3127,17 +3050,17 @@ harmonikus/rezgő hajtóerővel rendelkező egyenletek esetén Whether the boundary condition defines a constant potential - Whether the boundary condition defines a constant potential + A peremfeltétel meghatároz-e egy rögzített potenciált Whether the boundary condition defines a farfield potential - Whether the boundary condition defines a farfield potential + A peremfeltétel meghatároz-e egy távoli mező potenciálját Whether the boundary condition is for the electric force - Whether the boundary condition is for the electric force + A peremfeltétel az elektromos erőre vonatkozik-e @@ -3580,46 +3503,45 @@ Megjegyzés: 2D esetén csak az x beállítása lehetséges, Létre kell hozni, vagy aktiválni kell egy elemzést - + Ok Ok - + Cancel Mégse - - - - - - - - + + + + + + + + A dialog is already open in the task panel Egy párbeszédablak már nyitva van a feladat panelen - - - - - - - - + + + + + + + + Do you want to close this dialog? Szeretné bezárni a párbeszédpanelt? - + Meshing Hálólétrehozás - @@ -3636,22 +3558,22 @@ Megjegyzés: 2D esetén csak az x beállítása lehetséges, Importálás-Exportálás - + Constraint initial temperature Kezdeti hőmérséklet kényszerítés - + Constraint pulley Szíjtárcsa kötés - + Constraint spring Rugó kötés - + Edit post processing object Utófeldolgozási tárgy szerkesztése @@ -3691,64 +3613,64 @@ Megjegyzés: 2D esetén csak az x beállítása lehetséges, Csoportok - + Are you sure you want to continue? Biztosan folytatja? - + Contact constraint Kapcsolat kényszerítés - + Displacement boundary condition - Displacement boundary condition + Elmozdulás peremfeltétele - + Fixed boundary condition - Fixed boundary condition + Rögzített peremfeltétel - + Fluid boundary condition Folyadékhatár állapota - + Force load - Force load + Erőterhelés - + Heat flux load Hőáram terhelés - + Plane multi-point constraint - Plane multi-point constraint + Síkbeli többpontos kényszerítés - + Pressure load - Pressure load + Nyomás terhelés - + Temperature boundary condition - Temperature boundary condition + Hőmérséklet határfeltétel - + Local coordinate system - Local coordinate system + Helyi koordináta rendszer - + Edit analysis feature - Edit analysis feature + Elemzési tulajdonság szerkesztése @@ -4084,7 +4006,7 @@ A lehetséges változókat lásd az alábbi leírási mezőben. Std_Delete - + Object dependencies Objektumfüggőségek @@ -4099,7 +4021,7 @@ A lehetséges változókat lásd az alábbi leírási mezőben. Analysis features - Analysis features + Elemzési tulajdonságok @@ -4593,7 +4515,7 @@ vektorát használják irányként Task Fem Heat flux Load - Task Fem Heat flux Load + VEM Hőáram terhelés @@ -5237,72 +5159,72 @@ az Elmer megoldóhoz Electrostatic boundary conditions - Electrostatic boundary conditions + Elektrosztatikus peremfeltételek &Electrostatic boundary conditions - &Electrostatic boundary conditions + &Elektrosztatikus peremfeltételek Fluid boundary conditions - Fluid boundary conditions + Folyadékhatár állapotai &Fluid boundary conditions - &Fluid boundary conditions + &Folyadékhatár állapotai Electromagnetic boundary conditions - Electromagnetic boundary conditions + Elektromágneses peremfeltételek &Electromagnetic boundary conditions - &Electromagnetic boundary conditions + &Elektromágneses peremfeltételek Geometrical analysis features - Geometrical analysis features + Geometriai elemzés jellemzői &Geometrical analysis features - &Geometrical analysis features + &Geometriai elemzés jellemzői Mechanical boundary conditions and loads - Mechanical boundary conditions and loads + Mechanikai peremfeltételek és terhelések &Mechanical boundary conditions and loads - &Mechanical boundary conditions and loads + &Mechanikai peremfeltételek és terhelések Thermal boundary conditions and loads - Thermal boundary conditions and loads + Termikus peremfeltételek és terhelések &Thermal boundary conditions and loads - &Thermal boundary conditions and loads + &Termikus peremfeltételek és terhelések Analysis features without solver - Analysis features without solver + Elemzési funkciók megoldó nélkül &Analysis features without solver - &Analysis features without solver + &Elemzési funkciók megoldó nélkül @@ -5363,20 +5285,20 @@ az Elmer megoldóhoz setupFilter - + Error: A filter can only be applied to a single object. Hiba: Egy szűrő csak egyetlen tárgyra alkalmazható. - - - + + + The filter could not be set up. A szűrőt nem sikerült beállítani. - - + + Error: no post processing object selected. Hiba: nincs kijelölve tárgy utófeldolgozásra. @@ -5417,7 +5339,7 @@ az Elmer megoldóhoz Removes all clipping planes - Removes all clipping planes + Eltávolítja az összes vágósíkot @@ -5575,7 +5497,7 @@ az Elmer megoldóhoz Opens the FEM examples - Opens the FEM examples + Megnyitja a Véges elemes módszer példákat @@ -5653,7 +5575,7 @@ az Elmer megoldóhoz Converts the surface of a FEM mesh to a mesh - Converts the surface of a FEM mesh to a mesh + Egy VEM háló felületet átalakítja egy hálóvá @@ -5679,7 +5601,7 @@ az Elmer megoldóhoz Clears the Mesh of a FEM mesh object - Clears the Mesh of a FEM mesh object + Törli a VEM hálóobjektum hálóját @@ -5692,7 +5614,7 @@ az Elmer megoldóhoz Displays FEM mesh information - Displays FEM mesh information + Megjeleníti a VEM háló adatait @@ -5705,7 +5627,7 @@ az Elmer megoldóhoz Creates a FEM mesh from a shape by Gmsh mesher - Creates a FEM mesh from a shape by Gmsh mesher + Létrehoz egy VEM hálót egy GMSH hálózó alakzatából @@ -5731,7 +5653,7 @@ az Elmer megoldóhoz Creates a FEM mesh from a solid or face shape by Netgen internal mesher - Creates a FEM mesh from a solid or face shape by Netgen internal mesher + Létrehoz egy VEM hálót egy test vagy felület alapján Netgen belső hálózó generátorral @@ -6091,15 +6013,15 @@ Kérjük, először válassza ki az eredmény típusát. CmdFemCompEmConstraints - + Fem Végeselemes analízis FEM - - + + Electromagnetic boundary conditions - Electromagnetic boundary conditions + Elektromágneses peremfeltételek @@ -6142,17 +6064,17 @@ Kérjük, először válassza ki az eredmény típusát. CmdFemCompEmEquations - + Fem Végeselemes analízis FEM - + Electromagnetic equations Elektromagnetikus egyenlet - + Electromagnetic equations for the Elmer solver Elektromágneses egyenletek az Elmer megoldóhoz @@ -6160,17 +6082,17 @@ Kérjük, először válassza ki az eredmény típusát. CmdFemPostContoursFilter - + Fem Végeselemes analízis FEM - + Contours filter Kontúr szűrő - + Define/create a contours filter which displays iso contours Kontúrszűrő definiálása/készítése, amely az iso kontúrokat jeleníti meg @@ -6178,7 +6100,7 @@ Kérjük, először válassza ki az eredmény típusát. FemGui::TaskPostContours - + Contours filter options Kintúr szűrő lehetőségek @@ -6272,17 +6194,17 @@ Kérjük, először válassza ki az eredmény típusát. CmdFemCompMechEquations - + Fem Végeselemes analízis FEM - + Mechanical equations Mechanikai egyenletek - + Mechanical equations for the Elmer solver Mechanikai egyenletek az Elmer megoldóhoz @@ -6305,12 +6227,12 @@ Kérjük, először válassza ki az eredmény típusát. Body heat source - Body heat source + Test hőforrás Creates a body heat source - Creates a body heat source + Létrehoz egy test hőforrást @@ -6318,12 +6240,12 @@ Kérjük, először válassza ki az eredmény típusát. Centrifugal load - Centrifugal load + Centrifugális terhelés Creates a centrifugal load - Creates a centrifugal load + Centrifugális terhelést hoz létre @@ -6331,12 +6253,12 @@ Kérjük, először válassza ki az eredmény típusát. Current density boundary condition - Current density boundary condition + Áramsűrűség határfeltétel Creates a current density boundary condition - Creates a current density boundary condition + Létrehoz egy áramsűrűség határfeltételt @@ -6344,12 +6266,12 @@ Kérjük, először válassza ki az eredmény típusát. Electrostatic potential boundary condition - Electrostatic potential boundary condition + Elektrosztatikus potenciál peremfeltétel Creates an electrostatic potential boundary condition - Creates an electrostatic potential boundary condition + Létrehoz egy elektrosztatikus potenciál peremfeltételt @@ -6357,12 +6279,12 @@ Kérjük, először válassza ki az eredmény típusát. Flow velocity boundary condition - Flow velocity boundary condition + Áramlási sebesség peremfeltétel Creates a flow velocity boundary condition - Creates a flow velocity boundary condition + Létrehoz egy áramlási sebesség peremfeltételt @@ -6370,12 +6292,12 @@ Kérjük, először válassza ki az eredmény típusát. Initial flow velocity condition - Initial flow velocity condition + Kezdeti áramlási sebesség feltétele Creates initial flow velocity condition - Creates initial flow velocity condition + Létrehoz egy kezdeti áramlási sebesség feltételt @@ -6383,12 +6305,12 @@ Kérjük, először válassza ki az eredmény típusát. Initial pressure condition - Initial pressure condition + Kezdeti nyomásállapot Creates an initial pressure condition - Creates an initial pressure condition + Létrehoz egy kezdeti nyomásállapotot @@ -6396,12 +6318,12 @@ Kérjük, először válassza ki az eredmény típusát. Magnetization boundary condition - Magnetization boundary condition + Mágnesezettségi peremfeltétel Creates a magnetization boundary condition - Creates a magnetization boundary condition + Létrehoz egy mágnesezettségi peremfeltételt @@ -6409,12 +6331,12 @@ Kérjük, először válassza ki az eredmény típusát. Section print feature - Section print feature + Szakasznyomtatási tulajdonság Creates a section print feature - Creates a section print feature + Létrehoz egy szakasznyomtatási tulajdonságot @@ -6422,12 +6344,12 @@ Kérjük, először válassza ki az eredmény típusát. Gravity load - Gravity load + Gravitációs terhelés Creates a gravity load - Creates a gravity load + Létrehoz egy gravitációs terhelést @@ -6435,12 +6357,12 @@ Kérjük, először válassza ki az eredmény típusát. Tie constraint - Tie constraint + Kötési kényszerítés Creates a tie constraint - Creates a tie constraint + Létrehoz egy kötési kényszerítést diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_id.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_id.ts index 404a3d2105..45bf324a80 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_id.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_id.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Kendala kekuatan + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Node ditetapkan - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Pilihan salah - + Select a single FEM mesh or nodes set, please. Pilih mesh FEM tunggal atau simpul yang disetel. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Buat simpul yang ditetapkan oleh Poli @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Pilihan salah - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Pesawat - + Sphere Lingkup - + Cylinder Silinder - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Thickness [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membran dan Lentur - + Total Plot legend item label Total - - - Fem - Fem - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Pilihan salah - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Pilihan salah + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Edit Mirror @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Batas frekuensi rendah - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Bahan - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Gunakan bahan built-in - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Gunakan bahan dari direktori yang ditentukan pengguna - - - - User directory - Direktori pengguna - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Input error - + You must specify at least one reference Anda harus menentukan setidaknya satu referensi @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Input error @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Input error @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Input error @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Input error @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Input error - + Please specify a force greater than 0 Tolong tentukan gaya yang lebih besar dari 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Input error @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Input error @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Input error @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Input error @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Input error @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Input error @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Input error @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Input error @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Edit FEM mesh - + Meshing failure Meshing kegagalan @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Input error @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Menghapus @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Kesalahan seleksi - + Please use only a single reference for bearing constraint Tolong gunakan hanya satu referensi untuk kendala bantalan - + Only faces can be picked Hanya wajah yang bisa dipetik - + Only cylindrical faces can be picked Hanya wajah silindris yang bisa dipetik - + Only planar faces can be picked Hanya planar wajah dapat terpilih - + Only linear edges can be picked Hanya linear ujung-ujungnya dapat terpilih - + Only faces and edges can be picked Hanya wajah dan ujung-ujungnya dapat terpilih @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Menghapus - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Kesalahan seleksi - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Tidak ada yang terpilih! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - - + + Only faces can be picked Hanya wajah yang bisa dipetik - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Pilihan salah - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Pilihan salah - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Kesalahan seleksi - + Only planar faces can be picked Hanya planar wajah dapat terpilih - + Only linear edges can be picked Hanya linear ujung-ujungnya dapat terpilih - + Only faces and edges can be picked Hanya wajah dan ujung-ujungnya dapat terpilih @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Kesalahan seleksi - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - + Only faces can be picked Hanya wajah yang bisa dipetik - + Only planar faces can be picked Hanya planar wajah dapat terpilih @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - + Only faces can be picked Hanya wajah yang bisa dipetik @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Diameter katrol - + Torque [Nm] Torsi [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - + Only faces can be picked Hanya wajah yang bisa dipetik @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Kesalahan seleksi - - + + Nothing selected! Tidak ada yang terpilih! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Objek yang dipilih bukan bagiannya! - + Only faces can be picked Hanya wajah yang bisa dipetik - + Only cylindrical faces can be picked Hanya wajah silindris yang bisa dipetik @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName Nama objek tugas @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Panjangnya @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Meshing kegagalan - + The FEM module is built without NETGEN support. Meshing will not work!!! Modul FEM dibangun tanpa dukungan NETGEN. Meshing tidak akan bekerja!!! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, Anda perlu membuat atau mengaktifkan Analisis - + Ok Oke - + Cancel Membatalkan - - - - - - - - + + + + + + + + A dialog is already open in the task panel A dialog is already open in the task panel - - - - - - - - + + + + + + + + Do you want to close this dialog? Do you want to close this dialog? - + Meshing Meshing - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Ekspor Impor - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Groups - + Are you sure you want to continue? Apakah yakin ingin melanjutkan? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Objek dependensi @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_it.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_it.ts index 0b574f8a37..d18a4afce7 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_it.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_it.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Vincolo del cuscinetto - + Creates a bearing constraint Crea un vincolo cuscinetto @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Vincolo contatto - + Creates a contact constraint between faces Crea un vincolo di contatto tra le facce @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Spostamento dei vincoli + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Vincolo fisso + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Vincolo forza + + Force load + Force load - + Creates a force load applied to a geometric entity Crea una forza di carico applicata a un'entità geometrica @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Vincolo dell'ingranaggio - + Creates a gear constraint Crea vincolo ingranaggio @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Temperatura iniziale - + Creates an initial temperature acting on a body Crea una temperatura iniziale che agisce su un corpo @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Vincolo piano multipunto - + Creates a plane multi-point constraint for a face Crea un vincolo piano multi-punto per una faccia @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Vincolo di pressione + + Pressure load + Pressure load - + Creates a pressure load acting on a face Crea un carico di pressione che agisce su una faccia @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Vincolo puleggia - + Creates a pulley constraint Crea un vincolo puleggia @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Molla - + Creates a spring acting on a face Crea una molla che agisce su una faccia @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Vincolo temperatura + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Crea un carico di flusso termico concentrato che agisce su una faccia @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Vincolo trasformazione + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Crea un sistema di coordinate locali su una faccia @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Serie di nodi - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Selezione errata - + Select a single FEM mesh or nodes set, please. Selezionare una mesh FEM o un set di nodi, per favore. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Crea un set di nodi @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Applica le modifiche alla pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Selezione errata - + Select a pipeline, please. Selezionare una pipeline, per favore. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Function cut filter - + Cut the data along an implicit function Taglia i dati lungo una funzione implicita @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Funzioni di filtro - + Functions for use in postprocessing filter... Funzioni per l'uso nel filtro di post-elaborazione... - + Plane Piano - + Sphere Sfera - + Cylinder Cilindro - + Box Parallelepipedo @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Spessore [mm] - + Stress [MPa] Plot Y-Axis Label Sforzo [MPa] - + Linearized Stresses Plot title Sollecitazioni linearizzate - + Membrane Plot legend item label Membrana - + Membrane and Bending Plot legend item label Membrana e piegatura - + Total Plot legend item label Totale - - - Fem - Fem - - - - Stress linearization plot - Grafico di linearizzazione dello stress - - - - Define/create stress linearization plots - Definisci/crea grafici di linearizzazione dello stress - - - - - Wrong selection - Selezione errata - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Crea una pipeline di post-elaborazione da un oggetto risultato - - - - Wrong selection type - Tipo di selezione errato - - - - Select a result object, please. - Per favore seleziona un oggetto risultato - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Grafico di linearizzazione dello stress + + + + Define/create stress linearization plots + Definisci/crea grafici di linearizzazione dello stress + + + + + Wrong selection + Selezione errata + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Crea una pipeline di post-elaborazione da un oggetto risultato + + + + Wrong selection type + Tipo di selezione errato + + + + Select a result object, please. + Per favore seleziona un oggetto risultato + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Crea vincolo cuscinetto - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Crea molla su faccia - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Posiziona robot - + Edit nodes set Modifica insieme di nodi - + Create nodes set Crea insieme di nodi - + Create filter Crea filtro - + Create function Crea una funzione. - + Create pipeline from result Crea pipeline dal risultato - + Edit Mirror Modifica specchio @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Crea una funzione piano, definita dalla sua origine e una normale al piano - + Create a sphere function, defined by its center and radius Crea una funzione di sfera, definita dal suo centro e raggio - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,20 +1017,20 @@ Limite di bassa frequenza - + File does not exist Il file non esiste - + The specified executable '%1' does not exist! Specify another file please. - L'eseguibile specificato + The specified executable '%1' - non esiste! -Specificare un altro file, per favore. + does not exist! +Specify another file please. @@ -1119,36 +1119,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Nota:</span> Si consiglia di utilizzare un numero pari di core per beneficiare delle simmetrie mesh. (Utilizzando 8 core può essere più veloce di 9 core.<br/><span style=" font-weight:600;">Nota anche:</span> In casi estremi ElmerSolver potrebbe non convergere se il numero di core è troppo alto.</p></body></html> - + File does not exist Il file non esiste - + The specified executable '%1' does not exist! Specify another file please. - L'eseguibile specificato + The specified executable '%1' - non esiste! -Specificare un altro file, per favore. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Non adatto per multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Impostazione Elmer errata: Si utilizza più di un core della CPU. Pertanto è richiesto un eseguibile con il suffisso '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Impostazione Elmer errata: Si utilizza più di un core della CPU. @@ -1385,20 +1385,20 @@ adding an analysis container Lascia vuoto per usare il file binario predefinito di gmsh - + File does not exist Il file non esiste - + The specified executable '%1' does not exist! Specify another file please. - L'eseguibile specificato + The specified executable '%1' - non esiste! -Specificare un altro file, per favore. + does not exist! +Specify another file please. @@ -1462,83 +1462,6 @@ esportati da FreeCAD. Oggetto risultato FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materiale - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Utilizza materiali incorporati - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Utilizza i materiali da una directory definita dall'utente - - - - User directory - Directory dell'utente - - - - Card sorting and duplicates - Ordinamento e duplicati della carta - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Elimina duplicati della carta - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Ordina per risorse - - FemGui::DlgSettingsFemMystranImp @@ -1577,20 +1500,20 @@ If unchecked, they will be sorted by their name. Scrivere commenti sul file di input - + File does not exist Il file non esiste - + The specified executable '%1' does not exist! Specify another file please. - L'eseguibile specificato + The specified executable '%1' - non esiste! -Specificare un altro file, per favore. + does not exist! +Specify another file please. @@ -1689,34 +1612,34 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist Il file non esiste - + The specified z88r executable '%1' does not exist! Specify another file please. - L'eseguibile z88r specificato + The specified z88r executable '%1' - non esiste! -Specificare un altro file, per favore. + does not exist! +Specify another file please. - - + + Wrong file File errato - + You must specify the path to the z88r.exe! È necessario specificare il percorso a z88r.exe! - + You must specify the path to the z88r! Devi specificare il percorso dello z88r! @@ -1740,13 +1663,13 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraint - - + + Input error Errore di input - + You must specify at least one reference È necessario specificare almeno un riferimento @@ -1754,7 +1677,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintBearing - + Input error Errore di input @@ -1762,7 +1685,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintContact - + Input error Errore di input @@ -1770,7 +1693,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintDisplacement - + Input error Errore di input @@ -1778,7 +1701,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Errore di input @@ -1786,13 +1709,13 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintForce - - + + Input error Errore di input - + Please specify a force greater than 0 Specificare una forza maggiore di 0 @@ -1800,7 +1723,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintGear - + Input error Errore di input @@ -1808,7 +1731,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintHeatflux - + Input error Errore di input @@ -1816,8 +1739,8 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Errore di input @@ -1825,7 +1748,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintPressure - + Input error Errore di input @@ -1833,7 +1756,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintPulley - + Input error Errore di input @@ -1841,7 +1764,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintSpring - + Input error Errore di input @@ -1849,7 +1772,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintTemperature - + Input error Errore di input @@ -1857,7 +1780,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgFemConstraintTransform - + Input error Errore di input @@ -1865,12 +1788,12 @@ Specificare un altro file, per favore. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Modifica mesh FEM - + Meshing failure Errore di meshing @@ -1878,7 +1801,7 @@ Specificare un altro file, per favore. FemGui::TaskDlgPost - + Input error Errore di input @@ -1894,12 +1817,12 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Elimina @@ -1907,42 +1830,42 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Errore di selezione - + Please use only a single reference for bearing constraint Utilizzare soltanto un singolo riferimento per il vincolo cuscinetto - + Only faces can be picked Si possono selezionare solo le facce - + Only cylindrical faces can be picked Si possono selezionare solo le superfici cilindriche - + Only planar faces can be picked Si possono selezionare solo le superfici piane - + Only linear edges can be picked Si possono selezionare solo i bordi rettilinei - + Only faces and edges can be picked Si possono selezionare solo le superfici e i bordi @@ -1951,77 +1874,77 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintContact - + Delete Elimina - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Errore di selezione - + Only one face in object! - moved to master face Solo una faccia nell'oggetto! - spostata nella faccia principale - - + + Only one master face and one slave face for a contact constraint! Solo una faccia principale e una faccia secondaria per un vincolo di contatto! - - - - + + + + Nothing selected! Nessuna selezione! - + Only one slave face for a contact constraint! Solo una faccia secondaria per un vincolo di contatto! - - - - + + + + Selected object is not a part! L'oggetto selezionato non è una parte! - - + + Only faces can be picked Si possono selezionare solo le facce - + Only one master for a contact constraint! Solo un master per un vincolo di contatto! - + Only one master face for a contact constraint! Solo una faccia principale per un vincolo di contatto! @@ -2029,28 +1952,28 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintFluidBoundary - + Basic Base - + Turbulence Turbolenza - + Thermal Termico - + select boundary type, faces and set value seleziona tipo di limite, facce e imposta valore - + Intensity [0~1] Intensità [0~1] - + Dissipation Rate [m2/s3] Tasso di dissipazione [m2/s3] - + Length Scale[m] Scala di lunghezza[m] - + Viscosity Ratio [1] Rapporto viscosità [1] - + Hydraulic Diameter [m] Diametro idraulico [m] - - + + Gradient [K/m] Gradiente [K/m] - + Flux [W/m2] Flusso [W/m2] - + Empty selection Selezione vuota - + Select an edge or a face, please. Selezionare un bordo o una faccia, per favore. - - - - - + + + + + Wrong selection Selezione errata - + Selected object is not a part object! L'oggetto selezionato non è un oggetto parte! - + Only one planar face or edge can be selected! Solo una faccia piana o un bordo può essere selezionato! - + Only planar faces can be picked for 3D Solo le facce piane possono essere selezionate per 3D - + Only planar edges can be picked for 2D Si possono selezionare solo i bordi planari per il 2D - + Only faces for 3D part or edges for 2D can be picked Solo le facce per la parte 3D o i bordi per 2D possono essere scelti - - + - - + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Selezione errata - + Select an edge or a face, please. Selezionare un bordo o una faccia, per favore. @@ -2256,24 +2179,24 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintGear - - - + + + Selection error Errore di selezione - + Only planar faces can be picked Si possono selezionare solo le superfici piane - + Only linear edges can be picked Si possono selezionare solo i bordi rettilinei - + Only faces and edges can be picked Si possono selezionare solo le superfici e i bordi @@ -2281,30 +2204,30 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - - + + Selection must only consist of faces! La selezione deve contenere solo facce! @@ -2312,42 +2235,42 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Errore di selezione - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - + Only faces can be picked Si possono selezionare solo le facce - + Only planar faces can be picked Si possono selezionare solo le superfici piane @@ -2355,28 +2278,28 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - + Only faces can be picked Si possono selezionare solo le facce @@ -2384,12 +2307,12 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintPulley - + Pulley diameter Diametro puleggia - + Torque [Nm] Coppia [Nm] @@ -2397,28 +2320,28 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - + Only faces can be picked Si possono selezionare solo le facce @@ -2426,22 +2349,22 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Selected object is not a part! L'oggetto selezionato non è una parte! @@ -2449,64 +2372,64 @@ Specificare un altro file, per favore. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Le facce trasformabili sono cambiate. Aggiungi solo le facce trasformabili e rimuovi le facce non trasformabili! - - - - - - - - - - + + + + + + + + + + Selection error Errore di selezione - - + + Nothing selected! Nessuna selezione! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! L'oggetto selezionato non è una parte! - + Only faces can be picked Si possono selezionare solo le facce - + Only cylindrical faces can be picked Si possono selezionare solo le superfici cilindriche @@ -2514,7 +2437,7 @@ Specificare un altro file, per favore. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2522,7 +2445,7 @@ Specificare un altro file, per favore. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specificare un altro file, per favore. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specificare un altro file, per favore. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Lunghezza @@ -2552,12 +2475,12 @@ Specificare un altro file, per favore. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 a (%2; %3; %4) è: %5 %6 @@ -2565,7 +2488,7 @@ Specificare un altro file, per favore. FemGui::TaskPostDisplay - + Result display options Opzioni di visualizzazione dei risultati @@ -2573,7 +2496,7 @@ Specificare un altro file, per favore. FemGui::TaskPostFunction - + Implicit function Funzione implicita @@ -2581,7 +2504,7 @@ Specificare un altro file, per favore. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specificare un altro file, per favore. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specificare un altro file, per favore. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Errore di meshing - + The FEM module is built without NETGEN support. Meshing will not work!!! Il modulo FEM è costruito senza il supporto di NETGEN. Mesh non funzionerà!!! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, È necessario creare o attivare un'analisi - + Ok Ok - + Cancel Annulla - - - - - - - - + + + + + + + + A dialog is already open in the task panel Nel pannello azioni c'è già una finestra di dialogo aperta - - - - - - - - + + + + + + + + Do you want to close this dialog? Vuoi chiudere questa finestra di dialogo? - + Meshing Meshing - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Importa/Esporta - + Constraint initial temperature Vincolo temperatura iniziale - + Constraint pulley Constraint pulley - + Constraint spring Vincolo molla - + Edit post processing object Modificare oggetto post processing @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Gruppi - + Are you sure you want to continue? Sei sicuro di voler continuare? - + Contact constraint Vincolo contatto - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Vincolo piano multipunto - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ Per le variabili possibili, vedere la casella di descrizione qui sotto. Std_Delete - + Object dependencies Dipendenze dell'oggetto @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Errore: Un filtro può essere applicato solo a un singolo oggetto. - - - + + + The filter could not be set up. Il filtro non può essere impostato. - - + + Error: no post processing object selected. Errore: nessun oggetto di post elaborazione selezionato. @@ -6102,13 +6024,13 @@ Per favore seleziona prima un tipo di risultato. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Per favore seleziona prima un tipo di risultato. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Equazioni elettromagnetiche - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Per favore seleziona prima un tipo di risultato. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Per favore seleziona prima un tipo di risultato. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Per favore seleziona prima un tipo di risultato. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_ja.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_ja.ts index 2f4248d78a..45c8675d50 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_ja.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_ja.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem 有限要素法 - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem 有限要素法 - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem 有限要素法 - - Constraint displacement - 変位拘束 + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem 有限要素法 - - Constraint fixed - 固定拘束 + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem 有限要素法 - + Fluid boundary condition 流体境界条件 - + Create fluid boundary condition on face entity for Computional Fluid Dynamics 数値流体力学のための面エンティティに対する流体境界条件を作成 @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem 有限要素法 - - Constraint force - 拘束力 + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem 有限要素法 - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem 有限要素法 - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem 有限要素法 - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem 有限要素法 - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem 有限要素法 - - Constraint pressure - 圧力拘束 + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem 有限要素法 - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem 有限要素法 - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem 有限要素法 - - Constraint temperature - 温度拘束 + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem 有限要素法 - - Constraint transform - 変換拘束 + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem 有限要素法 - + Nodes set 節点セット - + Creates a FEM mesh nodes set FEMメッシュ節点セットを作成 - + Wrong selection 誤った選択 - + Select a single FEM mesh or nodes set, please. 単一のFEMメッシュまたは節点セットを選択してください。 @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem 有限要素法 - + Node set by poly ポリゴンによる節点セット - - + + Create node set by Poly ポリゴンから節点セットを作成 @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem 有限要素法 - + Apply changes to pipeline パイプラインに変更を適用 - + Apply changes to parameters directly and not on recompute only... 再計算時以外も、パラメーターに変更を直接適用します... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem 有限要素法 - + Region clip filter 領域クリップフィルター - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection 誤った選択 - + Select a pipeline, please. パイプラインを選択してください。 @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem 有限要素法 - + Function cut filter 関数カットフィルター - + Cut the data along an implicit function 陰関数に従ってデータを切り出し @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem 有限要素法 - + Line clip filter 直線クリップフィルター - + Define/create a clip filter which clips a field along a line 直線に沿って場の値をクリップするクリップフィルターを定義/作成 @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem 有限要素法 - + Data at point clip filter 点データクリップフィルター - + Define/create a clip filter which clips a field data at point 点位置での場の値をクリップするクリップフィルターを定義/作成 @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem 有限要素法 - + Filter functions フィルター関数 - + Functions for use in postprocessing filter... ポスト処理フィルターで使用する関数... - + Plane 平面 - + Sphere 球体 - + Cylinder 円柱 - + Box 立方体 @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label 厚み [mm] - + Stress [MPa] Plot Y-Axis Label 圧力 [MPa] - + Linearized Stresses Plot title 線形化圧力 - + Membrane Plot legend item label 薄膜 - + Membrane and Bending Plot legend item label 膜と曲げ - + Total Plot legend item label 合計 - - - Fem - 有限要素法 - - - - Stress linearization plot - 応力線形化プロット - - - - Define/create stress linearization plots - 応力線形化プロットの定義/作成 - - - - - Wrong selection - 誤った選択 - - - - - Select a Clip filter which clips a STRESS field along a line, please. - 直線に沿って圧力場をクリップするクリップフィルターを選択してください。 - - - - CmdFemPostPipelineFromResult - - - Fem - 有限要素法 - - - - Post pipeline from result - 結果によるポスト処理パイプライン - - - - Creates a post processing pipeline from a result object - 結果オブジェクトからポスト処理パイプラインを作成 - - - - Wrong selection type - 間違った選択タイプ - - - - Select a result object, please. - 結果オブジェクトを選択してください。 - - - - CmdFemPostScalarClipFilter - - - Fem - 有限要素法 - - - - Scalar clip filter - スカラークリップフィルター - - - - Define/create a clip filter which clips a field with a scalar value - スカラー値の場をクリップするクリップフィルターを定義/作成 - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + 応力線形化プロット + + + + Define/create stress linearization plots + 応力線形化プロットの定義/作成 + + + + + Wrong selection + 誤った選択 + + + + + Select a Clip filter which clips a STRESS field along a line, please. + 直線に沿って圧力場をクリップするクリップフィルターを選択してください。 + + + + CmdFemPostPipelineFromResult + + + Fem + 有限要素法 + + + + Post pipeline from result + 結果によるポスト処理パイプライン + + + + Creates a post processing pipeline from a result object + 結果オブジェクトからポスト処理パイプラインを作成 + + + + Wrong selection type + 間違った選択タイプ + + + + Select a result object, please. + 結果オブジェクトを選択してください。 + + + + CmdFemPostScalarClipFilter + + + Fem + 有限要素法 + + + + Scalar clip filter + スカラークリップフィルター + + + + Define/create a clip filter which clips a field with a scalar value + スカラー値の場をクリップするクリップフィルターを定義/作成 + + + + CmdFemPostWarpVectorFilter + + + Fem + 有限要素法 + + + Warp filter たわみフィルター - + Warp the geometry along a vector field by a certain factor ベクトル場に従って一定の係数でジオメトリーをたわめる @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition 流体境界条件を作成 - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot ロボットを配置 - + Edit nodes set 節点セットを編集 - + Create nodes set 節点セットを作成 - + Create filter フィルターを作成 - + Create function 関数を作成 - + Create pipeline from result 結果からパイプラインを作成 - + Edit Mirror ミラーを編集 @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal 原点と法線で定義された平面関数を作成 - + Create a sphere function, defined by its center and radius 中心点と半径で定義された球関数を作成 - + Create a cylinder function, defined by its center, axis and radius 中心点、軸、半径で定義された円筒関数を作成 - + Create a box function, defined by its center, length, width and height 中心、奥行き、幅、高さで定義された直方体関数を作成 @@ -1017,20 +1017,20 @@ 低周波数制限 - + File does not exist ファイルが存在しません。 - + The specified executable '%1' does not exist! Specify another file please. - 指定された実行可能ファイル + The specified executable '%1' - が存在しません! -別のファイルを指定してください。 + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">注意:</span> メッシュの対称性上有利なため偶数のコア数を使用することを推奨します(8コア使用の方が9コアよりも早くなる可能性があります)。<br/><span style=" font-weight:600;">注意:</span>極端な場合にはコア数が多すぎると ElmerSolver が収束しないことがあります。</p></body></html> - + File does not exist ファイルが存在しません。 - + The specified executable '%1' does not exist! Specify another file please. - 指定された実行可能ファイル + The specified executable '%1' - が存在しません! -別のファイルを指定してください。 + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: マルチスレッドには適していません。 - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1381,20 +1381,20 @@ adding an analysis container デフォルトの gmsh バイナリファイルを使用する場合は入力なし - + File does not exist ファイルが存在しません。 - + The specified executable '%1' does not exist! Specify another file please. - 指定された実行可能ファイル + The specified executable '%1' - が存在しません! -別のファイルを指定してください。 + does not exist! +Specify another file please. @@ -1453,82 +1453,6 @@ FreeCAD 結果オブジェクト: インポートされたデータは FreeCAD F FreeCAD結果オブジェクト - - FemGui::DlgSettingsFemMaterialImp - - - Material - マテリアル - - - - Card resources - カードリソース - - - - The cards built-in to FreeCAD will be listed as available. - FreeCAD の組み込みカードは利用可能なカードとして表示されます。 - - - - Use built-in materials - 用意された材料を使用 - - - - Also cards from FreeCAD's preferences directory will be listed as available. - また FreeCAD のユーザー設定ディレクトリのカードも利用可能なカードとして表示されます - - - - Use materials from Materials directory in user's FreeCAD preference directory - ユーザーのFreeCAD設定ディレクトリにあるMaterialディレクトリの材料を使用 - - - - Also material cards also from the specified directory -will be listed as available. - 指定したディレクトリのマテリアルカードも利用可能になります。 - - - - Use materials from user defined directory - ユーザー定義ディレクトリにある材料を使用 - - - - User directory - ユーザー ディレクトリ - - - - Card sorting and duplicates - カードのソートと重複 - - - - Duplicate cards will be deleted from the displayed material card list. - 重複しているカードは表示マテリアルカードのリストから削除されます。 - - - - Delete card duplicates - カードの重複を削除 - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - マテリアルカードがリソース (位置) でソート表示されます。 -チェックされていない場合は名前でソートされます。 - - - - Sort by resources - リソースでソート - - FemGui::DlgSettingsFemMystranImp @@ -1567,20 +1491,20 @@ If unchecked, they will be sorted by their name. 入力ファイルにコメントを書く - + File does not exist ファイルが存在しません。 - + The specified executable '%1' does not exist! Specify another file please. - 指定された実行可能ファイル + The specified executable '%1' - が存在しません! -別のファイルを指定してください。 + does not exist! +Specify another file please. @@ -1676,12 +1600,12 @@ that "MAXKOI" needs to be increased. 反復ソルバーを使用し、「MAXKOI」を増やす必要があるというエラーメッセージが表示される場合、この値を増やす必要があるかもしれません。 - + File does not exist ファイルが存在しません。 - + The specified z88r executable '%1' does not exist! @@ -1692,18 +1616,18 @@ Specify another file please. Specify another file please. - - + + Wrong file ファイルが間違っています。 - + You must specify the path to the z88r.exe! z88r.exe のパスを指定する必要があります! - + You must specify the path to the z88r! z88r のパスを指定する必要があります! @@ -1727,13 +1651,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error 入力エラー - + You must specify at least one reference 少なくとも 1 つの参照を指定する必要があります。 @@ -1741,7 +1665,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error 入力エラー @@ -1749,7 +1673,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error 入力エラー @@ -1757,7 +1681,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error 入力エラー @@ -1765,7 +1689,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error 入力エラー @@ -1773,13 +1697,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error 入力エラー - + Please specify a force greater than 0 力に0より大きい値を指定してください @@ -1787,7 +1711,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error 入力エラー @@ -1795,7 +1719,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error 入力エラー @@ -1803,8 +1727,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error 入力エラー @@ -1812,7 +1736,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error 入力エラー @@ -1820,7 +1744,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error 入力エラー @@ -1828,7 +1752,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error 入力エラー @@ -1836,7 +1760,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error 入力エラー @@ -1844,7 +1768,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error 入力エラー @@ -1852,12 +1776,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh FEM メッシュを編集 - + Meshing failure メッシュ作成失敗 @@ -1865,7 +1789,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error 入力エラー @@ -1881,12 +1805,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete 削除 @@ -1894,42 +1818,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error 選択エラー - + Please use only a single reference for bearing constraint ベアリング拘束では参照を1つだけ使用してください - + Only faces can be picked 面のみを選択できます。 - + Only cylindrical faces can be picked 円筒面のみを選択できます。 - + Only planar faces can be picked 平らな面のみを選択できます。 - + Only linear edges can be picked 直線状のエッジのみを選択できます。 - + Only faces and edges can be picked 面やエッジだけを選択できます。 @@ -1938,77 +1862,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete 削除 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error 選択エラー - + Only one face in object! - moved to master face オブジェクト内に1つの面しかありません! - マスター面に移動しました。 - - + + Only one master face and one slave face for a contact constraint! 接触拘束に使用できるのは1つのマスター面と1つのスレーブ面だけです! - - - - + + + + Nothing selected! 何も選択されていません! - + Only one slave face for a contact constraint! 接触拘束に使用できるのは1つのスレーブ面だけです! - - - - + + + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - - + + Only faces can be picked 面のみを選択できます。 - + Only one master for a contact constraint! 接触拘束に使用できるのは1つのマスターだけです! - + Only one master face for a contact constraint! 接触拘束に使用できるのは1つのマスター面だけです! @@ -2016,28 +1940,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2045,28 +1969,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2074,128 +1998,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic 基本 - + Turbulence 乱流 - + Thermal 熱 - + select boundary type, faces and set value 境界タイプ、面を選択し、値を設定 - + Intensity [0~1] 強度 [0~1] - + Dissipation Rate [m2/s3] 散逸率 [m2/s3] - + Length Scale[m] 長さスケール [m] - + Viscosity Ratio [1] 粘性率 [1] - + Hydraulic Diameter [m] 水力直径 [m] - - + + Gradient [K/m] 熱勾配 [K/m] - + Flux [W/m2] 熱流束 [W/m2] - + Empty selection 選択されていません - + Select an edge or a face, please. エッジまたは面を選択してください。 - - - - - + + + + + Wrong selection 誤った選択 - + Selected object is not a part object! 選択されたオブジェクトはパートオブジェクトではありません! - + Only one planar face or edge can be selected! 平らな面またはエッジを1つだけ選択できます! - + Only planar faces can be picked for 3D 3D では平らな面のみを選択できます。 - + Only planar edges can be picked for 2D 2D では平面に乗るエッジのみを選択できます。 - + Only faces for 3D part or edges for 2D can be picked 3D では面、2D ではエッジのみを選択できます。 - - + - - + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2203,39 +2127,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection 誤った選択 - + Select an edge or a face, please. エッジまたは面を選択してください。 @@ -2243,24 +2167,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error 選択エラー - + Only planar faces can be picked 平らな面のみを選択できます。 - + Only linear edges can be picked 直線状のエッジのみを選択できます。 - + Only faces and edges can be picked 面やエッジだけを選択できます。 @@ -2268,30 +2192,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - - + + Selection must only consist of faces! 面のみを選択する必要があります! @@ -2299,42 +2223,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error 選択エラー - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - + Only faces can be picked 面のみを選択できます。 - + Only planar faces can be picked 平らな面のみを選択できます。 @@ -2342,28 +2266,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - + Only faces can be picked 面のみを選択できます。 @@ -2371,12 +2295,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter プーリ径 - + Torque [Nm] トルク [Nm] @@ -2384,28 +2308,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - + Only faces can be picked 面のみを選択できます。 @@ -2413,22 +2337,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! @@ -2436,64 +2360,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! 変換可能な面が変更されました。変換可能な面だけを追加し、変換できない面は削除してください！ - - - - - - - - - - + + + + + + + + + + Selection error 選択エラー - - + + Nothing selected! 何も選択されていません! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! 選択されたオブジェクトは部品ではありません! - + Only faces can be picked 面のみを選択できます。 - + Only cylindrical faces can be picked 円筒面のみを選択できます。 @@ -2501,7 +2425,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2509,7 +2433,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function クリップ領域、陰関数を選択 @@ -2517,7 +2441,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function 関数による切り取り、陰関数を選択 @@ -2525,12 +2449,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options 直線に沿うデータのオプション - + Length X-Axis plot label 長さ @@ -2539,12 +2463,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options 点位置データのオプション - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2552,7 +2476,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options 結果表示オプション @@ -2560,7 +2484,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function 陰関数 @@ -2568,7 +2492,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options スカラークリップのオプション @@ -2576,7 +2500,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options たわみのオプション @@ -2600,12 +2524,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure メッシュ作成失敗 - + The FEM module is built without NETGEN support. Meshing will not work!!! FEM モジュールは NETGEN サポート無しでビルドされています。メッシュ作成機能は動作しません! @@ -3570,46 +3494,45 @@ Note: for 2D only setting for x is possible, 解析を作成または有効にする必要があります。 - + Ok OK - + Cancel キャンセル - - - - - - - - + + + + + + + + A dialog is already open in the task panel タスクパネルで既にダイアログが開かれています - - - - - - - - + + + + + + + + Do you want to close this dialog? このダイアログを閉じますか？ - + Meshing メッシュ作成 - @@ -3626,22 +3549,22 @@ Note: for 2D only setting for x is possible, インポート/エクスポート - + Constraint initial temperature 初期温度拘束 - + Constraint pulley プーリー拘束 - + Constraint spring ばね拘束 - + Edit post processing object ポスト処理オブジェクトを編集 @@ -3681,62 +3604,62 @@ Note: for 2D only setting for x is possible, グループ - + Are you sure you want to continue? 本当に続行しますか？ - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition 流体境界条件 - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4072,7 +3995,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies オブジェクトの依存関係 @@ -5302,7 +5225,7 @@ used for the Elmer solver Mesh - メッシュ + Mesh @@ -5348,20 +5271,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. エラー: フィルタは単一オブジェクトにのみ適用できます。 - - - + + + The filter could not be set up. フィルタを設定できませんでした。 - - + + Error: no post processing object selected. エラー: ポスト処理オブジェクトが選択されていません。 @@ -6074,13 +5997,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem 有限要素法 - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6125,17 +6048,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem 有限要素法 - + Electromagnetic equations 電磁方程式 - + Electromagnetic equations for the Elmer solver Elmer ソルバー用の電磁方程式 @@ -6143,17 +6066,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem 有限要素法 - + Contours filter 等高線フィルター - + Define/create a contours filter which displays iso contours ISO 等高線を表示する等高線フィルターを定義/作成 @@ -6161,7 +6084,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options 等高線フィルターのオプション @@ -6254,17 +6177,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem 有限要素法 - + Mechanical equations 力学方程式 - + Mechanical equations for the Elmer solver Elmer ソルバー用の力学方程式 diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_ka.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_ka.ts index 60d6d2281d..cbcf998350 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_ka.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_ka.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint საკისრის შეზღუდვა - + Creates a bearing constraint საკისრის შეზღუდვის შექმნა @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem - Fem + სემ - + Contact constraint კონტაქტის შეზღუდვა - + Creates a contact constraint between faces შექნის კონტაქტის შეზღუდვას ზედაპირებს შორის @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem სემ - - Constraint displacement - გადაადგილების შეზღუდვა + + Displacement boundary condition + ჩანაცვლების საზღვრის პირობა - + Creates a displacement boundary condition for a geometric entity შექმნის ჩანაცვლების სასაზღვრე პირობას გეომეტრიული ობიექტისთვის @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem სემ - - Constraint fixed - დამაგრებულის ზღვარი + + Fixed boundary condition + დამაგრებული სასაზღვრო პირობა - + Creates a fixed boundary condition for a geometric entity შექმნის ფიქსირებულ სასაზღვრე პირობას გეომეტრიული ობიექტისთვის @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem სემ - + Fluid boundary condition სითხის სასაზღვრო მდგომარეობა - + Create fluid boundary condition on face entity for Computional Fluid Dynamics ზედაპირის ერთეულზე სითხის გამოთვლითი დინამიკისთვის სითხის სასაზღვრო პირობის შექმნა @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem სემ - - Constraint force - ძალის ზღვარი + + Force load + ძალოვანი დატვირთვა - + Creates a force load applied to a geometric entity შექმნის ძალის დატვირთვას, რომელიც გეომეტრიულ ობიექტს აწვება @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem სემ - + Gear constraint კბილანის შეზღუდვა - + Creates a gear constraint კბილანის შეზღუდვის შექმნა @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem სემ - + Heat flux load დატვირთვა სითბურ ნაკადზე - + Creates a heat flux load acting on a face ზედაპირზე მოქმედი სითბოს ნაკადის დატვირთვის შექმნა @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem სემ - + Initial temperature საწყისი ტემპერატურა - + Creates an initial temperature acting on a body სხეულზე მოქმედი საწყისი ტემპერატურის შექმნა @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem სემ - + Plane multi-point constraint ზედაპირის მრავალწერტილიანი შეზღუდვა - + Creates a plane multi-point constraint for a face შექმნის სიბრტყის მრავალწერტილიანი შეზღუდვას ზედაპირისთვის @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem სემ - - Constraint pressure - წნევის შეზღუდვა + + Pressure load + წნევით დატვირთვა - + Creates a pressure load acting on a face ზედაპირზე მოქმედი წნევის დატვირთვის შექმნა @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem სემ - + Pulley constraint ბორბლის შეზღუდვა - + Creates a pulley constraint ბორბლის შეზღუდვის შექმნა @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem სემ - + Spring ზამბარა - + Creates a spring acting on a face ზედაპირზე მოქმედი ზამბარის შექმნა @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem სემ - - Constraint temperature - ტემპერატურის შეზღუდვა + + Temperature boundary condition + ტემპერატურის შემზღუდავი პირობა - + Creates a temperature/concentrated heat flux load acting on a face შექმნის ტემპერატურის/კონცენტრირებული სითბოს ნაკადის დატვირთვას, რომელიც ზედაპირზე მოქმედებს @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem სემ - - Constraint transform - გარდაქნის შეზღუდვა + + Local coordinate system + ლოკალური კოორდინატების სისტემა - + Create a local coordinate system on a face შექმენით ლოკალური კოორდინატების სისტემა ზედაპირზე @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem სემ - + Nodes set კვანძები დაყენებულია - + Creates a FEM mesh nodes set სემ ბადის უჯრედების კრებულების შექმნა - + Wrong selection არასწორი მონიშნული - + Select a single FEM mesh or nodes set, please. გთხოვთ აირჩიოთ ერთი სემ ბადე ან უჯრედების ნაკრები. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem სემ - + Node set by poly პოლიგონით დაყენებული კვანძი - - + + Create node set by Poly პოლიხაზთან უჯრედების ნაკრების შექმნა @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem სემ - + Apply changes to pipeline მილსადენის ცვლილებების გადატარება - + Apply changes to parameters directly and not on recompute only... პარამეტრების ცვლილებების პირდაპირ და არა მხოლოდ გადათვლისას გადატარება... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem სემ - + Region clip filter არეალის კვეთის ფილტრი - + Define/create a clip filter which uses functions to define the clipped region ფილტრის აღწერა/შექმნა, რომელიც კვეთის არეალის აღსაწერად ფუნქციებს იყენებს - + Wrong selection არასწორი მონიშნული - + Select a pipeline, please. გთხოვთ, აირჩიოთ მილსადენი. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem სემ - + Function cut filter ამოჭრის ფუნქციის ფილტრი - + Cut the data along an implicit function მონაცემების არაცხადი ფუნქციის გასწვრივ კვეთა @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem სემ - + Line clip filter ხაზის კვეთის ფილტრი - + Define/create a clip filter which clips a field along a line ფილტრის აღწერა/შექმნა, რომელიც ველს ხაზის გასწვრივ კვეთს @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem სემ - + Data at point clip filter მონაცემების ფილტრი წერტილის ჭრილზე - + Define/create a clip filter which clips a field data at point ფილტრის აღწერა/შექმნა, რომელიც ველის მონაცემებს წერტილზე კვეთს @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem სემ - + Filter functions ფილტრის ფუნქციები - + Functions for use in postprocessing filter... პოსტპროცესორის ფილტრის მიერ გამოყენებული ფუნქციები... - + Plane სიბრტყე - + Sphere სფერო - + Cylinder ცილინდრი - + Box ყუთი @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label სისქე [mm] - + Stress [MPa] Plot Y-Axis Label მექანიკური ძაბვა [MPa] - + Linearized Stresses Plot title ლინეარიზირებული ძაბვა - + Membrane Plot legend item label მემბრანა - + Membrane and Bending Plot legend item label მემბრანა და ღუნვა - + Total Plot legend item label სულ - - - Fem - სემ - - - - Stress linearization plot - დეფორმაციის ხაზოვნების დახაზვა - - - - Define/create stress linearization plots - განსაზღვრეთ/დაამატეთ სტრესის ხაზოვანი ნახაზები - - - - - Wrong selection - არასწორი მონიშნული - - - - - Select a Clip filter which clips a STRESS field along a line, please. - გთხოვთ, აირჩიეთ კვეთს ფილტრი, რომელიც სტრესის ველს ხაზის გასწვრივ კვეთს. - - - - CmdFemPostPipelineFromResult - - - Fem - სემ - - - - Post pipeline from result - მაჩვენე მილსადენი შედეგიდან - - - - Creates a post processing pipeline from a result object - შედეგის ობიექტიდან მილსადენის პოსტპროცესინგის შექმნა - - - - Wrong selection type - მონიშნულის არასწორი ტიპი - - - - Select a result object, please. - გთხოვთ მონიშნოთ შედეგი. - - - - CmdFemPostScalarClipFilter - - - Fem - სემ - - - - Scalar clip filter - სკალარის კვეთის ფილტრი - - - - Define/create a clip filter which clips a field with a scalar value - ფილტრის აღწერა/შექმნა, რომელიც ველს სკალარული მნიშვნელობით კვეთს - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + დეფორმაციის ხაზოვნების დახაზვა + + + + Define/create stress linearization plots + განსაზღვრეთ/დაამატეთ სტრესის ხაზოვანი ნახაზები + + + + + Wrong selection + არასწორი მონიშნული + + + + + Select a Clip filter which clips a STRESS field along a line, please. + გთხოვთ, აირჩიეთ კვეთს ფილტრი, რომელიც სტრესის ველს ხაზის გასწვრივ კვეთს. + + + + CmdFemPostPipelineFromResult + + + Fem + სემ + + + + Post pipeline from result + მაჩვენე მილსადენი შედეგიდან + + + + Creates a post processing pipeline from a result object + შედეგის ობიექტიდან მილსადენის პოსტპროცესინგის შექმნა + + + + Wrong selection type + მონიშნულის არასწორი ტიპი + + + + Select a result object, please. + გთხოვთ მონიშნოთ შედეგი. + + + + CmdFemPostScalarClipFilter + + + Fem + სემ + + + + Scalar clip filter + სკალარის კვეთის ფილტრი + + + + Define/create a clip filter which clips a field with a scalar value + ფილტრის აღწერა/შექმნა, რომელიც ველს სკალარული მნიშვნელობით კვეთს + + + + CmdFemPostWarpVectorFilter + + + Fem + სემ + + + Warp filter დეფორმაციის ვიზუალიზაციის ფილტრი - + Warp the geometry along a vector field by a certain factor გეომეტრიის მითითებული ფაქტორით დეფორმაცია ვექტორული ველის გასწვრივ @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition სითხის სასაზღვრო მდგომარეობის შექმნა - + Make bearing constraint საკისრის შეზღუდვის შექმნა - + Make contact constraint on a face შექმენით კონტაქტის შეზღუდვა ზედაპირზე - + Make displacement boundary condition on face შექმენით გამოძევების სასაზღვრე პირობა ზედაპირზე - + Make fixed boundary condition for geometry შექმენით ფიქსირებული სასაზღვრო პირობა გეომეტრიისთვის - + Make force load on geometry გეომეტრიაზე ძალოვანი დატვირთვის შექმნა - + Make gear constraint კბილანის შეზღუდვის შექმნა - + Make heat flux load on face ზედაპირზე სითბოს ნაკადის დატვირთვის შექმნა - + Make initial temperature condition on body შექმენით საწყისი ტემპერატურის პირობა სხეულზე - + Make plane multi-point constraint on face შექმენით სიბრტყის მრავალწერტილიანი შეზღუდვა ზედაპირზე - + Make pressure load on face წნევით დატვირთვის შექმნა ზედაპირზე - + Make spring on face ზამბარის შექმნა ზედაპირზე - + Make pulley constraint ბორბლის შეზღუდვის შექმნა - + Make temperature boundary condition on face შექმენით დროებით სასაზღვრე პირობა ზედაპირზე - + Make local coordinate system on face შექმენით ლოკალური კოორდინატების სისტემა ზედაპირზე - + Place robot რობოტის მოთავსება - + Edit nodes set კვანძების ჯფუფის ჩასწორება - + Create nodes set კვანძების ჯგუფის შექმნა - + Create filter ფილტრის შექმნა - + Create function ფუნქციის შექმნა - + Create pipeline from result შედეგიდან მილსადენის შექმნა - + Edit Mirror ანარეკლის ჩასწორება @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal შექმენით სიბრტყის ფუნქცია, აღწერილი მისი საწყისი წერტილითა და ნორმალით - + Create a sphere function, defined by its center and radius შექმენით სფეროს ფუნქცია, აღწერილი მისი ცენტრით და რადიუსით - + Create a cylinder function, defined by its center, axis and radius შექმენით ცილინდრის ფუნქცია, აღწერილი მისი ცენტრით, ღერძით და რადიუსით - + Create a box function, defined by its center, length, width and height კუბის ფუნქციის შექმნა. აღიწერება მისი ცენტრით, სიგრძით, სიგანით და სიმაღლით @@ -1017,20 +1017,20 @@ დაბალი სიხშირის ლიმიტი - + File does not exist ფაილი არ არსებობს - + The specified executable '%1' does not exist! Specify another file please. - მითითებული გამშვები ფაილი + The specified executable '%1' - არ არსებობს! -მიუთითეთ სხვა ფაილი. + does not exist! +Specify another file please. @@ -1054,7 +1054,7 @@ Specify another file please. Search in known binary directories - გამშვები ფაილების ცნობილ საქაღალდეებში ძებნა + ცნობილ ბინარულ საქაღალდეებში ძებნა @@ -1119,36 +1119,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">დაიმახსოვრეთ:</span> რეკომენდებულია გამოიყენოთ ბირთვების ლუწი რაოდენობა, რომ წარმადობა დამატებით ბადის სიმეტრიისგანაც მიიღოთ. (8 ბირთვი უფრო სწრაფია, ვიდრე 9.)<br/><span style=" font-weight:600;">ასევე დაიმახსოვრეთ:</span> ექსტრემალურ შემთხვევებში ElverSolver-მა შეიძლება დამუშავება ვერ შეძლოს, თუ ბირთვების რაოდენობა მეტისმეტად დიდია.</p></body></html> - + File does not exist ფაილი არ არსებობს - + The specified executable '%1' does not exist! Specify another file please. - მითითებული გამშვები ფაილი + The specified executable '%1' - არ არსებობს! -მიუთითეთ სხვა ფაილი. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: შეუსაბამოა მრავალნაკადიანობისთვის - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Elmer-ის არასწორი პარამეტრი: იყენებთ ერთზე მეტ CPU-ის ბირთვს. ამიტომ საჭიროა გამშვები ფაილი სუფიქსით '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Elmer-ის არასწორი პარამეტრი: იყენებთ ერთზე მეტ CPU-ის ბირთვს. @@ -1250,7 +1250,7 @@ the constraint or material is applied. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + ნება მიეცით აპლიკაციას მართოს (შექმნას, წაშალოს) ყველა ამომხსნელის დროებითი საქაღალდეები. დროებითი საქაღალდეების გამოყენება. @@ -1384,20 +1384,20 @@ adding an analysis container ნაგულისხმევი gmsh გამშვები ფაილის გამოსაყენებლად დატოვეთ ცარიელი - + File does not exist ფაილი არ არსებობს - + The specified executable '%1' does not exist! Specify another file please. - მითითებული გამშვები ფაილი + The specified executable '%1' -არ არ არსებობს! -მიუთითეთ სხვა ფაილი. + does not exist! +Specify another file please. @@ -1456,83 +1456,6 @@ FreeCAD-ის შედეგი ობიექტი: შემოტან FreeCAD-ის შედეგი ობიექტი - - FemGui::DlgSettingsFemMaterialImp - - - Material - მასალა - - - - Card resources - ბარათის რესურსები - - - - The cards built-in to FreeCAD will be listed as available. - FreeCAD-ში ჩაშენებული ბარათები მონიშნული იქნება, როგორც ხელმისაწვდომი. - - - - Use built-in materials - ჩაშენებული მასალების გამოყენება - - - - Also cards from FreeCAD's preferences directory will be listed as available. - ბარათები FreeCAD-ის პარამეტრებს საქაღალდიდან ასევე მოინიშნებიან, როგორც ხელმისაწვდომი. - - - - Use materials from Materials directory in user's FreeCAD preference directory - მასალების FreeCAD-ის პარამეტრების საქაღალდეში მდებარე 'Materials' საქაღალდიდან წაკითხვა - - - - Also material cards also from the specified directory -will be listed as available. - მასალის ბარათები მითითებული საქაღალდიდან -ასევე იქნებიან მოშიშნულები, როგორც ხელმისაწვდომი. - - - - Use materials from user defined directory - მასალების მომხმარებლის მიერ მითითებული საქაღალდიდან გამოყენება - - - - User directory - მომხმარებლის საქაღალდე - - - - Card sorting and duplicates - ბარათების დალაგება და ასლები - - - - Duplicate cards will be deleted from the displayed material card list. - დუბლირებული ბარათები წაიშლება ნაჩვენები მასალების ბარათის სიიდან. - - - - Delete card duplicates - ბარათის ასლების წაშლა - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - როგორც ჩანს, მასალის ბარათები თავისი რესურსების(მდებარეობების) მიხედვთაა დალაგებული. -თუ გამორთულია, ისინი სახელის მიხედვით დალაგდება. - - - - Sort by resources - რესურსებით დალაგება - - FemGui::DlgSettingsFemMystranImp @@ -1571,20 +1494,20 @@ If unchecked, they will be sorted by their name. კომენტარების შესატან ფაილში ჩაწერა - + File does not exist ფაილი არ არსებობს - + The specified executable '%1' does not exist! Specify another file please. - მითითებული გამშვები ფაილი + The specified executable '%1' -არ არ არსებობს! -მიუთითეთ სხვა ფაილი. + does not exist! +Specify another file please. @@ -1602,7 +1525,7 @@ Specify another file please. Search in known binary directories - ცნობილ ბინარულ საქაღალდეებში ძებნა + გამშვები ფაილების ცნობილ საქაღალდეებში ძებნა @@ -1683,34 +1606,34 @@ that "MAXKOI" needs to be increased. შეცდომას, რომ საჭიროა "MAXKOI"-ის გაზრდა. - + File does not exist ფაილი არ არსებობს - + The specified z88r executable '%1' does not exist! Specify another file please. - მითითებული z88r-ის გამშვები ფაილი + The specified z88r executable '%1' - არ არსებობს! -მიუთითეთ სხვა ფაილი. + does not exist! +Specify another file please. - - + + Wrong file არასწორი ფაილი - + You must specify the path to the z88r.exe! საჭიროა z88r.exe -მდე ბილიკის მითითება! - + You must specify the path to the z88r! საჭიროა z88r -მდე ბილიკის მითითება! @@ -1734,13 +1657,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error შეყვანის შეცდომა - + You must specify at least one reference აუცილებელია მიუთითოთ ერთი ბმა მაინც @@ -1748,7 +1671,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error შეყვანის შეცდომა @@ -1756,7 +1679,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error შეყვანის შეცდომა @@ -1764,7 +1687,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error შეყვანის შეცდომა @@ -1772,7 +1695,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error შეყვანის შეცდომა @@ -1780,13 +1703,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error შეყვანის შეცდომა - + Please specify a force greater than 0 გთხოვთ მიუთითოთ ნულზე დიდი ძალა @@ -1794,7 +1717,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error შეყვანის შეცდომა @@ -1802,7 +1725,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error შეყვანის შეცდომა @@ -1810,8 +1733,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error შეყვანის შეცდომა @@ -1819,7 +1742,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error შეყვანის შეცდომა @@ -1827,7 +1750,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error შეყვანის შეცდომა @@ -1835,7 +1758,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error შეყვანის შეცდომა @@ -1843,7 +1766,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error შეყვანის შეცდომა @@ -1851,7 +1774,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error შეყვანის შეცდომა @@ -1859,12 +1782,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh სემ ბადის ჩასწორება - + Meshing failure ბადის შეცდომა @@ -1872,9 +1795,9 @@ Specify another file please. FemGui::TaskDlgPost - + Input error - შეყვანის შეცდომა + Input error @@ -1888,12 +1811,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters ანალიზის თვისების მორგება - + Delete წაშლა @@ -1901,42 +1824,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error მონიშვნის შეცდომა - + Please use only a single reference for bearing constraint გთხოვთ, საკისრის შეზღუდვისათვის გამოიყენოთ მხოლოდ ერთი ბმა - + Only faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ზედაპირები - + Only cylindrical faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ცილინდრული ზედაპირები - + Only planar faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ბრტყელი ზედაპირები - + Only linear edges can be picked შეგიძლიათ აირჩიოთ მხოლოდ ხაზოვანი ზედაპირები - + Only faces and edges can be picked შეგიძლიათ აირჩიოთ მხოლოდ ზედაპრები და წიბოები @@ -1945,77 +1868,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete წაშლა - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error - მონიშვნის შეცდომა + მონიშნულის შეცდომა - + Only one face in object! - moved to master face ობიექტში მხოლოდ ერთი ზედაპირია! - გადავიტანე ძირითად ზედაპირზე - - + + Only one master face and one slave face for a contact constraint! კონტაქტის შეზღუდვას მხოლოდ ერთი მთავარი და ერთი მეორადი ზედაპირი შეიძლება ჰქონდეს! - - - - + + + + Nothing selected! არაფერია მონიშნული! - + Only one slave face for a contact constraint! კონტაქტის შეზღუდვას მხოლოდ ერთი მეორადი ზედაპირი შეიძლება ჰქონდეს! - - - - + + + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - - + + Only faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ზედაპირები - + Only one master for a contact constraint! კონტაქტის შეზღუდვას მხოლოდ ერთი მთავარი ობიექტი შეიძლება ჰქონდეს! - + Only one master face for a contact constraint! კონტაქტის შეზღუდვას მხოლოდ ერთი მთავარი ზედაპირი შეიძლება ჰქონდეს! @@ -2023,28 +1946,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error მონიშნულის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! ერთ ანალიზის თვისებას, მხოლოდ ერთი მონიშნული ტიპი (წვერო, ზედაპირი ან წიბო) შეიძლება, ჰქონდეს! @@ -2052,28 +1975,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error მონიშნულის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! ერთ ანალიზის თვისებას, მხოლოდ ერთი მონიშნული ტიპი (წვერო, ზედაპირი ან წიბო) შეიძლება, ჰქონდეს! @@ -2081,128 +2004,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic ძირითადი - + Turbulence ტურბულენტურობა - + Thermal თერმული - + select boundary type, faces and set value აირჩიეთ საზღვრის ტიპი და ზედაპირები და დააყენეთ მნიშვნელობა - + Intensity [0~1] ინტენსივობა [0~1] - + Dissipation Rate [m2/s3] დისიპაციის სიჩქარე [მ2/ს3] - + Length Scale[m] სიგრძის მასშტაბი[m] - + Viscosity Ratio [1] სიბლანტის ფარდობა [1] - + Hydraulic Diameter [m] ჰიდრავლიკური დიამეტრი [მ] - - + + Gradient [K/m] გრადიენტი [კ/მ] - + Flux [W/m2] ნაკადი [W/m2] - + Empty selection არაფერია მონიშნული - + Select an edge or a face, please. გთხოვთ მონიშნოთ წიბო ან ზედაპირი. - - - - - + + + + + Wrong selection არასწორი მონიშნული - + Selected object is not a part object! მონიშნული ობიექტი ნაწილი არაა! - + Only one planar face or edge can be selected! შეიძლება იყოს მონიშნული მხოლოდ ერთი ბრტყელი ზედაპირი ან წიბო! - + Only planar faces can be picked for 3D 3D-სთვის შეგიძლიათ აირჩიოთ მხოლოდ ბრტყელი ზედაპირები - + Only planar edges can be picked for 2D 2D-სთვის შეგიძლიათ აირჩიოთ მხოლოდ ბრტყელი წიბოები - + Only faces for 3D part or edges for 2D can be picked 3D ნაწილისთვის ზედაპირების და 2D ნაწილისთვს წიბოების გარდა - - + - - + + + Selection error მონიშნულის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! ერთ ანალიზის თვისებას, მხოლოდ ერთი მონიშნული ტიპი (წვერო, ზედაპირი ან წიბო) შეიძლება, ჰქონდეს! @@ -2210,39 +2133,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error მონიშნულის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! ერთ ანალიზის თვისებას, მხოლოდ ერთი მონიშნული ტიპი (წვერო, ზედაპირი ან წიბო) შეიძლება, ჰქონდეს! - - + + Wrong selection - არასწორი მონიშნული + არასწორი არჩევანი - + Select an edge or a face, please. გთხოვთ მონიშნოთ წიბო ან ზედაპირი. @@ -2250,24 +2173,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error მონიშნულის შეცდომა - + Only planar faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ბრტყელი ზედაპირები - + Only linear edges can be picked შეგიძლიათ აირჩიოთ მხოლოდ ხაზოვანი ზედაპირები - + Only faces and edges can be picked შეგიძლიათ აირჩიოთ მხოლოდ ზედაპრები და წიბოები @@ -2275,30 +2198,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error მონიშნულის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - - + + Selection must only consist of faces! აირჩიეთ მხოლოდ ზედაპირები! @@ -2306,42 +2229,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error მონიშნულის შეცდომა - - + + Only one face can be selected for a plane multi-point constraint! სიბრტყის მრავალწერტილიან შეზღუდვად მხოლოდ ერთი ზედაპირი შეგიძლიათ აირჩიოთ! - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - + Only faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ზედაპირები - + Only planar faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ბრტყელი ზედაპირები @@ -2349,28 +2272,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error მონიშნულის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - + Only faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ზედაპირები @@ -2378,12 +2301,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter ბორბლის დიამეტრი - + Torque [Nm] მოჭიდება [ნმ] @@ -2391,28 +2314,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error მონიშნულის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - + Only faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ზედაპირები @@ -2420,22 +2343,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error მონიშნულის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! @@ -2443,64 +2366,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error ანალიზის თვისების განახლების შეცდომა - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! გარდასახვადი ზედაპირები შეიცვალა. გთხოვთ, დაამატოთ მხოლოდ გარდასახვადი ზედაპირები და ამოიღეთ არაგარდასახვადი ზედაპირები! - - - - - - - - - - + + + + + + + + + + Selection error - მონიშნულის შეცდომა + მონიშვნის შეცდომა - - + + Nothing selected! არაფერია მონიშნული! - - + + Only one face for rectangular local coordinate system! მხოლოდ ერთი ზედაპირი ოთხკუთხედი ლოკალური კოორდინატების სისტემისთვის! - + Only one face for local coordinate system! მხოლოდ ერთი ზედაპირი ლოკალური კოორდინატების სისტემისთვის! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface შესაძლებელია მხოლოდ გარდაქმნადი ზედაპირების არჩევა! ჯერ გამოიყენეთ გადაადგილების სასაზღვრე პირობა, შემდეგ კი ზედაპირზე ლოკალური კოორდინატების სისტემა გამოიყენეთ - - + + Selected object is not a part! მონიშნული ობიექტი ნაწილი არაა! - + Only faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ზედაპირები - + Only cylindrical faces can be picked შეგიძლიათ აირჩიოთ მხოლოდ ცილინდრული ზედაპირები @@ -2508,7 +2431,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName ობიექტის სახელი @@ -2516,7 +2439,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function რეგიონის კვეთა, აირჩიეთ არაცხადი ფუნქცია @@ -2524,7 +2447,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function ფუნქციის კვეთა, აირჩიეთ არაცხადი ფუნქცია @@ -2532,12 +2455,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options ხაზის გასწვრივი მონაცემების პარამეტრები - + Length X-Axis plot label სიგრძე @@ -2546,12 +2469,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options წერტილის მონაცემების პარამეტრები - + %1 at (%2; %3; %4) is: %5 %6 %1 მისამართზე (%2; %3; %4) არის: %5 %6 @@ -2559,7 +2482,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options შედეგის ჩვენების მორგება @@ -2567,7 +2490,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function არაცხადი ფუნქცია @@ -2575,7 +2498,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options სკალარის ფილტრის მორგება @@ -2583,7 +2506,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options გადატანის პარამეტრები @@ -2607,12 +2530,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure ბადის შეცდომა - + The FEM module is built without NETGEN support. Meshing will not work!!! სემ მოდული აშენებულია NETGEN-ის მხარდაჭერის გარეშე. მეშინგი არ იმუშავებს!!! @@ -3584,46 +3507,45 @@ Note: for 2D only setting for x is possible, თქვენ გჭირდებათ ანალიზის შექმნა ან აქტივაცია - + Ok დიახ - + Cancel გაუქმება - - - - - - - - + + + + + + + + A dialog is already open in the task panel ფანჯარა უკვე ღიაა ამოცანების პანელზე - - - - - - - - + + + + + + + + Do you want to close this dialog? ნამდვილად გსურთ ამ ფანჯრის დახურვა? - + Meshing ბადის აგება - @@ -3640,22 +3562,22 @@ Note: for 2D only setting for x is possible, შეტანა-გატანა - + Constraint initial temperature საწყისი ტემპერატურის შეზღუდვა - + Constraint pulley შეზღუდული ბორბალი - + Constraint spring ზამბარის შეზღუდვა - + Edit post processing object პოსტპროცესორის ობიექტის ჩასწორება @@ -3695,62 +3617,62 @@ Note: for 2D only setting for x is possible, ჯგუფები - + Are you sure you want to continue? დარწმუნებული ბრძანდებით, რომ გნებავთ, გააგრძელოთ? - + Contact constraint კონტაქტის შეზღუდვა - + Displacement boundary condition ჩანაცვლების საზღვრის პირობა - + Fixed boundary condition დამაგრებული სასაზღვრო პირობა - + Fluid boundary condition სითხის სასაზღვრო მდგომარეობა - + Force load ძალოვანი დატვირთვა - + Heat flux load დატვირთვა სითბურ ნაკადზე - + Plane multi-point constraint ზედაპირის მრავალწერტილიანი შეზღუდვა - + Pressure load წნევით დატვირთვა - + Temperature boundary condition ტემპერატურის შემზღუდავი პირობა - + Local coordinate system ლოკალური კოორდინატების სისტემა - + Edit analysis feature ანალიზის თვისების ჩასწორება @@ -4088,7 +4010,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies ობიექტის დამოკიდებულებები @@ -4131,7 +4053,7 @@ For possible variables, see the description box below. Box - ყუთი + Box @@ -4272,7 +4194,7 @@ For possible variables, see the description box below. Distance - Distance + მანძილი @@ -5320,7 +5242,7 @@ used for the Elmer solver Mesh - ბადე + Mesh @@ -5366,20 +5288,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. შეცდომა: ფილტრი მხოლოდ ერთ ობიექტზე შეიძლება გადატარდეს. - - - + + + The filter could not be set up. ფილტრის მორგება შეუძლებელია. - - + + Error: no post processing object selected. შეცდომა: პოსტპროცესინგის ობიექტი მონიშნული არაა. @@ -5918,7 +5840,7 @@ used for the Elmer solver Remove - წაშლა + მოცილება @@ -6094,13 +6016,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem სემ - - + + Electromagnetic boundary conditions ელექტრომაგნიტური სასაზღვრო პირობები @@ -6146,17 +6068,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem სემ - + Electromagnetic equations ელექტრომაგნიტური ტოლობები - + Electromagnetic equations for the Elmer solver ელექტრომაგნიტური ტოლობები Elmber ამომხსნელისთვის @@ -6164,17 +6086,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem სემ - + Contours filter კონტურების ფილტრი - + Define/create a contours filter which displays iso contours აღწერეთ/შექმენით კონტურის ფილტრი, რომელიც ISO კონტურებს აჩვენებს @@ -6182,7 +6104,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options კონდურის ფილტრის მორგება @@ -6276,17 +6198,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem - სემ + Fem - + Mechanical equations მექანიკური განტოლებები - + Mechanical equations for the Elmer solver მექანიკური განტოლებები Elmer ამომხსნელისთვის diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_ko.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_ko.ts index 5f52539347..0ef39b3694 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_ko.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_ko.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Constraint force + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Nodes set - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection 잘못 된 선택 - + Select a single FEM mesh or nodes set, please. Select a single FEM mesh or nodes set, please. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Create node set by Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection 잘못 된 선택 - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane 평면 - + Sphere 공모양 - + Cylinder 실린더 - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Thickness [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label 합계 - - - Fem - Fem - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - 잘못 된 선택 - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + 잘못 된 선택 + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Edit Mirror @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Low frequency limit - + File does not exist 파일이 존재하지 않습니다 - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist 파일이 존재하지 않습니다 - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist 파일이 존재하지 않습니다 - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - 재료 - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Use built-in materials - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Use materials from user defined directory - - - - User directory - User directory - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist 파일이 존재하지 않습니다 - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist 파일이 존재하지 않습니다 - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file 잘못된 파일 - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error 입력 오류 - + You must specify at least one reference You must specify at least one reference @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error 입력 오류 @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error 입력 오류 @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error 입력 오류 @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error 입력 오류 @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error 입력 오류 - + Please specify a force greater than 0 Please specify a force greater than 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error 입력 오류 @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error 입력 오류 @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error 입력 오류 @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error 입력 오류 @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error 입력 오류 @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error 입력 오류 @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error 입력 오류 @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error 입력 오류 @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh FEM 메쉬 편집 - + Meshing failure Meshing failure @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error 입력 오류 @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete 삭제 @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Selection error - + Please use only a single reference for bearing constraint Please use only a single reference for bearing constraint - + Only faces can be picked Only faces can be picked - + Only cylindrical faces can be picked Only cylindrical faces can be picked - + Only planar faces can be picked Only planar faces can be picked - + Only linear edges can be picked Only linear edges can be picked - + Only faces and edges can be picked Only faces and edges can be picked @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete 삭제 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Selection error - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Nothing selected! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Selected object is not a part! - - + + Only faces can be picked Only faces can be picked - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection 잘못 된 선택 - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection 잘못 된 선택 - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Selection error - + Only planar faces can be picked Only planar faces can be picked - + Only linear edges can be picked Only linear edges can be picked - + Only faces and edges can be picked Only faces and edges can be picked @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Selection error - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only faces can be picked Only faces can be picked - + Only planar faces can be picked Only planar faces can be picked @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only faces can be picked Only faces can be picked @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter 풀리 직경 - + Torque [Nm] 토크 [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only faces can be picked Only faces can be picked @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Selection error - - + + Nothing selected! Nothing selected! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Selected object is not a part! - + Only faces can be picked Only faces can be picked - + Only cylindrical faces can be picked Only cylindrical faces can be picked @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label 거리 @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Meshing failure - + The FEM module is built without NETGEN support. Meshing will not work!!! The FEM module is built without NETGEN support. Meshing will not work!!! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, 새로 생성 하거나 해석파일을 지정해서 활성화 해야 합니다. - + Ok OK - + Cancel 취소하기 - - - - - - - - + + + + + + + + A dialog is already open in the task panel 테스크 패널에 이미 다이얼로그가 열려있습니다. - - - - - - - - + + + + + + + + Do you want to close this dialog? 다이얼로그를 닫으시겠습니까? - + Meshing Meshing - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, 가져오기 내보내기 - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object 대상물 해석결과의 정리 @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, 묶음 - + Are you sure you want to continue? Are you sure you want to continue? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4091,7 +4013,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies 객체 종속성 @@ -5369,20 +5291,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. 오류: 한 개체에 한 필터만 적용 가능함. - - - + + + The filter could not be set up. 필터 적용이 설정 될 수 없습니다. - - + + Error: no post processing object selected. 오류: 해석결과를 정리할 대상을 선택하지 않았습니다. @@ -6097,13 +6019,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6149,17 +6071,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6167,17 +6089,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6185,7 +6107,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6279,17 +6201,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_nl.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_nl.ts index 9ccfaca56f..a323e7db60 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_nl.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_nl.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem EEM - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem EEM - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem EEM - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem EEM - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem EEM - + Fluid boundary condition Vloeistof randvoorwaarde - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Maakt een vloeistof randvoorwaarde op een oppervlak voor CFD @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem EEM - - Constraint force - Beperkingskracht + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem EEM - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem EEM - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem EEM - + Initial temperature Initiële temperatuur - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem EEM - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem EEM - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem EEM - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem EEM - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem EEM - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem EEM - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem EEM - + Nodes set Verzameling knooppunten - + Creates a FEM mesh nodes set Creert een set knooppunten voor een FEM-maaswerk - + Wrong selection Verkeerde selectie - + Select a single FEM mesh or nodes set, please. Gelieve een enkele FEM-maas of een verzameling knooppunten te selecteren. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem EEM - + Node set by poly Node set by poly - - + + Create node set by Poly Maak een verzameling knooppunten aan door Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem EEM - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem EEM - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Definieer/creëer een clip filter dat functies gebruikt om de clip regio te definiëren - + Wrong selection Verkeerde selectie - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem EEM - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem EEM - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem EEM - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem EEM - + Filter functions Filter functies - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Vlak - + Sphere Bol - + Cylinder Cilinder - + Box Balk @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Dikte (mm) - + Stress [MPa] Plot Y-Axis Label Spanning [MPa] - + Linearized Stresses Plot title Gelineariseerde spanningen - + Membrane Plot legend item label Membraan - + Membrane and Bending Plot legend item label Membraan en buiging - + Total Plot legend item label Totaal - - - Fem - EEM - - - - Stress linearization plot - Spanningslinearisatie-grafiek - - - - Define/create stress linearization plots - Definiëer/creëer spanningslinearisatie-grafieken - - - - - Wrong selection - Verkeerde selectie - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - EEM - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Verkeerd selectietype - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - EEM - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Spanningslinearisatie-grafiek + + + + Define/create stress linearization plots + Definiëer/creëer spanningslinearisatie-grafieken + + + + + Wrong selection + Verkeerde selectie + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + EEM + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Verkeerd selectietype + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + EEM + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + EEM + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Creer een vloeistof randvoorwaarde - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Plaats robot - + Edit nodes set Knooppuntset bewerken - + Create nodes set Set knooppunten aanmaken - + Create filter Maak een filter aan - + Create function Functie maken - + Create pipeline from result Create pipeline from result - + Edit Mirror Edit Mirror @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,20 +1017,20 @@ Onder frequentie limiet - + File does not exist Bestand bestaat niet - + The specified executable '%1' does not exist! Specify another file please. - Het gespecificeerde uitvoerbare bestand + The specified executable '%1' - bestaat niet! -Geef een ander bestand op. + does not exist! +Specify another file please. @@ -1119,36 +1119,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist Bestand bestaat niet - + The specified executable '%1' does not exist! Specify another file please. - Het gespecificeerde uitvoerbare bestand + The specified executable '%1' - bestaat niet! -Geef een ander bestand op. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,20 +1385,20 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist Bestand bestaat niet - + The specified executable '%1' does not exist! Specify another file please. - Het gespecificeerde uitvoerbare bestand + The specified executable '%1' - bestaat niet! -Geef een ander bestand op. + does not exist! +Specify another file please. @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materiaal - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Gebruik ingebouwde materialen - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Gebruik van materialen uit door de gebruiker gedefinieerde folder - - - - User directory - Gebruikerslijst - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,20 +1500,20 @@ If unchecked, they will be sorted by their name. Opmerkingen voor invoerbestand schrijven - + File does not exist Bestand bestaat niet - + The specified executable '%1' does not exist! Specify another file please. - Het gespecificeerde uitvoerbare bestand + The specified executable '%1' - bestaat niet! -Geef een ander bestand op. + does not exist! +Specify another file please. @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist Bestand bestaat niet - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Verkeerd bestand - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Invoerfout - + You must specify at least one reference U moet minstens één referentie specificeren @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Invoerfout @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Invoerfout @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Invoerfout @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Invoerfout @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Invoerfout - + Please specify a force greater than 0 Specificeer een kracht groter dan 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Invoerfout @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Invoerfout @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Invoerfout @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Invoerfout @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Invoerfout @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Invoerfout @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Invoerfout @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Invoerfout @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh FEM-maas bewerken - + Meshing failure Meshing mislukt @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Invoerfout @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Verwijderen @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Selectiefout - + Please use only a single reference for bearing constraint Gelieve slechts één enkele referentie te gebruiken voor de lagerbeperking - + Only faces can be picked Alleen vlakken kunnen geselecteerd worden - + Only cylindrical faces can be picked Alleen cylindrische vlakken kunnen geselecteerd worden - + Only planar faces can be picked Alleen planaire vlakken kunnen geselecteerd worden - + Only linear edges can be picked Alleen lineaire randen kunnen geselecteerd worden - + Only faces and edges can be picked Alleen vlakken en randen kunnen geselecteerd worden @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Verwijderen - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Selectiefout - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Niets geselecteerd! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Geselecteerd object is geen deel! - - + + Only faces can be picked Alleen vlakken kunnen geselecteerd worden - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Eenvoudig - + Turbulence Turbulentie - + Thermal Thermisch - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensiteit [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Lengte schaal[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulische Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Lege selectie - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Verkeerde selectie - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Verkeerde selectie - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Selectiefout - + Only planar faces can be picked Alleen planaire vlakken kunnen geselecteerd worden - + Only linear edges can be picked Alleen lineaire randen kunnen geselecteerd worden - + Only faces and edges can be picked Alleen vlakken en randen kunnen geselecteerd worden @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Selectiefout - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! - + Only faces can be picked Alleen vlakken kunnen geselecteerd worden - + Only planar faces can be picked Alleen planaire vlakken kunnen geselecteerd worden @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! - + Only faces can be picked Alleen vlakken kunnen geselecteerd worden @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Katroldiameter - + Torque [Nm] Koppel [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! - + Only faces can be picked Alleen vlakken kunnen geselecteerd worden @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Selected object is not a part! Geselecteerd object is geen deel! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Selectiefout - - + + Nothing selected! Niets geselecteerd! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Geselecteerd object is geen deel! - + Only faces can be picked Alleen vlakken kunnen geselecteerd worden - + Only cylindrical faces can be picked Alleen cylindrische vlakken kunnen geselecteerd worden @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaakObjectNaam @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Lengte @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 bij (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Meshing mislukt - + The FEM module is built without NETGEN support. Meshing will not work!!! De FEM-module is gebouwd zonder NETGEN ondersteuning. De meshing zal niet werken!!! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, U moet een analyse maken of activeren - + Ok Ok - + Cancel Annuleren - - - - - - - - + + + + + + + + A dialog is already open in the task panel Een dialoog is al geopend in het taakvenster - - - - - - - - + + + + + + + + Do you want to close this dialog? Wilt u dit dialoogvenster sluiten? - + Meshing Meshing - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Importeren-Exporteren - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Groepen - + Are you sure you want to continue? Weet u zeker dat u wilt doorgaan? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Vloeistof randvoorwaarde - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Object afhankelijkheden @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6013,7 +5935,7 @@ used for the Elmer solver von Mises Stress - von Mises Stress + von Mises spanning @@ -6023,7 +5945,7 @@ used for the Elmer solver Max Principal Stress - Max Principal Stress + Maximale principiële spanning @@ -6033,7 +5955,7 @@ used for the Elmer solver Mass Flow Rate - Mass Flow Rate + Massastroomsnelheid @@ -6043,12 +5965,12 @@ used for the Elmer solver Min Principal Stress - Min Principal Stress + Minimale principiële spanning Equivalent Plastic Strain - Equivalent Plastic Strain + Equivalente plastische rek @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem EEM - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem EEM - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem EEM - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem EEM - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_pl.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_pl.ts index e622fc4300..f604f1d2e9 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_pl.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_pl.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem MES - + Bearing constraint Wiązanie łożyska - + Creates a bearing constraint Tworzy wiązanie łożyska @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem MES - + Contact constraint Kontakt - + Creates a contact constraint between faces Tworzy wiązanie styku między powierzchniami @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem MES - - Constraint displacement - Zdefiniuj przemieszczenie + + Displacement boundary condition + Warunek brzegowy przemieszczenia - + Creates a displacement boundary condition for a geometric entity Definiuje warunek brzegowy przemieszczenia dla obiektu geometrycznego @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem MES - - Constraint fixed - Zdefiniuj przytwierdzenie + + Fixed boundary condition + Warunek brzegowy utwierdzenia - + Creates a fixed boundary condition for a geometric entity Definiuje warunek brzegowy utwierdzenia dla obiektu geometrycznego @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem MES - + Fluid boundary condition Warunek brzegowy dla płynu - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Dodaje warunek brzegowy dla płynu na powierzchni do analizy CFD @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem MES - - Constraint force - Zdefiniuj siłę + + Force load + Obciążenie siłą - + Creates a force load applied to a geometric entity Tworzy obciążenie siłą przyłożone do obiektu geometrycznego @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem MES - + Gear constraint Wiązanie koła zębatego - + Creates a gear constraint Tworzy wiązanie koła zębatego @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem MES - + Heat flux load Obciążenie strumieniem ciepła - + Creates a heat flux load acting on a face Tworzy obciążenie strumieniem ciepła działające na powierzchni @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem MES - + Initial temperature Temperatura początkowa - + Creates an initial temperature acting on a body Tworzy temperaturę początkową oddziałującą na ciało @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem MES - + Plane multi-point constraint Wiązanie MPC typu płaszczyzna - + Creates a plane multi-point constraint for a face Definiuje wiązanie MPC typu płaszczyzna dla powierzchni @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem MES - - Constraint pressure - Zdefiniuj obciążenie ciśnieniem + + Pressure load + Obciążenie ciśnieniem - + Creates a pressure load acting on a face Definiuje obciążenie ciśnieniem działające na powierzchni @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem MES - + Pulley constraint Wiązanie koła pasowego - + Creates a pulley constraint Definiuje więz koła pasowego @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem MES - + Spring Sprężyna - + Creates a spring acting on a face Definiuje sprężynę działającą na powierzchni @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem MES - - Constraint temperature - Zdefiniuj temperaturę + + Temperature boundary condition + Warunek brzegowy temperatury - + Creates a temperature/concentrated heat flux load acting on a face Definiuje obciążenie temperaturą / skupionym strumieniem ciepła na powierzchni @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem MES - - Constraint transform - Zdefiniuj odkształcenie + + Local coordinate system + Lokalny układ współrzędnych - + Create a local coordinate system on a face Definiuje lokalny układ współrzędnych na powierzchni @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem MES - + Nodes set Zestaw węzłów - + Creates a FEM mesh nodes set Tworzy zestaw węzłów siatki MES - + Wrong selection Nieprawidłowy wybór - + Select a single FEM mesh or nodes set, please. Wybierz pojedynczą siatkę MES albo zestaw węzłów. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem MES - + Node set by poly Zestaw węzłów przez poly - - + + Create node set by Poly Utwórz zestaw węzłów metodą Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem MES - + Apply changes to pipeline Zastosuj zmiany - + Apply changes to parameters directly and not on recompute only... Zastosuj zmiany bezpośrednio do parametrów, nie tylko do ponownego przeliczenia... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem MES - + Region clip filter Filtr przycięcia obszaru - + Define/create a clip filter which uses functions to define the clipped region Zdefiniuj / dodaj filtr przycinania, który używa funkcji do określenia przyciętego obszaru - + Wrong selection Nieprawidłowy wybór - + Select a pipeline, please. Proszę wybrać rurociąg. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem MES - + Function cut filter Filtr cięcia funkcją - + Cut the data along an implicit function Wytnij dane wzdłuż niejawnej funkcji @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem MES - + Line clip filter Filtr przycięcia linią - + Define/create a clip filter which clips a field along a line Zdefiniuj / dodaj filtr przycinania, który przycina pole wzdłuż linii @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem MES - + Data at point clip filter Filtr danych w punkcie - + Define/create a clip filter which clips a field data at point Zdefiniuj / dodaj filtr przycinania, który przycina dane pola w punkcie @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem MES - + Filter functions Funkcje filtrów - + Functions for use in postprocessing filter... Funkcje do użycia w filtrze do obróbki wyników... - + Plane Płaszczyzna - + Sphere Sfera - + Cylinder Walec - + Box Prostopadłościan @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Grubość [mm] - + Stress [MPa] Plot Y-Axis Label Naprężenia [MPa] - + Linearized Stresses Plot title Naprężenia ukierunkowane liniowo - + Membrane Plot legend item label Naprężenie membranowe - + Membrane and Bending Plot legend item label Naprężenie membranowe i zginające - + Total Plot legend item label Łącznie - - - Fem - MES - - - - Stress linearization plot - Wykres linearyzacji naprężeń - - - - Define/create stress linearization plots - Zdefiniuj / dodaj wykresy linearyzacji naprężeń - - - - - Wrong selection - Nieprawidłowy wybór - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Wybierz filtr przycinania, który przycina pole naprężeń wzdłuż linii. - - - - CmdFemPostPipelineFromResult - - - Fem - MES - - - - Post pipeline from result - Prezentacja graficzna wyników - - - - Creates a post processing pipeline from a result object - Tworzy ciąg do obróbki danych z obiektu wyników - - - - Wrong selection type - Niewłaściwy typ wyboru - - - - Select a result object, please. - Wybierz obiekt wyników. - - - - CmdFemPostScalarClipFilter - - - Fem - MES - - - - Scalar clip filter - Filtr przycinania skalarnego - - - - Define/create a clip filter which clips a field with a scalar value - Zdefiniuj / dodaj filtr przycinania, który przycina pole wartością skalarną - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Wykres linearyzacji naprężeń + + + + Define/create stress linearization plots + Zdefiniuj / dodaj wykresy linearyzacji naprężeń + + + + + Wrong selection + Nieprawidłowy wybór + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Wybierz filtr przycinania, który przycina pole naprężeń wzdłuż linii. + + + + CmdFemPostPipelineFromResult + + + Fem + MES + + + + Post pipeline from result + Prezentacja graficzna wyników + + + + Creates a post processing pipeline from a result object + Tworzy ciąg do obróbki danych z obiektu wyników + + + + Wrong selection type + Niewłaściwy typ wyboru + + + + Select a result object, please. + Wybierz obiekt wyników. + + + + CmdFemPostScalarClipFilter + + + Fem + MES + + + + Scalar clip filter + Filtr przycinania skalarnego + + + + Define/create a clip filter which clips a field with a scalar value + Zdefiniuj / dodaj filtr przycinania, który przycina pole wartością skalarną + + + + CmdFemPostWarpVectorFilter + + + Fem + MES + + + Warp filter Filtr wizualizacji deformacji - + Warp the geometry along a vector field by a certain factor Zdeformuj geometrię wzdłuż pola wektorowego o określony współczynnik @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Dodaj warunek brzegowy dla płynu - + Make bearing constraint Utwórz wiązanie łożyska - + Make contact constraint on a face Utwórz kontakt na powierzchni - + Make displacement boundary condition on face Utwórz warunek brzegowy przemieszczenia na powierzchni - + Make fixed boundary condition for geometry Utwórz warunek brzegowy utwierdzenia dla geometrii - + Make force load on geometry Utwórz obciążenie siłą na geometrii - + Make gear constraint Utwórz wiązanie koła zębatego - + Make heat flux load on face Utwórz obciążenie strumieniem ciepła na powierzchni - + Make initial temperature condition on body Utwórz warunek początkowy temperatury ciała - + Make plane multi-point constraint on face Utwórz więz MPC typu płaszczyzna na powierzchni - + Make pressure load on face Utwórz obciążenie ciśnieniem na powierzchni - + Make spring on face Utwórz sprężynę na powierzchni - + Make pulley constraint Utwórz wiązanie koła pasowego - + Make temperature boundary condition on face Utwórz warunek brzegowy temperatury na powierzchni - + Make local coordinate system on face Utwórz lokalny układ współrzędnych na powierzchni - + Place robot Dodaj robota - + Edit nodes set Edytuj zestaw węzłów - + Create nodes set Utwórz zestaw węzłów - + Create filter Utwórz filtr - + Create function Utwórz cechę - + Create pipeline from result Utwórz ciąg z wyniku - + Edit Mirror Edytuj odbicie lustrzane @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Utwórz funkcję płaszczyzny, zdefiniowaną przez jej początek i kierunek normalny - + Create a sphere function, defined by its center and radius Utwórz funkcję kuli, zdefiniowaną przez jej środek i promień - + Create a cylinder function, defined by its center, axis and radius Utwórz funkcję walca, zdefiniowaną przez jego środek, oś i promień - + Create a box function, defined by its center, length, width and height Utwórz cechę prostopadłościanu, zdefiniowanego przez jego środek, długość, szerokość i wysokość @@ -1016,20 +1016,20 @@ Dolna granica częstotliwości - + File does not exist Plik nie istnieje - + The specified executable '%1' does not exist! Specify another file please. - Wskazany plik wykonywalny + The specified executable '%1' - nie istnieje! -Wybierz inny plik. + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ zostaną połączone, aby uczynić granice objętości niewidocznymi.<html><head/><body><p><span style=" font-weight:600;">Uwaga:</span> Zaleca się korzystanie z parzystej liczby rdzeni by skorzystać na symetrii siatki (używanie 8 rdzeni może być szybsze niż 9).<br/><span style=" font-weight:600;">Ponadto:</span> W ekstremalnych przypadkach ElmerSolver może nie osiągać zbieżności jeśli liczba rdzeni jest zbyt wysoka.</p></body></html> - + File does not exist Plik nie istnieje - + The specified executable '%1' does not exist! Specify another file please. - Wskazany plik wykonywalny + The specified executable '%1' - nie istnieje! -Wybierz inny plik. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Nie nadaje się do pracy wielowątkowej - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Nieprawidłowe ustawienie Elmera: Używasz więcej niż jednego rdzenia procesora. Dlatego wymagany jest plik wykonywalny z przyrostkiem "_mpi.exe". - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Nieprawidłowe ustawienie Elmera: Używasz więcej niż jednego rdzenia procesora. @@ -1248,7 +1248,7 @@ w których zastosowano wiązanie lub materiał. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + Pozwól aplikacji zarządzać (tworzyć, usuwać) katalogami roboczymi dla wszystkich solwerów. Użyj katalogów tymczasowych. @@ -1382,20 +1382,20 @@ tworzeniu nowej analizy Pozostaw to pole puste, aby użyć domyślnego pliku binarnego Gmsh - + File does not exist Plik nie istnieje - + The specified executable '%1' does not exist! Specify another file please. - Wskazany plik wykonywalny + The specified executable '%1' - nie istnieje! -Wybierz inny plik. + does not exist! +Specify another file please. @@ -1455,85 +1455,6 @@ Obiekt wyników FreeCAD: Zaimportowane dane zostaną przekonwetowane na obiekt w Obiekt wyników FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materiał - - - - Card resources - Zasoby karty - - - - The cards built-in to FreeCAD will be listed as available. - Karty materiałów z katalogu FreeCAD -zostaną wyświetlone jako dostępne. - - - - Use built-in materials - Użyj materiałów dołączonych - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Karty materiałów z katalogu ustawień FreeCAD również -zostaną wyświetlone jako dostępne. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Użyj materiałów z katalogu programu FreeCAD - "Materials" w preferowanej lokalizacji użytkownika - - - - Also material cards also from the specified directory -will be listed as available. - Karty materiałów z podanego katalogu również -zostaną wyświetlone jako dostępne. - - - - Use materials from user defined directory - Użyj materiałów z katalogu zdefiniowanego przez użytkownika - - - - User directory - Katalog użytkownika - - - - Card sorting and duplicates - Sortowanie kart i duplikaty - - - - Duplicate cards will be deleted from the displayed material card list. - Powielone karty zostaną usunięte z wyświetlanej listy kart materiałowych. - - - - Delete card duplicates - Usuń duplikaty kart - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Karty materiałów pojawiają się posortowane według zasobów (lokalizacji). -Jeśli ta opcja nie jest zaznaczone, będą posortowane według nazw. - - - - Sort by resources - Sortuj według katalogów - - FemGui::DlgSettingsFemMystranImp @@ -1572,20 +1493,20 @@ Jeśli ta opcja nie jest zaznaczone, będą posortowane według nazw.Zapisz komentarze do pliku wejściowego - + File does not exist Plik nie istnieje - + The specified executable '%1' does not exist! Specify another file please. - Wskazany plik wykonywalny + The specified executable '%1' - nie istnieje! -Wybierz inny plik. + does not exist! +Specify another file please. @@ -1684,34 +1605,34 @@ iteracyjnego solvera, gdy pojawi się komunikat o błędzie, że należy zwiększyć wartość parametru "MAXKOI". - + File does not exist Plik nie istnieje - + The specified z88r executable '%1' does not exist! Specify another file please. - Wskazany plik wykonywalny z88r + The specified z88r executable '%1' - nie istnieje! -Wybierz inny plik. + does not exist! +Specify another file please. - - + + Wrong file Niewłaściwy plik - + You must specify the path to the z88r.exe! Musisz określić ścieżkę do pliku solvera z88r.exe! - + You must specify the path to the z88r! Musisz określić ścieżkę do solvera z88r! @@ -1721,7 +1642,7 @@ Wybierz inny plik. Nodes set - Zestaw węzłów + Zbiór węzłów @@ -1735,13 +1656,13 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraint - - + + Input error Błąd danych wejściowych - + You must specify at least one reference Należy określić co najmniej jedno odniesienie @@ -1749,7 +1670,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintBearing - + Input error Błąd danych wejściowych @@ -1757,7 +1678,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintContact - + Input error Błąd danych wejściowych @@ -1765,7 +1686,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintDisplacement - + Input error Błąd danych wejściowych @@ -1773,7 +1694,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Błąd danych wejściowych @@ -1781,13 +1702,13 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintForce - - + + Input error Błąd danych wejściowych - + Please specify a force greater than 0 Proszę określić siłę większą od 0 @@ -1795,7 +1716,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintGear - + Input error Błąd danych wejściowych @@ -1803,7 +1724,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintHeatflux - + Input error Błąd danych wejściowych @@ -1811,8 +1732,8 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Błąd danych wejściowych @@ -1820,7 +1741,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintPressure - + Input error Błąd danych wejściowych @@ -1828,7 +1749,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintPulley - + Input error Błąd danych wejściowych @@ -1836,7 +1757,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintSpring - + Input error Błąd danych wejściowych @@ -1844,7 +1765,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintTemperature - + Input error Błąd danych wejściowych @@ -1852,7 +1773,7 @@ Wybierz inny plik. FemGui::TaskDlgFemConstraintTransform - + Input error Błąd danych wejściowych @@ -1860,12 +1781,12 @@ Wybierz inny plik. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Edycja siatki MES - + Meshing failure Niepowodzenie tworzenia siatki @@ -1873,7 +1794,7 @@ Wybierz inny plik. FemGui::TaskDlgPost - + Input error Błąd danych wejściowych @@ -1883,18 +1804,18 @@ Wybierz inny plik. Nodes set - Zbiór węzłów + Zestaw węzłów FemGui::TaskFemConstraint - + Analysis feature parameters Parametry cech analizy - + Delete Usuń @@ -1902,42 +1823,42 @@ Wybierz inny plik. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Błąd selekcji - + Please use only a single reference for bearing constraint Proszę użyć tylko jednego odniesienia dla punktu podparcia - + Only faces can be picked Można wybrać tylko powierzchnie - + Only cylindrical faces can be picked Mogą być użyte tylko powierzchnie cylindryczne - + Only planar faces can be picked Mogą być użyte tylko powierzchnie płaskie - + Only linear edges can be picked Mogą być użyte tylko krawędzie liniowe - + Only faces and edges can be picked Mogą być użyte tylko powierzchnie i krawędzie @@ -1946,77 +1867,77 @@ Wybierz inny plik. FemGui::TaskFemConstraintContact - + Delete Usuń - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error - Błąd selekcji + Błąd zaznaczenia - + Only one face in object! - moved to master face Tylko jedna powierzchnia w obiekcie! - przeniesione do powierzchni głównej - - + + Only one master face and one slave face for a contact constraint! Tylko jedna powierzchnia główna i jedna powierzchnia drugorzędna dla kontaktu! - - - - + + + + Nothing selected! Nic nie wybrano! - + Only one slave face for a contact constraint! Tylko jedna powierzchnia drugorzędna dla kontaktu! - - - - + + + + Selected object is not a part! Wybrany obiekt nie jest częścią! - - + + Only faces can be picked - Można wybrać tylko powierzchnie + Można wybrać tylko ściany - + Only one master for a contact constraint! Tylko jedna powierzchnia główna dla kontaktu! - + Only one master face for a contact constraint! Tylko jedna powierzchnia główna dla kontaktu! @@ -2024,28 +1945,28 @@ Wybierz inny plik. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error - Błąd zaznaczenia + Błąd wyboru - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Dozwolony jest tylko jeden typ wyboru (wierzchołek, powierzchnia lub krawędź) na cechę analizy! @@ -2053,28 +1974,28 @@ Wybierz inny plik. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Błąd wyboru - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Dozwolony jest tylko jeden typ wyboru (wierzchołek, powierzchnia lub krawędź) na cechę analizy! @@ -2082,128 +2003,128 @@ Wybierz inny plik. FemGui::TaskFemConstraintFluidBoundary - + Basic Podstawowe - + Turbulence Zawirowanie - + Thermal Termiczne - + select boundary type, faces and set value wybierz typ brzegu, powierzchnie i ustaw wartość - + Intensity [0~1] Natężenie [0~1] - + Dissipation Rate [m2/s3] Szybkość rozpraszania [m2/s3] - + Length Scale[m] Skala długości [m] - + Viscosity Ratio [1] Współczynnik lepkości [1] - + Hydraulic Diameter [m] Średnica hydrauliczna [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Strumień [W/m2] - + Empty selection Pusty wybór - + Select an edge or a face, please. Wybierz krawędź lub powierzchnię. - - - - - + + + + + Wrong selection Nieprawidłowy wybór - + Selected object is not a part object! Wybrany obiekt nie jest częścią! - + Only one planar face or edge can be selected! Tylko jedna płaska powierzchnia lub krawędź może być wybrana! - + Only planar faces can be picked for 3D Tylko płaskie powierzchnie mogą być wybrane do 3D - + Only planar edges can be picked for 2D Tylko płaskie krawędzie mogą być wybrane do 2D - + Only faces for 3D part or edges for 2D can be picked Tylko powierzchnie dla części 3D i krawędzie dla 2D mogą być wybrane - - + - - + + + Selection error Błąd wyboru - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Dozwolony jest tylko jeden typ wyboru (wierzchołek, powierzchnia lub krawędź) na cechę analizy! @@ -2211,39 +2132,39 @@ Wybierz inny plik. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Błąd wyboru - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Dozwolony jest tylko jeden typ wyboru (wierzchołek, powierzchnia lub krawędź) na cechę analizy! - - + + Wrong selection - Nieprawidłowy wybór + Niewłaściwy wybór - + Select an edge or a face, please. Wybierz krawędź lub powierzchnię. @@ -2251,24 +2172,24 @@ Wybierz inny plik. FemGui::TaskFemConstraintGear - - - + + + Selection error - Błąd wyboru + Błąd w zaznaczeniu - + Only planar faces can be picked - Mogą być użyte tylko powierzchnie płaskie + Wybrać można tylko płaskie ściany - + Only linear edges can be picked Mogą być użyte tylko krawędzie liniowe - + Only faces and edges can be picked Mogą być użyte tylko powierzchnie i krawędzie @@ -2276,30 +2197,30 @@ Wybierz inny plik. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error - Błąd w zaznaczeniu + Błąd wyboru - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - - + + Selection must only consist of faces! Wybór musi składać się tylko z powierzchni! @@ -2307,71 +2228,71 @@ Wybierz inny plik. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Błąd wyboru - - + + Only one face can be selected for a plane multi-point constraint! Tylko jedna powierzchnia może być wybrana do wiązania MPC typu płaszczyzna! - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - + Only faces can be picked Można wybrać tylko ściany - + Only planar faces can be picked - Wybrać można tylko płaskie ściany + Mogą być użyte tylko powierzchnie płaskie FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Błąd wyboru - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - + Only faces can be picked Można wybrać tylko ściany @@ -2379,12 +2300,12 @@ Wybierz inny plik. FemGui::TaskFemConstraintPulley - + Pulley diameter Średnica koła pasowego - + Torque [Nm] Moment obrotowy [Nm] @@ -2392,28 +2313,28 @@ Wybierz inny plik. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Błąd wyboru - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - + Only faces can be picked Można wybrać tylko ściany @@ -2421,22 +2342,22 @@ Wybierz inny plik. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Błąd wyboru - - + + Nothing selected! Nic nie wybrano! - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! @@ -2444,64 +2365,64 @@ Wybierz inny plik. FemGui::TaskFemConstraintTransform - + Analysis feature update error Błąd aktualizacji cechy analizy - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Przekształcalne powierzchnie uległy zmianie. Dodaj tylko przekształcalne powierzchnie i usuń te nieprzekształcalne! - - - - - - - - - - + + + + + + + + + + Selection error - Błąd wyboru + Błąd selekcji - - + + Nothing selected! Nic nie wybrano! - - + + Only one face for rectangular local coordinate system! Tylko jedna powierzchnia dla prostokątnego lokalnego układu współrzędnych! - + Only one face for local coordinate system! Tylko jedna powierzchnia dla lokalnego układu współrzędnych! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Można wybrać tylko powierzchnie przekształcalne! Najpierw zastosuj warunek brzegowy przemieszczenia do powierzchni, a następnie zastosuj do niej lokalny układ współrzędnych - - + + Selected object is not a part! Wybrany obiekt nie jest częścią! - + Only faces can be picked - Można wybrać tylko ściany + Można wybrać tylko powierzchnie - + Only cylindrical faces can be picked Mogą być użyte tylko powierzchnie cylindryczne @@ -2509,7 +2430,7 @@ Wybierz inny plik. FemGui::TaskObjectName - + TaskObjectName Zadaj nazwę obiektu @@ -2517,7 +2438,7 @@ Wybierz inny plik. FemGui::TaskPostClip - + Clip region, choose implicit function Przytnij obszar, wybierz funkcję niejawną @@ -2525,7 +2446,7 @@ Wybierz inny plik. FemGui::TaskPostCut - + Function cut, choose implicit function Funkcja cięcia, wybierz funkcję niejawną @@ -2533,12 +2454,12 @@ Wybierz inny plik. FemGui::TaskPostDataAlongLine - + Data along a line options Opcje danych wzdłuż linii - + Length X-Axis plot label Długość @@ -2547,12 +2468,12 @@ Wybierz inny plik. FemGui::TaskPostDataAtPoint - + Data at point options Opcje danych w punkcie - + %1 at (%2; %3; %4) is: %5 %6 %1 w (%2; %3; %4) to: %5 %6 @@ -2560,7 +2481,7 @@ Wybierz inny plik. FemGui::TaskPostDisplay - + Result display options Opcje wyświetlania wyników @@ -2568,7 +2489,7 @@ Wybierz inny plik. FemGui::TaskPostFunction - + Implicit function Funkcja niejawna @@ -2576,7 +2497,7 @@ Wybierz inny plik. FemGui::TaskPostScalarClip - + Scalar clip options Opcje przycinania skalarnego @@ -2584,7 +2505,7 @@ Wybierz inny plik. FemGui::TaskPostWarpVector - + Warp options Opcje wizualizacji deformacji @@ -2608,12 +2529,12 @@ Wybierz inny plik. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Niepowodzenie tworzenia siatki - + The FEM module is built without NETGEN support. Meshing will not work!!! Moduł MES został skompilowany bez wsparcia generatora NETGEN. Tworzenie siatki nie będzie działać!!! @@ -2673,7 +2594,7 @@ Wybierz inny plik. use FreeCAD material editor - użyj edytora materiałów FreeCAD + Użyj edytora materiałów FreeCAD @@ -3585,46 +3506,45 @@ Uwaga: w 2D tylko ustawienie dla x jest możliwe, Należy stworzyć lub aktywować analizę - + Ok OK - + Cancel Anuluj - - - - - - - - + + + + + + + + A dialog is already open in the task panel Okienko dialogowe jest już otwarte w panelu zadań - - - - - - - - + + + + + + + + Do you want to close this dialog? Czy chcesz zamknąć to okno? - + Meshing Tworzenie siatki - @@ -3641,22 +3561,22 @@ Uwaga: w 2D tylko ustawienie dla x jest możliwe, Import-Eksport - + Constraint initial temperature Zdefiniuj temperaturę początkową - + Constraint pulley Zdefiniuj koło pasowe - + Constraint spring Wiązanie sprężyny - + Edit post processing object Edytuj obiekt otrzymanych wyników @@ -3696,62 +3616,62 @@ Uwaga: w 2D tylko ustawienie dla x jest możliwe, Grupy - + Are you sure you want to continue? Czy na pewno chcesz kontynuować? - + Contact constraint Kontakt - + Displacement boundary condition Warunek brzegowy przemieszczenia - + Fixed boundary condition Warunek brzegowy utwierdzenia - + Fluid boundary condition Warunek brzegowy dla płynu - + Force load Obciążenie siłą - + Heat flux load Obciążenie strumieniem ciepła - + Plane multi-point constraint Wiązanie MPC typu płaszczyzna - + Pressure load Obciążenie ciśnieniem - + Temperature boundary condition Warunek brzegowy temperatury - + Local coordinate system Lokalny układ współrzędnych - + Edit analysis feature Edytuj cechę analizy @@ -3771,7 +3691,7 @@ Uwaga: w 2D tylko ustawienie dla x jest możliwe, None - Żadne + Brak @@ -4089,7 +4009,7 @@ Aby uzyskać możliwe zmienne, zobacz pole opisu poniżej. Std_Delete - + Object dependencies Zależności obiektu @@ -5368,20 +5288,20 @@ użyta przez solver Elmer setupFilter - + Error: A filter can only be applied to a single object. Błąd: Filtr może być zastosowany tylko do pojedynczego obiektu. - - - + + + The filter could not be set up. Nie można skonfigurować filtra. - - + + Error: no post processing object selected. Błąd: nie wybrano obiektu przetwarzania końcowego. @@ -5880,7 +5800,7 @@ sprężystość (naprężenia) Edit - Edytuj + Edycja @@ -6017,7 +5937,7 @@ sprężystość (naprężenia) Max Principal Stress - I naprężenie główne + Maksymalne naprężenie główne @@ -6037,7 +5957,7 @@ sprężystość (naprężenia) Min Principal Stress - III naprężenia główne + Minimalne naprężenia główne @@ -6096,13 +6016,13 @@ sił magnetodynamicznych 2D CmdFemCompEmConstraints - + Fem MES - - + + Electromagnetic boundary conditions Warunki brzegowe elektromagnetyczne @@ -6148,17 +6068,17 @@ sił magnetodynamicznych 2D CmdFemCompEmEquations - + Fem MES - + Electromagnetic equations Równania elektromagnetyczne - + Electromagnetic equations for the Elmer solver Równania elektromagnetyczne dla solvera Elmer @@ -6166,17 +6086,17 @@ sił magnetodynamicznych 2D CmdFemPostContoursFilter - + Fem MES - + Contours filter Filtr konturów - + Define/create a contours filter which displays iso contours Zdefiniuj / utwórz filtr konturów, który wyświetla izokontury @@ -6184,7 +6104,7 @@ sił magnetodynamicznych 2D FemGui::TaskPostContours - + Contours filter options Wybierz opcje filtra @@ -6278,17 +6198,17 @@ deformacji (sprężystość nieliniowa) CmdFemCompMechEquations - + Fem MES - + Mechanical equations Równania mechaniczne - + Mechanical equations for the Elmer solver Równania mechaniczne dla solvera Elmer diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_pt-BR.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_pt-BR.ts index fc9921d002..efd5490ca1 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_pt-BR.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_pt-BR.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem MEF - + Bearing constraint Restrição de rolamento - + Creates a bearing constraint Cria uma restrição de rolamento @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem MEF - + Contact constraint Restrição de contato - + Creates a contact constraint between faces Cria uma restrição de contato entre faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem MEF - - Constraint displacement - Ação de deslocamento + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Cria uma condição de limite de deslocamento para uma entidade geométrica @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem MEF - - Constraint fixed - Ação fixa + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Cria uma condição de limite fixo para uma entidade geométrica @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem MEF - + Fluid boundary condition Condição do limite fluido - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Criar uma condição de limite de fluido para CFD numa face de uma entidade @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem MEF - - Constraint force - Ação de força + + Force load + Force load - + Creates a force load applied to a geometric entity Cria uma carregamento de força aplicado a uma entidade geométrica @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem MEF - + Gear constraint Restrição de engrenagem - + Creates a gear constraint Cria uma restrição de engrenagem @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem MEF - + Heat flux load Carregamento de fluxo de calor - + Creates a heat flux load acting on a face Cria um carregamento de fluxo de calor atuando em uma face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem MEF - + Initial temperature Temperatura inicial - + Creates an initial temperature acting on a body Cria uma temperatura inicial agindo em um corpo @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem MEF - + Plane multi-point constraint Restrição de plano multipontos - + Creates a plane multi-point constraint for a face Cria uma restrição de plano multipontos para uma face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem MEF - - Constraint pressure - Ação de pressão + + Pressure load + Pressure load - + Creates a pressure load acting on a face Cria um carregamento de pressão agindo em uma face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem MEF - + Pulley constraint Restrição de polia - + Creates a pulley constraint Cria uma restrição de polia @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem MEF - + Spring Mola - + Creates a spring acting on a face Cria uma mola agindo em uma face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem MEF - - Constraint temperature - Ação de temperatura + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Cria um carregamento de temperatura/fluxo de calor concentrado agindo em uma face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem MEF - - Constraint transform - Ação de transformação + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Cria um sistema de coordenadas locais em uma face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem MEF - + Nodes set Conjunto de nós - + Creates a FEM mesh nodes set Cria um conjunto de nós de malha MEF - + Wrong selection Seleção errada - + Select a single FEM mesh or nodes set, please. Selecione uma única malha FEM ou conjunto de nós, por favor. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem MEF - + Node set by poly Nó definido por polígono - - + + Create node set by Poly Criar um conjunto de nós a partir de um polígono @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem MEF - + Apply changes to pipeline Aplicar alterações ao pipeline - + Apply changes to parameters directly and not on recompute only... Aplica as alterações dos parâmetros diretamente e não apenas na recalculação... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem MEF - + Region clip filter Filtro de recorte de região - + Define/create a clip filter which uses functions to define the clipped region Definir/criar Filtro que utiliza funções para definir uma região a ser recortada - + Wrong selection Seleção errada - + Select a pipeline, please. Selecione um pipeline. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem MEF - + Function cut filter Função filtro de corte - + Cut the data along an implicit function Recorta os dados por meio de uma função implícita @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem MEF - + Line clip filter Filtro de recorte de linha - + Define/create a clip filter which clips a field along a line Definir / criar um filtro que recorta um campo ao longo de uma linha @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem MEF - + Data at point clip filter Dados no ponto do filtro - + Define/create a clip filter which clips a field data at point Definir / criar um filtro que recorda um campo de dados em um ponto @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem MEF - + Filter functions Funções de filtro - + Functions for use in postprocessing filter... Funções para uso em filtro pós-processamento... - + Plane Plano - + Sphere Esfera - + Cylinder Cilindro - + Box Caixa @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Espessura (mm) - + Stress [MPa] Plot Y-Axis Label Resistência à compressão (MPa) - + Linearized Stresses Plot title Estresse linear - + Membrane Plot legend item label Membrana - + Membrane and Bending Plot legend item label Membrana e curvatura - + Total Plot legend item label Total - - - Fem - MEF - - - - Stress linearization plot - Gráfico de estresse linear - - - - Define/create stress linearization plots - Definir/criar gráficos de estresse linear - - - - - Wrong selection - Seleção errada - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Selecione um filtro que corta um campo de controle de estresse ao longo de uma linha. - - - - CmdFemPostPipelineFromResult - - - Fem - MEF - - - - Post pipeline from result - Pipeline de pós-processamento a partir de um resultado - - - - Creates a post processing pipeline from a result object - Cria um pipeline de pós-processamento a partir de um objeto de resultado - - - - Wrong selection type - Tipo de seleção errado - - - - Select a result object, please. - Por favor selecione um objeto de resultado. - - - - CmdFemPostScalarClipFilter - - - Fem - MEF - - - - Scalar clip filter - Filtro de recorte escalar - - - - Define/create a clip filter which clips a field with a scalar value - Definir / criar um filtro que recorda um campo de dados com um valor escalar - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Gráfico de estresse linear + + + + Define/create stress linearization plots + Definir/criar gráficos de estresse linear + + + + + Wrong selection + Seleção errada + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Selecione um filtro que corta um campo de controle de estresse ao longo de uma linha. + + + + CmdFemPostPipelineFromResult + + + Fem + MEF + + + + Post pipeline from result + Pipeline de pós-processamento a partir de um resultado + + + + Creates a post processing pipeline from a result object + Cria um pipeline de pós-processamento a partir de um objeto de resultado + + + + Wrong selection type + Tipo de seleção errado + + + + Select a result object, please. + Por favor selecione um objeto de resultado. + + + + CmdFemPostScalarClipFilter + + + Fem + MEF + + + + Scalar clip filter + Filtro de recorte escalar + + + + Define/create a clip filter which clips a field with a scalar value + Definir / criar um filtro que recorda um campo de dados com um valor escalar + + + + CmdFemPostWarpVectorFilter + + + Fem + MEF + + + Warp filter Filtro de dobra - + Warp the geometry along a vector field by a certain factor Dobra a geometria ao longo de um campo de vetores por um fator determindado @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Criar condição de limite fluido - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Colocar robô - + Edit nodes set Editar conjunto de nós - + Create nodes set Criar conjunto de nós - + Create filter Criar filtro - + Create function Criar função - + Create pipeline from result Criar pipeline a partir do resultado - + Edit Mirror Editar espelhamento @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Função criação de plano, definido por sua origem e direção normal - + Create a sphere function, defined by its center and radius Função criação de esfera, definida por seu centro e raio - + Create a cylinder function, defined by its center, axis and radius Função criar um cilindro, definida por seu centro, eixo e raio - + Create a box function, defined by its center, length, width and height Função criar uma caixa, definida por seu centro, comprimento, largura e altura @@ -1016,20 +1016,20 @@ Limite de baixa frequência - + File does not exist O arquivo não existe - + The specified executable '%1' does not exist! Specify another file please. - O executável especificado + The specified executable '%1' - não existe! -Especifique outro arquivo, por favor. + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ serão mescladas para tornar os limites de volume invisíveis. <html><head/><body><p><span style=" font-weight:600;">Nota:</span> Recomenda-se usar um número par de núcleos para se beneficiar de simetrias da malha. (O uso de 8 núcleos pode ser mais rápido que 9 núcleos.)<br/><span style=" font-weight:600;">Nota também:</span> Em casos extremos, ElmerSolver pode não convergir se o número de núcleos for muito alto.</p></body></html> - + File does not exist O arquivo não existe - + The specified executable '%1' does not exist! Specify another file please. - O executável especificado + The specified executable '%1' - não existe! -Especifique outro arquivo, por favor. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Não adequado para multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Configuração errada de Elmer: Você usa mais de um núcleo da CPU. Portanto, é necessário um executável com o sufixo '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Configuração errada de Elmer: Você usa mais de um núcleo da CPU. @@ -1384,20 +1384,20 @@ adicionar um recipiente de análise Deixe em branco para usar o arquivo binário padrão do Gmsh - + File does not exist O arquivo não existe - + The specified executable '%1' does not exist! Specify another file please. - O executável especificado + The specified executable '%1' - não existe! -Especifique outro arquivo, por favor. + does not exist! +Specify another file please. @@ -1460,83 +1460,6 @@ exato, então só funciona com arquivos VTK própriamente exportados do FreeCAD. Objeto de resultado FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Recursos de Cartão - - - - The cards built-in to FreeCAD will be listed as available. - Os cartões integrados ao FreeCAD serão listados como disponíveis. - - - - Use built-in materials - Utilizar materiais incorporados - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Os cartões do diretório de preferências do FreeCAD também serão listados como disponíveis. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materiais do diretório de materiais no diretório de preferências do FreeCAD do usuário - - - - Also material cards also from the specified directory -will be listed as available. - Também cartões materiais do diretório especificado -serão listados como disponível. - - - - Use materials from user defined directory - Use materiais de uma pasta definida pelo usuário - - - - User directory - Pasta do usuário - - - - Card sorting and duplicates - Ordenação e duplicação de cartões - - - - Duplicate cards will be deleted from the displayed material card list. - Catões duplicados serão deletados da lista de materiais exibidos. - - - - Delete card duplicates - Deletar cartões duplicados - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Cartões de material aparecem classificados por seus recursos (locais). -Se desmarcado, eles serão classificados por seus nomes. - - - - Sort by resources - Ordenar por recursos - - FemGui::DlgSettingsFemMystranImp @@ -1575,20 +1498,20 @@ Se desmarcado, eles serão classificados por seus nomes. Escrever comentários para o arquivo de entrada - + File does not exist O arquivo não existe - + The specified executable '%1' does not exist! Specify another file please. - O executável especificado + The specified executable '%1' - não existe! -Especifique outro arquivo, por favor. + does not exist! +Specify another file please. @@ -1687,34 +1610,34 @@ solver iterativo e receberá uma mensagem de erro que "MAXKOI" precisa ser aumentada. - + File does not exist O arquivo não existe - + The specified z88r executable '%1' does not exist! Specify another file please. - O executável z88r especificado + The specified z88r executable '%1' - não existe! -Especifique outro arquivo, por favor. + does not exist! +Specify another file please. - - + + Wrong file Arquivo incorreto - + You must specify the path to the z88r.exe! Você deve especificar o caminho para o z88r.exe! - + You must specify the path to the z88r! Você deve especificar o caminho para o z88r! @@ -1738,13 +1661,13 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraint - - + + Input error Erro de entrada - + You must specify at least one reference Você deve especificar pelo menos uma referência @@ -1752,7 +1675,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintBearing - + Input error Erro de entrada @@ -1760,7 +1683,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintContact - + Input error Erro de entrada @@ -1768,7 +1691,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintDisplacement - + Input error Erro de entrada @@ -1776,7 +1699,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Erro de entrada @@ -1784,13 +1707,13 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintForce - - + + Input error Erro de entrada - + Please specify a force greater than 0 Por favor, especifique uma força maior que 0 @@ -1798,7 +1721,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintGear - + Input error Erro de entrada @@ -1806,7 +1729,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintHeatflux - + Input error Erro de entrada @@ -1814,8 +1737,8 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Erro de entrada @@ -1823,7 +1746,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintPressure - + Input error Erro de entrada @@ -1831,7 +1754,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintPulley - + Input error Erro de entrada @@ -1839,7 +1762,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintSpring - + Input error Erro de entrada @@ -1847,7 +1770,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintTemperature - + Input error Erro de entrada @@ -1855,7 +1778,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgFemConstraintTransform - + Input error Erro de entrada @@ -1863,12 +1786,12 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Editar malha FEM - + Meshing failure Falha de engrenagem @@ -1876,7 +1799,7 @@ Especifique outro arquivo, por favor. FemGui::TaskDlgPost - + Input error Erro de entrada @@ -1892,12 +1815,12 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Excluir @@ -1905,42 +1828,42 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Erro de seleção - + Please use only a single reference for bearing constraint Por favor, use apenas uma única referência para ação de rolamentos - + Only faces can be picked Somente as faces podem ser selecionadas - + Only cylindrical faces can be picked Somente as faces cilíndricas podem ser selecionadas - + Only planar faces can be picked Apenas faces planas podem ser selecionadas - + Only linear edges can be picked Apenas arestas lineares podem ser selecionadas - + Only faces and edges can be picked Apenas faces e arestas podem ser selecionadas @@ -1949,77 +1872,77 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintContact - + Delete Excluir - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Erro de seleção - + Only one face in object! - moved to master face Apenas uma face no objeto! - movida para face mestre - - + + Only one master face and one slave face for a contact constraint! Apenas uma face mestre e uma face subordinada para restrição de contato! - - - - + + + + Nothing selected! Nada selecionado! - + Only one slave face for a contact constraint! Apenas uma face subordinada para restrições de contato! - - - - + + + + Selected object is not a part! O objeto selecionado não é uma peça! - - + + Only faces can be picked Somente as faces podem ser selecionadas - + Only one master for a contact constraint! Apenas um mestre para restrições de contato! - + Only one master face for a contact constraint! Apenas uma face mestre para restrições de contato! @@ -2027,28 +1950,28 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2056,28 +1979,28 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2085,128 +2008,128 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintFluidBoundary - + Basic Básico - + Turbulence Turbulência - + Thermal Térmico - + select boundary type, faces and set value selecione o tipo de limite, faces e definir valor - + Intensity [0~1] Intensidade [0~1] - + Dissipation Rate [m2/s3] Taxa de Dissipação [m2/s3] - + Length Scale[m] Escala de comprimento [m] - + Viscosity Ratio [1] Proporção de Viscosidade [1] - + Hydraulic Diameter [m] Diâmetro hidráulico [m] - - + + Gradient [K/m] Gradiente [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Limpar seleção - + Select an edge or a face, please. Por favor, selecione uma aresta ou uma face. - - - - - + + + + + Wrong selection Seleção errada - + Selected object is not a part object! O objeto selecionado não é um objeto do tipo parte! - + Only one planar face or edge can be selected! Apenas uma face ou aresta plana pode ser selecionada! - + Only planar faces can be picked for 3D Apenas faces planas podem ser selecionadas para 3D - + Only planar edges can be picked for 2D Apenas arestas planas podem ser selecionadas para 2D - + Only faces for 3D part or edges for 2D can be picked Apenas faces para objetos 3D ou arestas para objetos 2D podem ser selecionadas - - + - - + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2214,39 +2137,39 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Seleção errada - + Select an edge or a face, please. Por favor, selecione uma aresta ou uma face. @@ -2254,24 +2177,24 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintGear - - - + + + Selection error Erro de seleção - + Only planar faces can be picked Apenas faces planas podem ser selecionadas - + Only linear edges can be picked Apenas arestas lineares podem ser selecionadas - + Only faces and edges can be picked Apenas faces e arestas podem ser selecionadas @@ -2279,30 +2202,30 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! - - + + Selection must only consist of faces! A seleção deve conter apenas faces! @@ -2310,42 +2233,42 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Erro de seleção - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! - + Only faces can be picked Somente as faces podem ser selecionadas - + Only planar faces can be picked Apenas faces planas podem ser selecionadas @@ -2353,28 +2276,28 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! - + Only faces can be picked Somente as faces podem ser selecionadas @@ -2382,12 +2305,12 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintPulley - + Pulley diameter Diâmetro da polia - + Torque [Nm] Momento de torção [Nm] @@ -2395,28 +2318,28 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! - + Only faces can be picked Somente as faces podem ser selecionadas @@ -2424,22 +2347,22 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! O objeto selecionado não é uma peça! @@ -2447,64 +2370,64 @@ Especifique outro arquivo, por favor. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! As faces transformáveis mudaram. Por favor, adicione apenas as faces transformáveis e remova as faces não-transformáveis! - - - - - - - - - - + + + + + + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! O objeto selecionado não é uma peça! - + Only faces can be picked Somente as faces podem ser selecionadas - + Only cylindrical faces can be picked Somente as faces cilíndricas podem ser selecionadas @@ -2512,7 +2435,7 @@ Especifique outro arquivo, por favor. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2520,7 +2443,7 @@ Especifique outro arquivo, por favor. FemGui::TaskPostClip - + Clip region, choose implicit function Região de recorte, escolha função implícita @@ -2528,7 +2451,7 @@ Especifique outro arquivo, por favor. FemGui::TaskPostCut - + Function cut, choose implicit function Função cortar, escolha função implícita @@ -2536,12 +2459,12 @@ Especifique outro arquivo, por favor. FemGui::TaskPostDataAlongLine - + Data along a line options Dados ao longo de uma linha de opções - + Length X-Axis plot label Comprimento @@ -2550,12 +2473,12 @@ Especifique outro arquivo, por favor. FemGui::TaskPostDataAtPoint - + Data at point options Opções de dados no ponto - + %1 at (%2; %3; %4) is: %5 %6 %1 em (%2; %3; %4) é: %5 %6 @@ -2563,7 +2486,7 @@ Especifique outro arquivo, por favor. FemGui::TaskPostDisplay - + Result display options Opções de exibição de resultados @@ -2571,7 +2494,7 @@ Especifique outro arquivo, por favor. FemGui::TaskPostFunction - + Implicit function Função implícita @@ -2579,7 +2502,7 @@ Especifique outro arquivo, por favor. FemGui::TaskPostScalarClip - + Scalar clip options Opções de recorte escalar @@ -2587,7 +2510,7 @@ Especifique outro arquivo, por favor. FemGui::TaskPostWarpVector - + Warp options Opções de dobra @@ -2611,12 +2534,12 @@ Especifique outro arquivo, por favor. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Falha de engrenagem - + The FEM module is built without NETGEN support. Meshing will not work!!! O módulo FEM é construído sem suporte NETGEN. Engrenagem não funcionará!!! @@ -3336,19 +3259,19 @@ Nota: não surge efeito se um sólido foi selecionado Velocity x: - Velocity x: + Velocidade x: Velocity y: - Velocity y: + Velocidade y: Velocity z: - Velocity z: + Velocidade z: @@ -3398,7 +3321,7 @@ Nota: não surge efeito se um sólido foi selecionado Max element size: - Max element size: + Tamanho máximo do elemento: @@ -3408,7 +3331,7 @@ Nota: não surge efeito se um sólido foi selecionado Current density: - Current density: + Densidade atual: @@ -3588,46 +3511,45 @@ Nota: para configuração apenas 2D para x é possível, Você precisa criar ou ativar uma análise - + Ok Ok - + Cancel Cancelar - - - - - - - - + + + + + + + + A dialog is already open in the task panel Uma caixa de diálogo já está aberta no painel de tarefas - - - - - - - - + + + + + + + + Do you want to close this dialog? Deseja fechar este diálogo? - + Meshing Conversão em malhas - @@ -3644,22 +3566,22 @@ Nota: para configuração apenas 2D para x é possível, Importação e exportação - + Constraint initial temperature Ação de temperatura inicial - + Constraint pulley Ação de polia - + Constraint spring Ação de mola - + Edit post processing object Edit post processing object @@ -3699,62 +3621,62 @@ Nota: para configuração apenas 2D para x é possível, Grupos - + Are you sure you want to continue? Tem certeza que deseja continuar? - + Contact constraint Restrição de contato - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Condição do limite fluido - + Force load Force load - + Heat flux load Carregamento de fluxo de calor - + Plane multi-point constraint Restrição de plano multipontos - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4092,7 +4014,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Dependências do objeto @@ -5372,20 +5294,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6100,13 +6022,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem MEF - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6152,17 +6074,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem MEF - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6170,17 +6092,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem MEF - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6188,7 +6110,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6282,17 +6204,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem MEF - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_pt-PT.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_pt-PT.ts index 8ae150cd42..700fc06da0 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_pt-PT.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_pt-PT.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Restrição de Força + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Restringir pressão + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Restringir temperatura + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Conjunto de nós - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Seleção errada - + Select a single FEM mesh or nodes set, please. Selecione uma única malha MEF ou conjunto de nós, por favor. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Criar um conjunto de nós a partir de um polígono @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Seleção errada - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Plano - + Sphere Esfera - + Cylinder Cilindro - + Box Caixa @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Thickness [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Total - - - Fem - Fem - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Seleção errada - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Seleção errada + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Edit Mirror @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Limite de baixa frequência - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Utilizar materiais pré-definidos - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Use materiais do diretório definido pelo utilizador - - - - User directory - Diretório do utilizador - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Erro de Inserção - + You must specify at least one reference Deve especificar pelo menos uma referência @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Erro de Inserção @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Erro de Inserção @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Erro de Inserção @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Erro de Inserção @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Erro de Inserção - + Please specify a force greater than 0 Por favor, especifique uma força maior que 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Erro de Inserção @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Erro de Inserção @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Erro de Inserção @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Erro de Inserção @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Erro de Inserção @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Erro de Inserção @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Erro de Inserção @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Erro de Inserção @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Editar a malha FEM - + Meshing failure Falha na geração de malha @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Erro de Inserção @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Apagar @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Erro de seleção - + Please use only a single reference for bearing constraint Por favor, use apenas uma única referência para restrição para rolamentos - + Only faces can be picked Só podem ser selecionadas faces - + Only cylindrical faces can be picked Somente as faces cilíndricas podem ser selecionadas - + Only planar faces can be picked Apenas faces planas podem ser selecionadas - + Only linear edges can be picked Apenas arestas lineares podem ser selecionadas - + Only faces and edges can be picked Apenas podem ser selecionadas faces e arestas @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Apagar - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Erro de seleção - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Nada selecionado! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - - + + Only faces can be picked Só podem ser selecionadas faces - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Seleção errada - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Seleção errada - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Erro de seleção - + Only planar faces can be picked Apenas faces planas podem ser selecionadas - + Only linear edges can be picked Apenas arestas lineares podem ser selecionadas - + Only faces and edges can be picked Apenas podem ser selecionadas faces e arestas @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Erro de seleção - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - + Only faces can be picked Só podem ser selecionadas faces - + Only planar faces can be picked Apenas faces planas podem ser selecionadas @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - + Only faces can be picked Só podem ser selecionadas faces @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Diâmetro da polia - + Torque [Nm] Momento de Torção [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - + Only faces can be picked Só podem ser selecionadas faces @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Erro de seleção - - + + Nothing selected! Nada selecionado! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Objeto selecionado não é uma peça (parte)! - + Only faces can be picked Só podem ser selecionadas faces - + Only cylindrical faces can be picked Somente as faces cilíndricas podem ser selecionadas @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Comprimento @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Falha na geração de malha - + The FEM module is built without NETGEN support. Meshing will not work!!! O módulo da FEM está construído sem suporte NETGEN. Meshing não funcionará!!! @@ -3521,7 +3444,7 @@ Note: for 2D only setting for x is possible, 0 mm - 0 mm + 0 mm @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, É preciso criar ou ativar uma Análise - + Ok Ok - + Cancel Cancelar - - - - - - - - + + + + + + + + A dialog is already open in the task panel Já está aberta uma janela no painel de tarefas - - - - - - - - + + + + + + + + Do you want to close this dialog? Deseja fechar esta janela? - + Meshing Emalhar - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Importar/Exportar - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Grupos - + Are you sure you want to continue? Tem certeza que deseja continuar? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Dependências do objeto @@ -4596,7 +4518,7 @@ normal vector of the face is used as direction Reverse direction - Reverse direction + Inverter direção @@ -4714,7 +4636,7 @@ normal vector of the face is used as direction 0 MPa - 0 MPa + 0 MPa @@ -5006,7 +4928,7 @@ used for the Elmer solver Field - Field + Campo @@ -5054,7 +4976,7 @@ used for the Elmer solver Outline - Outline + Contorno @@ -5064,7 +4986,7 @@ used for the Elmer solver Surface with Edges - Surface with Edges + Superfície com bordas @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_ro.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_ro.ts index 1069c03d46..64b32c3b35 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_ro.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_ro.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Metoda elementelor finite - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Metoda elementelor finite - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Metoda elementelor finite - - Constraint displacement - Constrângere dislocată + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Metoda elementelor finite - - Constraint fixed - Constrângere fixată + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Metoda elementelor finite - + Fluid boundary condition Stare de limitare a lichidului - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Creați o condiție de fluid pe entitate față pentru Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Metoda elementelor finite - - Constraint force - Forţa de constrângere + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Metoda elementelor finite - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Metoda elementelor finite - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Metoda elementelor finite - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Metoda elementelor finite - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Metoda elementelor finite - - Constraint pressure - Constrângere presiune + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Metoda elementelor finite - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Metoda elementelor finite - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Metoda elementelor finite - - Constraint temperature - Temperatură constrângere + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Metoda elementelor finite - - Constraint transform - Constrângere pentru transformare + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Metoda elementelor finite - + Nodes set Set de noduri - + Creates a FEM mesh nodes set Creează un set de noduri de plasă FEM - + Wrong selection Selecţie greşită - + Select a single FEM mesh or nodes set, please. Selectaţi o singură reţea FEM sau set de noduri, vă rugăm să. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Metoda elementelor finite - + Node set by poly Modulul setat de camp - - + + Create node set by Poly Creați un nod definit de Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Metoda elementelor finite - + Apply changes to pipeline Aplică modificările la conductă - + Apply changes to parameters directly and not on recompute only... Aplică modificările direct și nu doar la recalculare... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Metoda elementelor finite - + Region clip filter Filtru de regiune clip - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Selecţie greşită - + Select a pipeline, please. Selectează o conductă, te rog. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Metoda elementelor finite - + Function cut filter Filtru tăiere funcţie - + Cut the data along an implicit function Tăiați datele de-a lungul unei funcții implicite @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Metoda elementelor finite - + Line clip filter Linie filtru clip - + Define/create a clip filter which clips a field along a line Definește/creează un filtru de clip care clipește un câmp de-a lungul unei linii @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Metoda elementelor finite - + Data at point clip filter Date în filtru clip - + Define/create a clip filter which clips a field data at point Definește/creează un filtru de clip care clipește o dată de câmp în punct @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Metoda elementelor finite - + Filter functions Filtrează funcțiile - + Functions for use in postprocessing filter... Funcții utilizate în filtrul postprocesare... - + Plane Plan - + Sphere Sfera - + Cylinder Cilindru - + Box Caseta @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Grosime [mm] - + Stress [MPa] Plot Y-Axis Label Stres [MPa] - + Linearized Stresses Plot title Stresuri liniare - + Membrane Plot legend item label Membrană - + Membrane and Bending Plot legend item label Membrane și îndoire - + Total Plot legend item label Total - - - Fem - Metoda elementelor finite - - - - Stress linearization plot - Grafic de linearizare de stres - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Selecţie greşită - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Metoda elementelor finite - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Metoda elementelor finite - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Grafic de linearizare de stres + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Selecţie greşită + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Metoda elementelor finite + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Metoda elementelor finite + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Metoda elementelor finite + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Editare oglindă @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,20 +1017,20 @@ Limita de frecvenţă joasă - + File does not exist Fișierul nu există - + The specified executable '%1' does not exist! Specify another file please. - Fișierul executabil specificat + The specified executable '%1' - nu există! -Specificați un alt fișier. + does not exist! +Specify another file please. @@ -1119,36 +1119,36 @@ vor fi unite pentru a face limitele de volum invizibile. <html><head/><body><p><span style=" font-weight:600;">Notă:</span> Se recomandă folosirea unui număr egal de nuclee pentru a beneficia de simetriile ochiului. (Utilizarea a 8 nuclee poate fi mai rapidă de 9 nuclee.<br/><span style=" font-weight:600;">De asemenea:</span> În cazuri extreme, ElmerSolver ar putea să nu conveargă dacă numărul nucleului este prea mare.</p></body></html> - + File does not exist Fișierul nu există - + The specified executable '%1' does not exist! Specify another file please. - Fișierul executabil specificat + The specified executable '%1' - nu există! -Specificați un alt fișier. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Nu este potrivit pentru multicitire - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Setare Elmer greşită: utilizaţi mai mult de un nucleu CPU. Prin urmare, un executabil cu sufixul '_mpi.exe' este necesar. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Setare Elmer greșită: Folosiți mai mult de un nucleu CPU. @@ -1385,20 +1385,20 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist Fișierul nu există - + The specified executable '%1' does not exist! Specify another file please. - Fișierul executabil specificat + The specified executable '%1' - nu există! -Specificați un alt fișier. + does not exist! +Specify another file please. @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materialul - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Utilizarea built-in materiale - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Utilizați materiale din directorul definit de utilizator - - - - User directory - Directorul utilizatorului - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,20 +1500,20 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist Fișierul nu există - + The specified executable '%1' does not exist! Specify another file please. - Fișierul executabil specificat + The specified executable '%1' - nu există! -Specificați un alt fișier. + does not exist! +Specify another file please. @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist Fișierul nu există - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Eroare de intrare - + You must specify at least one reference Trebuie să specificați cel puțin o referință @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Eroare de intrare @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Eroare de intrare @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Eroare de intrare @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Eroare de intrare @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Eroare de intrare - + Please specify a force greater than 0 Precizați vă rog o forță mai mare de 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Eroare de intrare @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Eroare de intrare @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Eroare de intrare @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Eroare de intrare @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Eroare de intrare @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Eroare de intrare @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Eroare de intrare @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Eroare de intrare @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Edit FEM mesh - + Meshing failure Eşecul de Meshing @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Eroare de intrare @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Ştergeţi @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Eroare de selecție - + Please use only a single reference for bearing constraint Vă rugăm să utilizaţi numai o singură referinţă pentru constrângere - + Only faces can be picked Numai fețele pot fi ridicate - + Only cylindrical faces can be picked Numai fețele cilindrice pot fi ridicate - + Only planar faces can be picked Numai fețele plane pot fi ridicate - + Only linear edges can be picked Numai marginile liniare pot fi ridicate - + Only faces and edges can be picked Numai fețe și margini pot fi ridicate @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Ştergeţi - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Eroare de selecție - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Nicio selecție! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Obiectul selectat nu este o Part! - - + + Only faces can be picked Numai fețele pot fi ridicate - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Selecţie greşită - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Selecţie greşită - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Eroare de selecție - + Only planar faces can be picked Numai fețele plane pot fi ridicate - + Only linear edges can be picked Numai marginile liniare pot fi ridicate - + Only faces and edges can be picked Numai fețe și margini pot fi ridicate @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Eroare de selecție - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! - + Only faces can be picked Numai fețele pot fi ridicate - + Only planar faces can be picked Numai fețele plane pot fi ridicate @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! - + Only faces can be picked Numai fețele pot fi ridicate @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Diametru scripete - + Torque [Nm] Cuplul [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! - + Only faces can be picked Numai fețele pot fi ridicate @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Selected object is not a part! Obiectul selectat nu este o Part! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Eroare de selecție - - + + Nothing selected! Nicio selecție! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Obiectul selectat nu este o Part! - + Only faces can be picked Numai fețele pot fi ridicate - + Only cylindrical faces can be picked Numai fețele cilindrice pot fi ridicate @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Lungime @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Eşecul de Meshing - + The FEM module is built without NETGEN support. Meshing will not work!!! Modulul FEM este construit fără sprijin NETGEN. Plasa nu va funcţiona!!! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, Trebuie să creați sau să activați o analiză - + Ok Ok - + Cancel Renunţă - - - - - - - - + + + + + + + + A dialog is already open in the task panel O fereastră de dialog este deja deschisă în fereastra de sarcini - - - - - - - - + + + + + + + + Do you want to close this dialog? Doriţi să închideţi această fereastră de dialog? - + Meshing Meshing - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Import/Export - + Constraint initial temperature Constrângere temperatură inițială - + Constraint pulley Constrângere scripete - + Constraint spring Constrângere arc - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Grupuri - + Are you sure you want to continue? Are you sure you want to continue? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Stare de limitare a lichidului - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Dependențe obiect @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Metoda elementelor finite - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Metoda elementelor finite - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Metoda elementelor finite - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Metoda elementelor finite - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts index 41343c0b8d..17ff74abd9 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem МКЭ (метод конечных элементов) - + Bearing constraint Шарнирное ограничение - + Creates a bearing constraint Создать шарнирное ограничение @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem - МКЭ (метод конечных элементов) + Мкэ (метод конечных элементов) - + Contact constraint Контактное ограничение - + Creates a contact constraint between faces Создает ограничение контакта между гранями @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem - Мкэ (метод конечных элементов) + МКЭ (метод конечных элементов) - - Constraint displacement - Ограничение смещения + + Displacement boundary condition + Граничное условие смещения - + Creates a displacement boundary condition for a geometric entity Создает условие для границы смещения для геометрического объекта @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem МКЭ (метод конечных элементов) - - Constraint fixed - Ограничение закрепления + + Fixed boundary condition + Фиксированное граничное условие - + Creates a fixed boundary condition for a geometric entity Создает фиксированное граничное условие для геометрического объекта @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem МКЭ (метод конечных элементов) - + Fluid boundary condition Граничное условие жидкости - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Создайте граничное условие жидкости на объекте грани для Вычислительной Гидродинамики @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem МКЭ (метод конечных элементов) - - Constraint force - Граничное условие силы + + Force load + Силовая нагрузка - + Creates a force load applied to a geometric entity Создает силовую нагрузку, приложенную к геометрическому объекту @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem МКЭ (метод конечных элементов) - + Gear constraint Ограничение передачи - + Creates a gear constraint Создает ограничение передачи @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem МКЭ (метод конечных элементов) - + Heat flux load Нагрузка на тепловой поток - + Creates a heat flux load acting on a face Создает нагрузку теплового потока, воздействующую на поверхность @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem МКЭ (метод конечных элементов) - + Initial temperature Исходная температура - + Creates an initial temperature acting on a body Создает исходную температуру, воздействующую на тело @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem МКЭ (метод конечных элементов) - + Plane multi-point constraint Плоскостное многоточечное ограничение - + Creates a plane multi-point constraint for a face Создает плоскостное многоточечное ограничение для грани @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem МКЭ (метод конечных элементов) - - Constraint pressure - Ограничение давления + + Pressure load + Нагрузка давлением - + Creates a pressure load acting on a face Создает прижимную нагрузку, действующую на поверхность @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem МКЭ (метод конечных элементов) - + Pulley constraint Ограничение шкива - + Creates a pulley constraint Создает ограничение на шкив @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem МКЭ (метод конечных элементов) - + Spring Пружина - + Creates a spring acting on a face Создает пружину, действующую на грань @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem МКЭ (метод конечных элементов) - - Constraint temperature - Ограничение температуры + + Temperature boundary condition + Граничное условие температуры - + Creates a temperature/concentrated heat flux load acting on a face Создает температурную нагрузку/концентрированный тепловой поток, воздействующий на поверхность @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem МКЭ (метод конечных элементов) - - Constraint transform - Ограничение преобразования + + Local coordinate system + Локальная система координат - + Create a local coordinate system on a face Создайте локальную систему координат на грани @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem МКЭ (метод конечных элементов) - + Nodes set Набор узлов - + Creates a FEM mesh nodes set Создает набор узлов сетки МКЭ (FEM) - + Wrong selection Неправильное выделение - + Select a single FEM mesh or nodes set, please. Выберите одну сетку МКЭ или набор узлов, пожалуйста. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem МКЭ (метод конечных элементов) - + Node set by poly Набор узлов по многоугольникам - - + + Create node set by Poly Создать набор узлов из многоугольника @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem МКЭ (метод конечных элементов) - + Apply changes to pipeline Применить изменения к конвейеру (пайплайну) - + Apply changes to parameters directly and not on recompute only... Применять изменения к параметрам напрямую, а не только при пересчете... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem МКЭ (метод конечных элементов) - + Region clip filter Фильтр области обрезки - + Define/create a clip filter which uses functions to define the clipped region Настройте/создайте фильтр обрезки, который будет использован для определения обрезаемой области - + Wrong selection Неправильное выделение - + Select a pipeline, please. Выберите конвейер (пайплайн), пожалуйста. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem МКЭ (метод конечных элементов) - + Function cut filter Функциональный фильтр - + Cut the data along an implicit function Вырезать данные по неявной функции @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem МКЭ (метод конечных элементов) - + Line clip filter Фильтр обрезки линии - + Define/create a clip filter which clips a field along a line Определите/создайте фильтр обрезки, который обрезает поле вдоль линии @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem МКЭ (метод конечных элементов) - + Data at point clip filter Данные в фильтре обрезки точки - + Define/create a clip filter which clips a field data at point Определите/создайте фильтр обрезки, который отсекает данные поля в точке @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem МКЭ (метод конечных элементов) - + Filter functions Функции фильтра - + Functions for use in postprocessing filter... Функции для использования в фильтре постобработки... - + Plane Плоскость - + Sphere Сфера - + Cylinder Цилиндр - + Box Коробка @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Толщина [mm] - + Stress [MPa] Plot Y-Axis Label Механическое напряжение [MPa] - + Linearized Stresses Plot title Линеаризованные напряжения - + Membrane Plot legend item label Мембрана - + Membrane and Bending Plot legend item label Мембрана и Изгиб - + Total Plot legend item label Итог - - - Fem - МКЭ (метод конечных элементов) - - - - Stress linearization plot - График линеаризации напряжения - - - - Define/create stress linearization plots - Определение/создание графиков линеаризации напряжения - - - - - Wrong selection - Неправильное выделение - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Пожалуйста, выберите фильтр обрезки, который обрезает поле STRESS вдоль линии. - - - - CmdFemPostPipelineFromResult - - - Fem - Мкэ (метод конечных элементов) - - - - Post pipeline from result - Опубликовать конвейер из результата - - - - Creates a post processing pipeline from a result object - Создает конвейер постобработки из результирующего объекта - - - - Wrong selection type - Неправильный тип выбора - - - - Select a result object, please. - Выберите результирующий объект, пожалуйста. - - - - CmdFemPostScalarClipFilter - - - Fem - Мкэ (метод конечных элементов) - - - - Scalar clip filter - Скалярный фильтр обрезки - - - - Define/create a clip filter which clips a field with a scalar value - Определите/создайте фильтр обрезки, который отсекает поле со скалярным значением - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + График линеаризации напряжения + + + + Define/create stress linearization plots + Определение/создание графиков линеаризации напряжения + + + + + Wrong selection + Неправильный выбор + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Пожалуйста, выберите фильтр обрезки, который обрезает поле STRESS вдоль линии. + + + + CmdFemPostPipelineFromResult + + + Fem + Мкэ (метод конечных элементов) + + + + Post pipeline from result + Опубликовать конвейер из результата + + + + Creates a post processing pipeline from a result object + Создает конвейер постобработки из результирующего объекта + + + + Wrong selection type + Неправильный тип выбора + + + + Select a result object, please. + Выберите результирующий объект, пожалуйста. + + + + CmdFemPostScalarClipFilter + + + Fem + Мкэ (метод конечных элементов) + + + + Scalar clip filter + Скалярный фильтр обрезки + + + + Define/create a clip filter which clips a field with a scalar value + Определите/создайте фильтр обрезки, который отсекает поле со скалярным значением + + + + CmdFemPostWarpVectorFilter + + + Fem + Мкэ (метод конечных элементов) + + + Warp filter Деформационный фильтр - + Warp the geometry along a vector field by a certain factor Деформировать геометрию вдоль векторного поля по определенному коэффициенту @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Создайте граничное условие жидкости - + Make bearing constraint Создайте ограничение несущей способности - + Make contact constraint on a face Установите ограничение контакта на грани - + Make displacement boundary condition on face Создайте граничное условие смещения на грани - + Make fixed boundary condition for geometry Создайте фиксированное граничное условие для геометрии - + Make force load on geometry Создавайте силовую нагрузку на геометрию - + Make gear constraint Установите ограничение передачи - + Make heat flux load on face Создайте нагрузку теплового потока на грань - + Make initial temperature condition on body Установите начальный температурный режим на теле - + Make plane multi-point constraint on face Создайте плоскостное многоточечное ограничение на грани - + Make pressure load on face Приложите прижимную нагрузку на грань - + Make spring on face Создайте пружину на грани - + Make pulley constraint Создайте ограничение шкива - + Make temperature boundary condition on face Создайте граничное условие температуры на поверхности - + Make local coordinate system on face Создайте локальную систему координат на грани - + Place robot Разместить робота - + Edit nodes set Редактировать набор узлов - + Create nodes set Создать набор узлов - + Create filter Создать фильтр - + Create function Создать функцию - + Create pipeline from result Создать конвейер из результата - + Edit Mirror Изменить зеркалирование @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Создайте плоскую функцию, определяемую ее началом и нормалью - + Create a sphere function, defined by its center and radius Создайте функцию сферы, заданную ее центром и радиусом - + Create a cylinder function, defined by its center, axis and radius Создать функцию цилиндра, определяемую ее центром, осью и радиусом - + Create a box function, defined by its center, length, width and height Создать функцию бокса, определяемую его центром, длиной, шириной и высотой @@ -1016,20 +1016,20 @@ Граничное условие низкой частоты - + File does not exist Файл не существует - + The specified executable '%1' does not exist! Specify another file please. - Указанный исполняемый + The specified executable '%1' - не существует! -Укажите другой файл, пожалуйста. + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Примечание:</span> Рекомендуется использовать чётное количество ядер, чтобы извлечь пользу из сетки симметрии. (Использование 8 ядер может быть быстрее чем 9 ядер.<br/><span style=" font-weight:600;">Примечание тоже:</span> В крайних случаях ElmerSolver может не совпадать, если ядро слишком высоко.</p></body></html> - + File does not exist Файл не существует - + The specified executable '%1' does not exist! Specify another file please. - Указанный исполняемый + The specified executable '%1' - не существует! -Укажите другой файл, пожалуйста. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading Метод конечных элементов: Не подходит для многопоточности - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Неправильная настройка Elmer: Вы используете более одного ядра процессора. Поэтому требуется исполняемый файл с суффиксом '_mpi.exe'. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Неправильная настройка Elmer: Вы используете более одного ядра процессора. @@ -1248,7 +1248,7 @@ the constraint or material is applied. Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. - Let the application manage (create, delete) the working directories for all solvers. Use temporary directories. + Разрешите приложению управлять (создавать, удалять) рабочие каталоги всех решателей. Используйте временные каталоги. @@ -1382,20 +1382,20 @@ adding an analysis container Оставьте поле пустым, чтобы использовать исполняемый файл gmsh по умолчанию - + File does not exist Файл не существует - + The specified executable '%1' does not exist! Specify another file please. - Указанный исполняемый + The specified executable '%1' - не существует! -Укажите другой файл, пожалуйста. + does not exist! +Specify another file please. @@ -1454,82 +1454,6 @@ exported from FreeCAD. Объект результата FreeCAD - - FemGui::DlgSettingsFemMaterialImp - - - Material - Материал - - - - Card resources - Откуда брать карточки материалов - - - - The cards built-in to FreeCAD will be listed as available. - Карточки, встроенные в FreeCAD, будут доступны для применения. - - - - Use built-in materials - Использовать встроенные материалы - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Карточки из каталога настроек FreeCAD, будут доступны для применения. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Использовать материалы из каталога FreeCAD user's preference - "Materials" - - - - Also material cards also from the specified directory -will be listed as available. - Карточки материалов из указанного каталога, будут доступны для применения. - - - - Use materials from user defined directory - Использовать материалы из каталога выбранного пользователем - - - - User directory - Каталог пользователя - - - - Card sorting and duplicates - Сортировка карточек материала и сокрытие дубликатов - - - - Duplicate cards will be deleted from the displayed material card list. - Дубликаты карточек будут удалены из отображаемого списка карточек материалов. - - - - Delete card duplicates - Скрывать карточки с одинаковыми названиями - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Карточки материалов отображаются отсортированными по их пути (местоположению). -Если флажок снят, они будут отсортированы по их названию. - - - - Sort by resources - Сортировать карточки по их местоположению (пути к файлам). - - FemGui::DlgSettingsFemMystranImp @@ -1568,20 +1492,20 @@ If unchecked, they will be sorted by their name. Сохранять комментарии в входном файле - + File does not exist Файл не существует - + The specified executable '%1' does not exist! Specify another file please. - Указанный исполняемый + The specified executable '%1' - не существует! -Укажите другой файл, пожалуйста. + does not exist! +Specify another file please. @@ -1679,34 +1603,34 @@ that "MAXKOI" needs to be increased. что "MAXKOI" должно быть увеличено. - + File does not exist Файл не существует - + The specified z88r executable '%1' does not exist! Specify another file please. - Указанный исполняемый файл z88r + The specified z88r executable '%1' - не существует! -Укажите другой файл, пожалуйста. + does not exist! +Specify another file please. - - + + Wrong file Неправильный файл - + You must specify the path to the z88r.exe! Вы должны указать путь к z88r.exe! - + You must specify the path to the z88r! Вы должны указать путь к z88r! @@ -1730,13 +1654,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Ошибка ввода - + You must specify at least one reference Необходимо указать как минимум одну ссылку @@ -1744,7 +1668,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Ошибка ввода @@ -1752,7 +1676,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Ошибка ввода @@ -1760,7 +1684,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Ошибка ввода @@ -1768,7 +1692,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Ошибка ввода @@ -1776,13 +1700,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Ошибка ввода - + Please specify a force greater than 0 Пожалуйста, укажите силу больше, чем 0 @@ -1790,7 +1714,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Ошибка ввода @@ -1798,7 +1722,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Ошибка ввода @@ -1806,8 +1730,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Ошибка ввода @@ -1815,7 +1739,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Ошибка ввода @@ -1823,7 +1747,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Ошибка ввода @@ -1831,7 +1755,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Ошибка ввода @@ -1839,7 +1763,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Ошибка ввода @@ -1847,7 +1771,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Ошибка ввода @@ -1855,12 +1779,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Редактирование сетку МКЭ - + Meshing failure Сбой создания сетки @@ -1868,7 +1792,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Ошибка ввода @@ -1884,12 +1808,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Параметры объекта анализа - + Delete Удалить @@ -1897,42 +1821,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Ошибка выбора - + Please use only a single reference for bearing constraint Пожалуйста, используйте только одну ссылку для граничного условия подшипника - + Only faces can be picked Можно выбрать только грани - + Only cylindrical faces can be picked Можно выбрать только цилиндрические грани - + Only planar faces can be picked Можно выбрать только плоские грани - + Only linear edges can be picked Можно выбрать только прямые края - + Only faces and edges can be picked Можно выбрать только грани и края @@ -1941,77 +1865,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Удалить - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Ошибка выбора - + Only one face in object! - moved to master face Только одна грань в объекте! - перенесено на основную грань - - + + Only one master face and one slave face for a contact constraint! Только одна основная геометрическая грань и одна зависимая геометрическая грань для ограничения связи! - - - - + + + + Nothing selected! Ничего не выбрано! - + Only one slave face for a contact constraint! Только одна вторичная поверхность для контакта! - - - - + + + + Selected object is not a part! Выделенный объект не является деталью! - - + + Only faces can be picked Можно выбрать только грани - + Only one master for a contact constraint! Только один мастер для ограничения контакта! - + Only one master face for a contact constraint! Только одно главное лицо для ограничения контакта! @@ -2019,28 +1943,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Допускается только один тип выделения (вершина, грань или ребро) для каждого объекта анализа! @@ -2048,28 +1972,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Допускается только один тип выделения (вершина, грань или ребро) для каждого объекта анализа! @@ -2077,128 +2001,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Основные - + Turbulence Турбулентность - + Thermal Температура - + select boundary type, faces and set value выберите тип границы, грани и задайте значение - + Intensity [0~1] Интенсивность [0~1] - + Dissipation Rate [m2/s3] Распределение [м2/с3] - + Length Scale[m] Масштаб длины [м] - + Viscosity Ratio [1] Коэффициент вязкости [1] - + Hydraulic Diameter [m] Гидравлический диаметр [м] - - + + Gradient [K/m] Градиент [К/м] - + Flux [W/m2] Излучение [Вт/м2] - + Empty selection Пустой выбор - + Select an edge or a face, please. Выберите ребро или грань, пожалуйста. - - - - - + + + + + Wrong selection - Неправильный выбор + Неправильное выделение - + Selected object is not a part object! Выбранный объект не является объектом детали! - + Only one planar face or edge can be selected! Можно выбрать только одну плоскую грань или ребро! - + Only planar faces can be picked for 3D Можно выбрать только планарные грани для 3D - + Only planar edges can be picked for 2D Для 2D можно выбрать только плоские ребра - + Only faces for 3D part or edges for 2D can be picked Можно выбрать только грани для 3D части или ребра для 2D - - + - - + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Допускается только один тип выделения (вершина, грань или ребро) для каждого объекта анализа! @@ -2206,39 +2130,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Допускается только один тип выделения (вершина, грань или ребро) для каждого объекта анализа! - - + + Wrong selection - Неправильное выделение + Неправильный выбор - + Select an edge or a face, please. Выберите ребро или грань, пожалуйста. @@ -2246,24 +2170,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Ошибка выбора - + Only planar faces can be picked Можно выбрать только плоские грани - + Only linear edges can be picked Можно выбрать только прямые края - + Only faces and edges can be picked Можно выбрать только грани и края @@ -2271,30 +2195,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! - - + + Selection must only consist of faces! Выбирать можно только грани! @@ -2302,42 +2226,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Ошибка выбора - - + + Only one face can be selected for a plane multi-point constraint! Для многоточечного ограничения плоскости может быть выбрана только одна грань! - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! - + Only faces can be picked Можно выбрать только грани - + Only planar faces can be picked Можно выбрать только плоские грани @@ -2345,28 +2269,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! - + Only faces can be picked Можно выбрать только грани @@ -2374,12 +2298,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Диаметр шкива - + Torque [Nm] Крутящий момент [Нм] @@ -2387,28 +2311,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! - + Only faces can be picked Можно выбрать только грани @@ -2416,22 +2340,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Selected object is not a part! Выделенный объект не является деталью! @@ -2439,64 +2363,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Ошибка обновления функции анализа - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Преобразуемые грани изменились. Пожалуйста, добавьте только преобразованные грани и удалите непреобразованные! - - - - - - - - - - + + + + + + + + + + Selection error Ошибка выбора - - + + Nothing selected! Ничего не выбрано! - - + + Only one face for rectangular local coordinate system! Только одна грань для прямоугольной локальной системы координат! - + Only one face for local coordinate system! Только одна грань для локальной системы координат! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Можно выбрать только трансформируемые грани! Сначала примените граничное условие смещения к поверхности, затем примените к поверхности локальную систему координат - - + + Selected object is not a part! Выделенный объект не является деталью! - + Only faces can be picked Можно выбрать только грани - + Only cylindrical faces can be picked Можно выбрать только цилиндрические грани @@ -2504,7 +2428,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName Название объекта @@ -2512,7 +2436,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Область клипа, выбрать неявную функцию @@ -2520,7 +2444,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Вырезать, выбрать неявную функцию @@ -2528,12 +2452,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Данные по параметрам строки - + Length X-Axis plot label Длина @@ -2542,12 +2466,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Данные в точке - + %1 at (%2; %3; %4) is: %5 %6 %1 в (%2; %3; %4): %5 %6 @@ -2555,7 +2479,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Параметры отображения результата @@ -2563,7 +2487,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Неявная функция @@ -2571,7 +2495,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Параметры скалярного клипа @@ -2579,7 +2503,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Опции деформации @@ -2603,12 +2527,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Сбой создания сетки - + The FEM module is built without NETGEN support. Meshing will not work!!! Модуль МКЭ скомпилирован без поддержки NETGEN. Построение сетки не будет работать!!! @@ -3544,7 +3468,7 @@ Note: for 2D only setting for x is possible, x - x + ⨯ @@ -3580,46 +3504,45 @@ Note: for 2D only setting for x is possible, Вам нужно создать или активировать анализ - + Ok Да - + Cancel Отмена - - - - - - - - + + + + + + + + A dialog is already open in the task panel Диалог уже открыт на панели задач - - - - - - - - + + + + + + + + Do you want to close this dialog? Вы хотите закрыть этот диалог? - + Meshing Построение сетки - @@ -3627,7 +3550,7 @@ Note: for 2D only setting for x is possible, FEM - МКЭ + Метод конечных элементов @@ -3636,22 +3559,22 @@ Note: for 2D only setting for x is possible, Импорт/экспорт - + Constraint initial temperature Ограничение начальной температуры - + Constraint pulley Ограничительный шкив - + Constraint spring Ограничительная пружина - + Edit post processing object Редактировать объект постобработки @@ -3691,62 +3614,62 @@ Note: for 2D only setting for x is possible, Группы - + Are you sure you want to continue? Вы уверены, что хотите продолжить? - + Contact constraint Контактное ограничение - + Displacement boundary condition Граничное условие смещения - + Fixed boundary condition Фиксированное граничное условие - + Fluid boundary condition Граничное условие жидкости - + Force load Силовая нагрузка - + Heat flux load Нагрузка на тепловой поток - + Plane multi-point constraint Плоскостное многоточечное ограничение - + Pressure load Нагрузка давлением - + Temperature boundary condition Граничное условие температуры - + Local coordinate system Локальная система координат - + Edit analysis feature Редактировать функцию анализа @@ -4084,7 +4007,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Зависимости объекта @@ -4127,7 +4050,7 @@ For possible variables, see the description box below. Box - Коробка + Куб @@ -4326,7 +4249,7 @@ For possible variables, see the description box below. Remove - Удалить + Убрать @@ -4609,7 +4532,7 @@ normal vector of the face is used as direction Remove - Убрать + Удалить @@ -4866,7 +4789,7 @@ used for the Elmer solver x - ⨯ + x @@ -5198,7 +5121,7 @@ used for the Elmer solver FEM - Метод конечных элементов + МКЭ @@ -5318,7 +5241,7 @@ used for the Elmer solver Mesh - Полигональная сетка + Сеть @@ -5364,20 +5287,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Ошибка: Фильтр может быть применен только к одному объекту. - - - + + + The filter could not be set up. Не удалось настроить фильтр. - - + + Error: no post processing object selected. Ошибка: объект постобработки не выбран. @@ -6059,7 +5982,7 @@ Please select a result type first. Nodes - Узлы + Узлов @@ -6091,13 +6014,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem - Мкэ (метод конечных элементов) + МКЭ (метод конечных элементов) - - + + Electromagnetic boundary conditions Электромагнитные граничные условия @@ -6143,17 +6066,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem МКЭ (метод конечных элементов) - + Electromagnetic equations Уравнение электромагнитного поля - + Electromagnetic equations for the Elmer solver Уравнение электромагнитного поля для решатетеля Элмера @@ -6161,17 +6084,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem МКЭ (метод конечных элементов) - + Contours filter Фильтр контуров - + Define/create a contours filter which displays iso contours Определение/создание фильтра контуров, который отображает изо-контуры @@ -6179,7 +6102,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Параметры фильтра контуров @@ -6273,17 +6196,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem МКЭ (метод конечных элементов) - + Mechanical equations Механические уравнения - + Mechanical equations for the Elmer solver Уравнения механики для решателя Элмера diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_sl.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_sl.ts index c417c5f2f0..5026856871 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_sl.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_sl.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Mke - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Mke - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Mke - - Constraint displacement - Omejitev pomika + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Mke - - Constraint fixed - Omejitev pritrjenosti + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Mke - + Fluid boundary condition Pogoj zamejitve tekočine - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Ustvari pogoj zamejitve tekočin za ploskovno prvino pri računski dinamiki tekočin @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Mke - - Constraint force - Omejitev sile + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Mke - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Mke - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Mke - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Mke - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Mke - - Constraint pressure - Omejitev tlaka + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Mke - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Mke - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Mke - - Constraint temperature - Omejitev temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Mke - - Constraint transform - Omejitev preoblikovanja + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Mke - + Nodes set Nabor vozlišč - + Creates a FEM mesh nodes set Ustvari nabor vozlišč ploskovja MKE - + Wrong selection Napačna izbira - + Select a single FEM mesh or nodes set, please. Izberite eno ploskovje MKE ali nabor vozlišč. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Mke - + Node set by poly Node set by poly - - + + Create node set by Poly Ustvari nabor vozlišč iz mnogokotnika @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Mke - + Apply changes to pipeline Uporabi spremembe na cevovodu - + Apply changes to parameters directly and not on recompute only... Uveljavi spremembe določilk neposredno in ne le pri preračunu ... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Mke - + Region clip filter Sito obrezave območja - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Napačna izbira - + Select a pipeline, please. Izberite cevovod. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Mke - + Function cut filter Function cut filter - + Cut the data along an implicit function Poreži podatke po implicitni (sovsebni) funkciji @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Mke - + Line clip filter Sito porezave črte - + Define/create a clip filter which clips a field along a line Določi/ustvari izrezno sito, ki prereže polje vzdolž črte @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Mke - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Določi/ustvari izrezno sito, ki prereže podatke polja v točki @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Mke - + Filter functions Zmožnosti presejanja - + Functions for use in postprocessing filter... Zmožnosti, ki jih je mogoče uporabiti v poobdelovalnem situ ... - + Plane Ravnina - + Sphere Krogla - + Cylinder Valj - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Debelina [mm] - + Stress [MPa] Plot Y-Axis Label Napetost [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Skupaj - - - Fem - Mke - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Napačna izbira - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Mke - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Ustvari iz dobljenega predmeta poobdelovalni cevovod - - - - Wrong selection type - Napačna vrsta izbiranja - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Mke - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Določi/ustvari izrezno sito, ki prereže polje s skalarno vrednostjo - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Napačna izbira + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Mke + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Ustvari iz dobljenega predmeta poobdelovalni cevovod + + + + Wrong selection type + Napačna vrsta izbiranja + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Mke + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Določi/ustvari izrezno sito, ki prereže polje s skalarno vrednostjo + + + + CmdFemPostWarpVectorFilter + + + Fem + Mke + + + Warp filter Vtis izobličenja - + Warp the geometry along a vector field by a certain factor Izobliči geometrijo vzdolž polja vektorjev za določen količnik @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Ustvari pogoj zamejitve tekočine - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Postavi robota - + Edit nodes set Uredi nabor oglišč - + Create nodes set Ustvari nabor oglišč - + Create filter Ustvari sito - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Uredi zrcaljenje @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Omejitev nizke frekvence - + File does not exist Datoteka ne obstaja - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist Datoteka ne obstaja - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Neprimeren za večnitnost - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Napačna nastavitev Elmerja: Uporabljate več kot eno jedro. Zato je potrebna izvršljiva datoteka s pripono "_mpi.exe". - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Napačna nastavitev Elmerja: Uporabljate več kot eno jedro. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist Datoteka ne obstaja - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. Dobljeni FreeCAD predmet - - FemGui::DlgSettingsFemMaterialImp - - - Material - Snov - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Uporabi vgrajene materiale - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Uporabi materiale iz uporabniško določene mape - - - - User directory - Uporabniška mapa - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist Datoteka ne obstaja - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist Datoteka ne obstaja - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Napaka vnosa - + You must specify at least one reference Navesti morate vsaj en sklic @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Napaka vnosa @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Napaka vnosa @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Napaka vnosa @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Napaka vnosa @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Napaka vnosa - + Please specify a force greater than 0 Navedite silo, ki je večja od 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Napaka vnosa @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Napaka vnosa @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Napaka vnosa @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Napaka vnosa @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Napaka vnosa @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Napaka vnosa @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Napaka vnosa @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Napaka vnosa @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Uredi ploskovje MKE - + Meshing failure Napaka pri ploskovjenju @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Napaka vnosa @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Izbriši @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Napaka izbire - + Please use only a single reference for bearing constraint Uporabite samo en sklic za ležajno omejitev - + Only faces can be picked Izberete lahko samo ploskve - + Only cylindrical faces can be picked Izberete lahko samo ploskve valja - + Only planar faces can be picked Izberete lahko samo ravninske ploskve - + Only linear edges can be picked Izberete lahko samo premočrtne robove - + Only faces and edges can be picked Izberete lahko samo ploskve in robove @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Izbriši - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Napaka izbire - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Nič ni izbrano! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Izbrani predmet ni del! - - + + Only faces can be picked Izberete lahko samo ploskve - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value izberite vrste zamejitev, ploskve in določi vrednost - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Napačna izbira - + Selected object is not a part object! Izbrani predmet ni del! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Napačna izbira - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Napaka izbire - + Only planar faces can be picked Izberete lahko samo ravninske ploskve - + Only linear edges can be picked Izberete lahko samo premočrtne robove - + Only faces and edges can be picked Izberete lahko samo ploskve in robove @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Napaka izbire - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! - + Only faces can be picked Izberete lahko samo ploskve - + Only planar faces can be picked Izberete lahko samo ravninske ploskve @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! - + Only faces can be picked Izberete lahko samo ploskve @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Premer jermenice - + Torque [Nm] Navor [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! - + Only faces can be picked Izberete lahko samo ploskve @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Selected object is not a part! Izbrani predmet ni del! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Napaka izbire - - + + Nothing selected! Nič ni izbrano! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Izbrani predmet ni del! - + Only faces can be picked Izberete lahko samo ploskve - + Only cylindrical faces can be picked Izberete lahko samo ploskve valja @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName Ime opravila @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Dolžina @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Možnosti izobličenja @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Napaka pri ploskovjenju - + The FEM module is built without NETGEN support. Meshing will not work!!! Modul MKE je vgrajen brez podpore za NETGEN. Ploskovjenje ne bo delovalo! @@ -3590,46 +3513,45 @@ Opomba: pri 2D je mogoče nastavili le x, Ustvariti ali omogočiti morate analizo - + Ok V redu - + Cancel Prekliči - - - - - - - - + + + + + + + + A dialog is already open in the task panel A dialog is already open in the task panel - - - - - - - - + + + + + + + + Do you want to close this dialog? Do you want to close this dialog? - + Meshing Ploskovjenje - @@ -3646,22 +3568,22 @@ Opomba: pri 2D je mogoče nastavili le x, Uvoz - Izvoz - + Constraint initial temperature Omejitev začetne temperature - + Constraint pulley Omejitev škripca - + Constraint spring Omejitev vzmeti - + Edit post processing object Uredi poobdelovalni predmet @@ -3701,62 +3623,62 @@ Opomba: pri 2D je mogoče nastavili le x, Skupine - + Are you sure you want to continue? Ali ste prepričani da želite nadaljevati? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Pogoj zamejitve tekočine - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ Možne spremenljivke si oglejte v spodnjem opisnem okencu. Std_Delete - + Object dependencies Odvisnosti predmetov @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Napaka: Sito lahko uporabite le na enem predmetu. - - - + + + The filter could not be set up. Sita ni bilo mogoče nastaviti. - - + + Error: no post processing object selected. Napaka: izbran ni noben poobdelovalni predmet. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Mke - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Mke - + Electromagnetic equations Elektromagnetne enačbe - + Electromagnetic equations for the Elmer solver Elektromagnetna enačba reševalnika Elmer @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Mke - + Contours filter Izočrtno sito - + Define/create a contours filter which displays iso contours Opredeli oz. ustvari izočrtno sito za prikazovanje enakostnic @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Možnosti izočrtnega sita @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Mke - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_sr-CS.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_sr-CS.ts index f267a4b139..2a3d26587d 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_sr-CS.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_sr-CS.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Ograničenje ležaja - + Creates a bearing constraint Pravi ograničenje ležaja @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem - Fem + MKE - + Contact constraint Kontaktno ograničenje - + Creates a contact constraint between faces Pravi kontaktno ograničenje između sve stranice @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem MKE - - Constraint displacement - Ograničenje pomeranja + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem MKE - - Constraint fixed - Ograničenje učvršćenosti + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem MKE - + Fluid boundary condition Granični uslovi fluida - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Napravi granične uslove numeričke mehanike fluida za entitet stranice @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem MKE - - Constraint force - Ograničenje sile + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem MKE - + Gear constraint Ograničenje zupčanika - + Creates a gear constraint Pravi ograničenje zupčanika @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem MKE - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem MKE - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem MKE - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem MKE - - Constraint pressure - Ograničenje pritiska + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem MKE - + Pulley constraint Ograničenje remenice - + Creates a pulley constraint Pravi ograničenje remenice @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem MKE - + Spring Opruga - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem MKE - - Constraint temperature - Ograničenje temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem MKE - - Constraint transform - Ograničenje transformacije + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Napravi lokalni koordinatni sistem na stranici @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem MKE - + Nodes set Skup čvorova - + Creates a FEM mesh nodes set Napravi skup čvorova MKE mreže - + Wrong selection Pogrešan izbor - + Select a single FEM mesh or nodes set, please. Izaberi jednu MKE mrežu ili skup čvorova. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem MKE - + Node set by poly Skup čvorova od mnogougaonika - - + + Create node set by Poly Napravi skup čvorova od mnogougaonika @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem MKE - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Primeni promene na parametre direktno, a ne samo prilikom ponovnog izračunavanja... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem MKE - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Pogrešan izbor - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem MKE - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem MKE - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem MKE - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem MKE - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Ravan - + Sphere Lopta - + Cylinder Valjak - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Debljina [mm] - + Stress [MPa] Plot Y-Axis Label Napon [MPa] - + Linearized Stresses Plot title Linearizovani naponi - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Total - - - Fem - MKE - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Pogrešan izbor - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - MKE - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - MKE - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Pogrešan izbor + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + MKE + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + MKE + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + MKE + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Napravi ograničenje ležaja - + Make contact constraint on a face Napravi kontaktno ograničenje na stranici - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Napravi ograničenje zupčanika - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Uredi simetriju @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1016,20 +1016,20 @@ Low frequency limit - + File does not exist Datoteka ne postoji - + The specified executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka + The specified executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist Datoteka ne postoji - + The specified executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka + The specified executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1384,20 +1384,20 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist Datoteka ne postoji - + The specified executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka + The specified executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. @@ -1461,82 +1461,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Materijal - - - - Card resources - Biblioteke kartica - - - - The cards built-in to FreeCAD will be listed as available. - Biće dostupne i kartice materijala ugrađene u FreeCAD. - - - - Use built-in materials - Koristi ugrađene materijale - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Biće dostupne i kartice materijala iz fascikle Materials, korisnikove FreeCAD fascikle sa podešavanjima. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Koristi kartice materijala iz korisnikove FreeCAD fascikle sa podešavanjima - - - - Also material cards also from the specified directory -will be listed as available. - Biće dostupne i kartice materijala iz ovde navedene fascikle. - - - - Use materials from user defined directory - Koristi materijale iz korisnikom definisane fascikle - - - - User directory - Korisnička fascikla - - - - Card sorting and duplicates - Sortiranje kartica i duplikati - - - - Duplicate cards will be deleted from the displayed material card list. - Duplikati kartica će biti obrisani sa prikazane liste kartica materijala. - - - - Delete card duplicates - Obriši duplikate kartica - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Kartice materijala će se pojavljivati sortirane prema bibliotekama kojima pripadaju (lokacijama). -Ako nije čekirano, biće sortirani po imenima. - - - - Sort by resources - Sortiraj po bibliotekama - - FemGui::DlgSettingsFemMystranImp @@ -1575,20 +1499,20 @@ Ako nije čekirano, biće sortirani po imenima. Write comments to input file - + File does not exist Datoteka ne postoji - + The specified executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka + The specified executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. @@ -1687,34 +1611,34 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist Datoteka ne postoji - + The specified z88r executable '%1' does not exist! Specify another file please. - Navedena izvršna datoteka z88r + The specified z88r executable '%1' - ne postoji! -Navedi drugu datoteku. + does not exist! +Specify another file please. - - + + Wrong file Pogrešna datoteka - + You must specify the path to the z88r.exe! Moraš navesti putanju do z88r.exe! - + You must specify the path to the z88r! Moraš navesti putanju do z88r! @@ -1738,13 +1662,13 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraint - - + + Input error Input error - + You must specify at least one reference Moraš navesti bar jednu referencu @@ -1752,7 +1676,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintBearing - + Input error Input error @@ -1760,7 +1684,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintContact - + Input error Input error @@ -1768,7 +1692,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintDisplacement - + Input error Input error @@ -1776,7 +1700,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Input error @@ -1784,13 +1708,13 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintForce - - + + Input error Input error - + Please specify a force greater than 0 Navedite silu veću od 0 @@ -1798,7 +1722,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintGear - + Input error Input error @@ -1806,7 +1730,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintHeatflux - + Input error Input error @@ -1814,8 +1738,8 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Input error @@ -1823,7 +1747,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintPressure - + Input error Input error @@ -1831,7 +1755,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintPulley - + Input error Input error @@ -1839,7 +1763,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintSpring - + Input error Input error @@ -1847,7 +1771,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintTemperature - + Input error Input error @@ -1855,7 +1779,7 @@ Navedi drugu datoteku. FemGui::TaskDlgFemConstraintTransform - + Input error Input error @@ -1863,12 +1787,12 @@ Navedi drugu datoteku. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Uredi MKE mrežu - + Meshing failure Greška prilikom pravljenja mreže @@ -1876,7 +1800,7 @@ Navedi drugu datoteku. FemGui::TaskDlgPost - + Input error Input error @@ -1892,12 +1816,12 @@ Navedi drugu datoteku. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Obriši @@ -1905,42 +1829,42 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Greška prilikom izbora - + Please use only a single reference for bearing constraint Koristi samo jednu referencu za ograničenje ležaja - + Only faces can be picked Mogu ce birati samo stranice - + Only cylindrical faces can be picked Mogu izabrati samo cilindrične stranice - + Only planar faces can be picked Mogu se izabrati samo ravne stranice - + Only linear edges can be picked Mogu se izabrati samo linearne ivice - + Only faces and edges can be picked Mogu se izabrati samo stranice i ivice @@ -1949,77 +1873,77 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintContact - + Delete Obriši - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Greška prilikom izbora - + Only one face in object! - moved to master face Samo jedna stranica u objektu! - premeštena u glavnu stranicu - - + + Only one master face and one slave face for a contact constraint! Samo jedna glavna stranica i jedna sporedna stranica za ograničenje kontakta! - - - - + + + + Nothing selected! Ništa nije izabrano! - + Only one slave face for a contact constraint! Samo jedna sporedna stranica za ograničenje kontakta! - - - - + + + + Selected object is not a part! Izabrani objekat nije deo! - - + + Only faces can be picked Mogu ce birati samo stranice - + Only one master for a contact constraint! Samo jedan glavni za ograničenje kontakta! - + Only one master face for a contact constraint! Samo jedna glavna stranica za ograničenje kontakta! @@ -2027,28 +1951,28 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2056,28 +1980,28 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2085,128 +2009,128 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulencija - + Thermal Toplotni - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intenzitet [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Izaberi ivicu ili stranicu. - - - - - + + + + + Wrong selection Pogrešan izbor - + Selected object is not a part object! Izabrani objekat nije deo! - + Only one planar face or edge can be selected! Možeš izabrati samo jednu ravansku stranicu ili ivicu! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2214,39 +2138,39 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Pogrešan izbor - + Select an edge or a face, please. Izaberi ivicu ili stranicu. @@ -2254,24 +2178,24 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintGear - - - + + + Selection error Greška prilikom izbora - + Only planar faces can be picked Mogu se izabrati samo ravne stranice - + Only linear edges can be picked Mogu se izabrati samo linearne ivice - + Only faces and edges can be picked Mogu se izabrati samo stranice i ivice @@ -2279,30 +2203,30 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! - - + + Selection must only consist of faces! Možete izabrati samo stranice! @@ -2310,42 +2234,42 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Greška prilikom izbora - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! - + Only faces can be picked Mogu ce birati samo stranice - + Only planar faces can be picked Mogu se izabrati samo ravne stranice @@ -2353,28 +2277,28 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! - + Only faces can be picked Mogu ce birati samo stranice @@ -2382,12 +2306,12 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintPulley - + Pulley diameter Prečnik remenice - + Torque [Nm] Obrtni momenat [Nm] @@ -2395,28 +2319,28 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! - + Only faces can be picked Mogu ce birati samo stranice @@ -2424,22 +2348,22 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Selected object is not a part! Izabrani objekat nije deo! @@ -2447,64 +2371,64 @@ Navedi drugu datoteku. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Greška prilikom izbora - - + + Nothing selected! Ništa nije izabrano! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Izabrani objekat nije deo! - + Only faces can be picked Mogu ce birati samo stranice - + Only cylindrical faces can be picked Mogu izabrati samo cilindrične stranice @@ -2512,7 +2436,7 @@ Navedi drugu datoteku. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2520,7 +2444,7 @@ Navedi drugu datoteku. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2528,7 +2452,7 @@ Navedi drugu datoteku. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2536,12 +2460,12 @@ Navedi drugu datoteku. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Dužina @@ -2550,12 +2474,12 @@ Navedi drugu datoteku. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 na (%2; %3; %4) je: %5 %6 @@ -2563,7 +2487,7 @@ Navedi drugu datoteku. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2571,7 +2495,7 @@ Navedi drugu datoteku. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2579,7 +2503,7 @@ Navedi drugu datoteku. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2587,7 +2511,7 @@ Navedi drugu datoteku. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2611,12 +2535,12 @@ Navedi drugu datoteku. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Greška prilikom pravljenja mreže - + The FEM module is built without NETGEN support. Meshing will not work!!! MKE modul je napravljen bez NETGEN podrške. Pravljenje mreže neće raditi!!! @@ -3588,46 +3512,45 @@ Note: for 2D only setting for x is possible, Potrebno je da napraviš, ili aktiviraš Analizu - + Ok U redu - + Cancel Otkaži - - - - - - - - + + + + + + + + A dialog is already open in the task panel A dialog is already open in the task panel - - - - - - - - + + + + + + + + Do you want to close this dialog? Do you want to close this dialog? - + Meshing Pravljenje mreže - @@ -3644,22 +3567,22 @@ Note: for 2D only setting for x is possible, Uvoz/Izvoz - + Constraint initial temperature Ograničenje početne temperature - + Constraint pulley Ograničenje remenice - + Constraint spring Ograničenje opruge - + Edit post processing object Edit post processing object @@ -3699,62 +3622,62 @@ Note: for 2D only setting for x is possible, Grupe - + Are you sure you want to continue? Da li si siguran da želiš da nastaviš? - + Contact constraint Kontaktno ograničenje - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Granični uslovi fluida - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4092,7 +4015,7 @@ Za moguće promenljive, pogledaj okvir za opis ispod. Std_Delete - + Object dependencies Međuzavisnosti objekata @@ -4276,7 +4199,7 @@ Za moguće promenljive, pogledaj okvir za opis ispod. Distance - Distance + Rastojanje @@ -5372,20 +5295,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Greška: Filter se može primeniti samo na jedan objekat. - - - + + + The filter could not be set up. Nije moguće podesiti filter. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6100,13 +6023,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem - MKE + Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6152,17 +6075,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Elektromagnetne jednačine - + Electromagnetic equations for the Elmer solver Elektromagnetne jednačine Elmer algoritma za rešavanje @@ -6170,17 +6093,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6188,7 +6111,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6282,17 +6205,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_sr.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_sr.ts index c5696f11a1..acfc4736a1 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_sr.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_sr.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Ограничење лежаја - + Creates a bearing constraint Прави ограничење лежаја @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem - Fem + МКЕ - + Contact constraint Контактно ограничење - + Creates a contact constraint between faces Прави контактно ограничење између две странице @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem МКЕ - - Constraint displacement - Ограничење померања + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem МКЕ - - Constraint fixed - Ограничење учвршћености + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem МКЕ - + Fluid boundary condition Гранични услови флуида - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Направи граничне услове нумеричке механике флуида за ентитет странице @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem МКЕ - - Constraint force - Ограничење cиле + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem МКЕ - + Gear constraint Ограничење зупчаника - + Creates a gear constraint Прави ограничење зупчаника @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem МКЕ - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem МКЕ - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem МКЕ - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem МКЕ - - Constraint pressure - Ограничење притиска + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem МКЕ - + Pulley constraint Ограничење ременице - + Creates a pulley constraint Прави ограничење ременице @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem МКЕ - + Spring Ограничење опруге - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem МКЕ - - Constraint temperature - Ограничење температуре + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem МКЕ - - Constraint transform - Ограничење трансформације + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Направи локални координатни систем на страници @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem МКЕ - + Nodes set Скуп чворова - + Creates a FEM mesh nodes set Направи скуп чворова МКЕ мреже - + Wrong selection Погрешан избор - + Select a single FEM mesh or nodes set, please. Изабери једну МКЕ мрежу или скуп чворова. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem МКЕ - + Node set by poly Скуп чворова од многоугаоника - - + + Create node set by Poly Направискуп чворова од многоугаоника @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem МКЕ - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Примени промене на параметре директно, а не само приликом поновног израчунавања... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem МКЕ - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Погрешан избор - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem МКЕ - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem МКЕ - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem МКЕ - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem МКЕ - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Раван - + Sphere Лопта - + Cylinder Ваљак - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Дебљина [mm] - + Stress [MPa] Plot Y-Axis Label Напон [MPa] - + Linearized Stresses Plot title Линеаризовани напони - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Total - - - Fem - МКЕ - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Погрешан избор - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - МКЕ - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - МКЕ - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Погрешан избор + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + МКЕ + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + МКЕ + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + МКЕ + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Направи ограничење лежаја - + Make contact constraint on a face Направи контактно ограничење на страници - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Направи ограничење зупчаника - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Уреди симетрију @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1016,20 +1016,20 @@ Low frequency limit - + File does not exist Датотека не постоји - + The specified executable '%1' does not exist! Specify another file please. - Наведена извршна датотека + The specified executable '%1' - не постоји! -Наведи другу датотеку. + does not exist! +Specify another file please. @@ -1118,36 +1118,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist Датотека не постоји - + The specified executable '%1' does not exist! Specify another file please. - Наведена извршна датотека + The specified executable '%1' - не постоји! -Наведи другу датотеку. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1384,20 +1384,20 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist Датотека не постоји - + The specified executable '%1' does not exist! Specify another file please. - Наведена извршна датотека + The specified executable '%1' - не постоји! -Наведи другу датотеку. + does not exist! +Specify another file please. @@ -1461,82 +1461,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Материјал - - - - Card resources - Библиотеке картица - - - - The cards built-in to FreeCAD will be listed as available. - Биће доступне и картице материјала уграђене у FreeCAD. - - - - Use built-in materials - Кориcти уграђене материјале - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Биће доступне и картице материјала из фасцикле Материалс, корисникове ФрееЦАД фасцикле са подешавањима. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Користи картице материјала из корисникове FreeCAD фасцикле са подешавањима - - - - Also material cards also from the specified directory -will be listed as available. - Биће доступне и картице материјала из овде наведене фасцикле. - - - - Use materials from user defined directory - Користи материјале из корисником дефинисане фасцикле - - - - User directory - Кориcничка фасикла - - - - Card sorting and duplicates - Сортирање картица и дупликати - - - - Duplicate cards will be deleted from the displayed material card list. - Дупликати картица ће бити обрисани са приказане листе картица материјала. - - - - Delete card duplicates - Обриши дупликате картица - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Картице материјала ће се појављивати сортиране према библиотекама којима припадају (локацијама). -Ако није чекирано, биће сортирани по именима. - - - - Sort by resources - Сортирај по библиотекама - - FemGui::DlgSettingsFemMystranImp @@ -1575,20 +1499,20 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist Датотека не постоји - + The specified executable '%1' does not exist! Specify another file please. - Наведена извршна датотека + The specified executable '%1' - не постоји! -Наведи другу датотеку. + does not exist! +Specify another file please. @@ -1687,34 +1611,34 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist Датотека не постоји - + The specified z88r executable '%1' does not exist! Specify another file please. - Наведена извршна датотека z88r + The specified z88r executable '%1' - не постоји! -Наведи другу датотеку. + does not exist! +Specify another file please. - - + + Wrong file Погрешна датотека - + You must specify the path to the z88r.exe! Мораш навести путању до z88r.exe! - + You must specify the path to the z88r! Мораш навести путању до z88r! @@ -1738,13 +1662,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Грешка приликом уноса - + You must specify at least one reference Мораш навести бар једну референцу @@ -1752,7 +1676,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Грешка приликом уноса @@ -1760,7 +1684,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Грешка приликом уноса @@ -1768,7 +1692,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Грешка приликом уноса @@ -1776,7 +1700,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Грешка приликом уноса @@ -1784,13 +1708,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Грешка приликом уноса - + Please specify a force greater than 0 Наведи cилу већу од 0 @@ -1798,7 +1722,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Грешка приликом уноса @@ -1806,7 +1730,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Грешка приликом уноса @@ -1814,8 +1738,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Грешка приликом уноса @@ -1823,7 +1747,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Грешка приликом уноса @@ -1831,7 +1755,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Грешка приликом уноса @@ -1839,7 +1763,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Грешка приликом уноса @@ -1847,7 +1771,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Грешка приликом уноса @@ -1855,7 +1779,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Грешка приликом уноса @@ -1863,12 +1787,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Уреди МКЕ мрежу - + Meshing failure Грешка приликом прављења мреже @@ -1876,7 +1800,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Грешка приликом уноса @@ -1892,12 +1816,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Обриши @@ -1905,42 +1829,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Грешка приликом избора - + Please use only a single reference for bearing constraint Кориcти cамо једну референцу за ограничење лежаја - + Only faces can be picked Могу се бирати само странице - + Only cylindrical faces can be picked Могу изабрати само цилиндричне странице - + Only planar faces can be picked Могу се изабрати само равне странице - + Only linear edges can be picked Могу се изабрати само линеарне ивице - + Only faces and edges can be picked Могу се изабрати само странице и ивице @@ -1949,77 +1873,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Обриши - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Грешка приликом избора - + Only one face in object! - moved to master face Само једна страница у објекту! - премештена у главну страницу - - + + Only one master face and one slave face for a contact constraint! Само једна главна страница и једна споредна страница за ограничење контакта! - - - - + + + + Nothing selected! Ништа није изабрано! - + Only one slave face for a contact constraint! Само једна споредна страница за ограничење контакта! - - - - + + + + Selected object is not a part! Изабрани објекат није део! - - + + Only faces can be picked Могу се бирати само странице - + Only one master for a contact constraint! Само један главни за ограничење контакта! - + Only one master face for a contact constraint! Само једна главна страница за ограничење контакта! @@ -2027,28 +1951,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2056,28 +1980,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2085,128 +2009,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Турбуленција - + Thermal Топлотни - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Интензитет [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Изабери ивицу или страницу. - - - - - + + + + + Wrong selection Погрешан избор - + Selected object is not a part object! Изабрани објекат није део! - + Only one planar face or edge can be selected! Можеш изабрати само једну раванску страницу или ивицу! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2214,39 +2138,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Погрешан избор - + Select an edge or a face, please. Изабери ивицу или страницу. @@ -2254,24 +2178,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Грешка приликом избора - + Only planar faces can be picked Могу се изабрати само равне странице - + Only linear edges can be picked Могу се изабрати само линеарне ивице - + Only faces and edges can be picked Могу се изабрати само странице и ивице @@ -2279,30 +2203,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! - - + + Selection must only consist of faces! Можете изабрати само странице! @@ -2310,42 +2234,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Грешка приликом избора - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! - + Only faces can be picked Могу се бирати само странице - + Only planar faces can be picked Могу се изабрати само равне странице @@ -2353,28 +2277,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! - + Only faces can be picked Могу се бирати само странице @@ -2382,12 +2306,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Пречник ременице - + Torque [Nm] Обртни моменат [Nm] @@ -2395,28 +2319,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! - + Only faces can be picked Могу се бирати само странице @@ -2424,22 +2348,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Selected object is not a part! Изабрани објекат није део! @@ -2447,64 +2371,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Грешка приликом избора - - + + Nothing selected! Ништа није изабрано! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Изабрани објекат није део! - + Only faces can be picked Могу се бирати само странице - + Only cylindrical faces can be picked Могу изабрати само цилиндричне странице @@ -2512,7 +2436,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2520,7 +2444,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2528,7 +2452,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2536,12 +2460,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Дужина @@ -2550,12 +2474,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 на (%2; %3; %4) је: %5 %6 @@ -2563,7 +2487,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2571,7 +2495,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2579,7 +2503,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2587,7 +2511,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2611,12 +2535,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Грешка приликом прављења мреже - + The FEM module is built without NETGEN support. Meshing will not work!!! МКЕ модул је направљен без NETGEN подршке. Прављење мреже неће радити!!! @@ -3588,46 +3512,45 @@ Note: for 2D only setting for x is possible, Потребно је да направиш, или активираш Анализу - + Ok У реду - + Cancel Откажи - - - - - - - - + + + + + + + + A dialog is already open in the task panel Дијалог је већ отворен у панелу задатака - - - - - - - - + + + + + + + + Do you want to close this dialog? Да ли желите да затворите овај дијалог? - + Meshing Прављење мреже - @@ -3644,22 +3567,22 @@ Note: for 2D only setting for x is possible, Увоз/извоз - + Constraint initial temperature Ограничење почетне температуре - + Constraint pulley Ограничење ременице - + Constraint spring Ограничење опруге - + Edit post processing object Edit post processing object @@ -3699,62 +3622,62 @@ Note: for 2D only setting for x is possible, Групе - + Are you sure you want to continue? Да ли си сигуран да желиш да наставиш? - + Contact constraint Контактно ограничење - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Гранични услови флуида - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4092,7 +4015,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Међузависности објеката @@ -4276,7 +4199,7 @@ For possible variables, see the description box below. Distance - Distance + Растојање @@ -5372,20 +5295,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Грешка: Филтер се може применити само на један објекат. - - - + + + The filter could not be set up. Није могуће подесити филтер. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6100,13 +6023,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem МКЕ - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6152,17 +6075,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem МКЕ - + Electromagnetic equations Електромагнетне једначине - + Electromagnetic equations for the Elmer solver Електромагнетне једначине Elmer алгоритма за решавање @@ -6170,17 +6093,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem МКЕ - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6188,7 +6111,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6282,17 +6205,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem - МКЕ + Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_sv-SE.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_sv-SE.ts index 6bcadd59c0..1df3305fa8 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_sv-SE.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_sv-SE.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Constraint force + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Noduppsättning - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Fel val - + Select a single FEM mesh or nodes set, please. Select a single FEM mesh or nodes set, please. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Skapa noduppsättning av polygoner @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Fel val - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Plan - + Sphere Sfär - + Cylinder Cylinder - + Box Låda @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Thickness [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Totalt - - - Fem - Fem - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Fel val - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Fel val + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Placera robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Skapa filter - + Create function Skapa funktion - + Create pipeline from result Create pipeline from result - + Edit Mirror Redigera spegel @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Low frequency limit - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Använd inbyggda material - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Use materials from user defined directory - - - - User directory - Användarkatalog - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Inmatningsfel - + You must specify at least one reference Du måste ange minst en referens @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Inmatningsfel @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Inmatningsfel @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Inmatningsfel @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Inmatningsfel @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Inmatningsfel - + Please specify a force greater than 0 Vänligen specificera en kraft större än 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Inmatningsfel @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Inmatningsfel @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Inmatningsfel @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Inmatningsfel @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Inmatningsfel @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Inmatningsfel @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Inmatningsfel @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Inmatningsfel @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Edit FEM mesh - + Meshing failure Meshing failure @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Inmatningsfel @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Radera @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Markeringsfel - + Please use only a single reference for bearing constraint Please use only a single reference for bearing constraint - + Only faces can be picked Endast ytor kan väljas - + Only cylindrical faces can be picked Endast cylindriska ytor kan väljas - + Only planar faces can be picked Endast plana ytor kan väljas - + Only linear edges can be picked Endast linjära kanter kan väljas - + Only faces and edges can be picked Endast ytor och kanter kan väljas @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Radera - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Markeringsfel - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Inget markerat! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Markerad objekt är inte en komponent! - - + + Only faces can be picked Endast ytor kan väljas - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulens - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Tom markering - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Fel val - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Fel val - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Markeringsfel - + Only planar faces can be picked Endast plana ytor kan väljas - + Only linear edges can be picked Endast linjära kanter kan väljas - + Only faces and edges can be picked Endast ytor och kanter kan väljas @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Markeringsfel - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! - + Only faces can be picked Endast ytor kan väljas - + Only planar faces can be picked Endast plana ytor kan väljas @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! - + Only faces can be picked Endast ytor kan väljas @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Diameter på talja - + Torque [Nm] Vridmoment [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! - + Only faces can be picked Endast ytor kan väljas @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Selected object is not a part! Markerad objekt är inte en komponent! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Markeringsfel - - + + Nothing selected! Inget markerat! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Markerad objekt är inte en komponent! - + Only faces can be picked Endast ytor kan väljas - + Only cylindrical faces can be picked Endast cylindriska ytor kan väljas @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Längd @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp-alternativ @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Meshing failure - + The FEM module is built without NETGEN support. Meshing will not work!!! The FEM module is built without NETGEN support. Meshing will not work!!! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, Du måste skapa eller aktivera en analys - + Ok OK - + Cancel Avbryt - - - - - - - - + + + + + + + + A dialog is already open in the task panel En dialogruta är redan öppen i uppgiftspanelen - - - - - - - - + + + + + + + + Do you want to close this dialog? Vill du stänga denna dialogruta? - + Meshing Meshing - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Importera/Exportera - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Grupper - + Are you sure you want to continue? Är du säker på att du vill fortsätta? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Objektberoenden @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_tr.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_tr.ts index ed37462e9a..a51dc4777c 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_tr.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_tr.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Sonlu elemanlar yöntemi - + Bearing constraint Rulman kısıtlaması - + Creates a bearing constraint Rulman kısıtı oluşturma @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Sonlu elemanlar yöntemi - + Contact constraint Temas kısıtlaması - + Creates a contact constraint between faces Yüzeyler arasında temas temas kısıtlaması oluştur @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Sonlu elemanlar yöntemi - - Constraint displacement - Kısıtlama-yer değiştirme + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Sonlu elemanlar yöntemi - - Constraint fixed - Kısıtlama-sabit + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Sonlu elemanlar yöntemi - + Fluid boundary condition Akışkan sınır koşulu - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Hesaplamalı Akışkanlar Dinamiği için yüz ögesi üzerinde akışkan sınır koşulu oluştur @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Sonlu elemanlar yöntemi - - Constraint force - Kısıt kuvveti + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Sonlu elemanlar yöntemi - + Gear constraint Dişli kısıtlaması - + Creates a gear constraint Dişli kısıtlaması oluşturma @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Sonlu elemanlar yöntemi - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Sonlu elemanlar yöntemi - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Sonlu elemanlar yöntemi - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Sonlu elemanlar yöntemi - - Constraint pressure - Kısıtlama-basınç + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Sonlu elemanlar yöntemi - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Sonlu elemanlar yöntemi - + Spring Yay - + Creates a spring acting on a face Yüzeyde yay davranışı oluştur @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Sonlu elemanlar yöntemi - - Constraint temperature - Sıcaklığı kısıtla + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Sonlu elemanlar yöntemi - - Constraint transform - Dönüşümü kısıtla + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Sonlu elemanlar yöntemi - + Nodes set Düğümler ayarla - + Creates a FEM mesh nodes set Bir FEM metal örgü düğümleri dizisi oluşturur - + Wrong selection Yanlış seçim - + Select a single FEM mesh or nodes set, please. Tek bir FEM örgüsünü veya düğüm setini seçin, lütfen. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Sonlu elemanlar yöntemi - + Node set by poly Poly tarafından ayarlanan düğüm - - + + Create node set by Poly Poly tarafından çoklu küme (nodes) oluştur @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Sonlu elemanlar yöntemi - + Apply changes to pipeline İş hattına değişiklikleri uygula - + Apply changes to parameters directly and not on recompute only... Değişiklikleri yalnızca yeniden hesaplamada değil, doğrudan parametrelere uygulayın... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Sonlu elemanlar yöntemi - + Region clip filter Bölge alıntısı süzgeci - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Yanlış seçim - + Select a pipeline, please. Bir iş hattı seçiniz, lütfen. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Sonlu elemanlar yöntemi - + Function cut filter Kesme filtresi fonksiyonu - + Cut the data along an implicit function Verileri örtük bir fonksiyon boyunca kesin @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Sonlu elemanlar yöntemi - + Line clip filter Çizgi alıntı süzgeci - + Define/create a clip filter which clips a field along a line Bir çizgi boyunca bir alanı alıntılayan alıntı süzgeci tanımlayın/oluşturun @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Sonlu elemanlar yöntemi - + Data at point clip filter Noktasal veri alıntısı süzgeci - + Define/create a clip filter which clips a field data at point Noktasal veri alanını alıntılayan bir alıntı süzgeci tanımlayın/oluşturun @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Sonlu elemanlar yöntemi - + Filter functions Süzgeç işlevleri - + Functions for use in postprocessing filter... İşlem sonrası filtrede kullanılacak fonksiyonlar... - + Plane Düzlem - + Sphere Küre - + Cylinder Silindir - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Kalınlık [mm] - + Stress [MPa] Plot Y-Axis Label Gerilim [MPa] - + Linearized Stresses Plot title Doğrusallaştırılmış Gerilmeler - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Toplam - - - Fem - Sonlu elemanlar yöntemi - - - - Stress linearization plot - Gerilme doğrusallaştırma grafiği - - - - Define/create stress linearization plots - Gerilme doğrusallaştırma grafiklerini tanımlayın/oluşturun - - - - - Wrong selection - Yanlış seçim - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Bir çizgi boyunca bir STRES alanını kırpan bir Darbe filtresi seçin, lütfen. - - - - CmdFemPostPipelineFromResult - - - Fem - Sonlu elemanlar yöntemi - - - - Post pipeline from result - Sonuçtaki iş hattını yayınla - - - - Creates a post processing pipeline from a result object - Bir sonuç nesnesinden bir işlem sonrası oluşturur - - - - Wrong selection type - Yanlış seçim türü - - - - Select a result object, please. - Bir sonuç nesnesi seçin, lütfen. - - - - CmdFemPostScalarClipFilter - - - Fem - Sonlu elemanlar yöntemi - - - - Scalar clip filter - Skaler kırpma filtresi - - - - Define/create a clip filter which clips a field with a scalar value - Skaler değere sahip bir alanı kırpan bir kırpma filtresi tanımlayın/oluşturun - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Gerilme doğrusallaştırma grafiği + + + + Define/create stress linearization plots + Gerilme doğrusallaştırma grafiklerini tanımlayın/oluşturun + + + + + Wrong selection + Yanlış seçim + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Bir çizgi boyunca bir STRES alanını kırpan bir Darbe filtresi seçin, lütfen. + + + + CmdFemPostPipelineFromResult + + + Fem + Sonlu elemanlar yöntemi + + + + Post pipeline from result + Sonuçtaki iş hattını yayınla + + + + Creates a post processing pipeline from a result object + Bir sonuç nesnesinden bir işlem sonrası oluşturur + + + + Wrong selection type + Yanlış seçim türü + + + + Select a result object, please. + Bir sonuç nesnesi seçin, lütfen. + + + + CmdFemPostScalarClipFilter + + + Fem + Sonlu elemanlar yöntemi + + + + Scalar clip filter + Skaler kırpma filtresi + + + + Define/create a clip filter which clips a field with a scalar value + Skaler değere sahip bir alanı kırpan bir kırpma filtresi tanımlayın/oluşturun + + + + CmdFemPostWarpVectorFilter + + + Fem + Sonlu elemanlar yöntemi + + + Warp filter Saptırma filtresi - + Warp the geometry along a vector field by a certain factor Geometriyi bir vektör alanı boyunca belirli bir etkenle saptırın @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Akışkan sınır koşulu oluştur - + Make bearing constraint Rulman kısıtlaması yap - + Make contact constraint on a face Yüzeyde temas kısıtlaması oluştur - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Yüzeyde yay yap - + Make pulley constraint Makara kısıtlaması olştur - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Robot yerleştir - + Edit nodes set Düğüm noktaları kümesini düzenle - + Create nodes set Düğüm noktaları kümesi oluştur - + Create filter Filtre edici oluşturun - + Create function Fonksiyon oluştur - + Create pipeline from result Sonuçtan iş hattı oluştur - + Edit Mirror Aynalamayı Düzenle @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Başlangıç noktası ve dik yönüne göre tanımlanan bir düzlem işlevi oluştur - + Create a sphere function, defined by its center and radius Merkezi ve yarıçapına göre tanımlanan bir küre işlevi oluştur - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,20 +1017,20 @@ Yüksek frekans sınırı - + File does not exist Dosya mevcut değil - + The specified executable '%1' does not exist! Specify another file please. - Belirtilen uygulama + The specified executable '%1' - mevcut değil! -Lütfen başka bir dosya belirtin. + does not exist! +Specify another file please. @@ -1119,36 +1119,36 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist Dosya mevcut değil - + The specified executable '%1' does not exist! Specify another file please. - Belirtilen uygulama + The specified executable '%1' - mevcut değil! -Lütfen başka bir dosya belirtin. + does not exist! +Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1383,20 +1383,20 @@ adding an analysis container Varsayılan gmsh ikili dosyasını kullanmak için boş bırakın - + File does not exist Dosya mevcut değil - + The specified executable '%1' does not exist! Specify another file please. - Belirtilen uygulama + The specified executable '%1' - mevcut değil! -Lütfen başka bir dosya belirtin. + does not exist! +Specify another file please. @@ -1455,83 +1455,6 @@ FreeCAD sonuç nesnesi: İçe aktarılan veriler bir FreeCAD FEM Sonuç nesnesin FreeCAD sonuç nesnesi - - FemGui::DlgSettingsFemMaterialImp - - - Material - Malzeme - - - - Card resources - Kart kaynakları - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Yerleşik malzeme kullanımı - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Kullanıcı tanımlı dizindeki materyalleri kullan - - - - User directory - Kullanıcı dizini - - - - Card sorting and duplicates - Kart sıralaması ve yedekler - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Yedek kartları sil - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Kaynaklara göre sırala - - FemGui::DlgSettingsFemMystranImp @@ -1570,20 +1493,20 @@ If unchecked, they will be sorted by their name. Giriş dosyasına yorum yazın - + File does not exist Dosya mevcut değil - + The specified executable '%1' does not exist! Specify another file please. - Belirtilen uygulama + The specified executable '%1' - mevcut değil! -Lütfen başka bir dosya belirtin. + does not exist! +Specify another file please. @@ -1682,12 +1605,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist Dosya mevcut değil - + The specified z88r executable '%1' does not exist! @@ -1698,18 +1621,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Yanlış dosya - + You must specify the path to the z88r.exe! z88r.exe dosyasının yolunu belirtmelisiniz! - + You must specify the path to the z88r! z88r'nin yolunu belirtmelisiniz! @@ -1733,13 +1656,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Girdi hatası - + You must specify at least one reference En az bir referans belirtmeniz gerekir @@ -1747,7 +1670,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Girdi hatası @@ -1755,7 +1678,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Girdi hatası @@ -1763,7 +1686,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Girdi hatası @@ -1771,7 +1694,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Girdi hatası @@ -1779,13 +1702,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Girdi hatası - + Please specify a force greater than 0 Lütfen 0'dan büyük bir güç belirtin @@ -1793,7 +1716,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Girdi hatası @@ -1801,7 +1724,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Girdi hatası @@ -1809,8 +1732,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Girdi hatası @@ -1818,7 +1741,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Girdi hatası @@ -1826,7 +1749,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Girdi hatası @@ -1834,7 +1757,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Girdi hatası @@ -1842,7 +1765,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Girdi hatası @@ -1850,7 +1773,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Girdi hatası @@ -1858,12 +1781,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh FEM kafes Düzenle - + Meshing failure İşlem hatası @@ -1871,7 +1794,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Girdi hatası @@ -1887,12 +1810,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Sil @@ -1900,42 +1823,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Seçim hatası - + Please use only a single reference for bearing constraint Yatak kısıtlaması için lütfen sadece tek bir referans kullanın - + Only faces can be picked Sadece modelin yüzleri seçilebilir - + Only cylindrical faces can be picked Sadece silindirik yüzler seçilebilir - + Only planar faces can be picked Yalnızca düzlemsel yüzler seçilebilir - + Only linear edges can be picked Yalnızca doğrusal kenarlar seçilebilir - + Only faces and edges can be picked Sadece yüzeyler ve kenarlar seçilebilir @@ -1944,77 +1867,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Sil - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Seçim hatası - + Only one face in object! - moved to master face Nesnede yalnızca bir tane geometrik yüz! - asıl geometrik yüze taşındı - - + + Only one master face and one slave face for a contact constraint! Bir iletişim kısıtlaması için yalnızca bir asıl geometrik yüz ve bir bağımlı geometrik yüz! - - - - + + + + Nothing selected! Seçim yok! - + Only one slave face for a contact constraint! Bir iletişim kısıtlaması için yalnızca bir bağımlı geometrik yüz! - - - - + + + + Selected object is not a part! Temel nesne bir parçası olmadığını! - - + + Only faces can be picked Sadece modelin yüzleri seçilebilir - + Only one master for a contact constraint! Bir iletişim kısıtlaması için yalnızca bir asıl yönetici! - + Only one master face for a contact constraint! Bir iletişim kısıtlaması için yalnızca bir asıl geometrik yüz! @@ -2022,28 +1945,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2051,28 +1974,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2080,128 +2003,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Temel - + Turbulence Türbülans - + Thermal Isıl - + select boundary type, faces and set value sınır türünü, yüzeyleri seçin ve değeri ayarlayın - + Intensity [0~1] Yoğunluk [0~1] - + Dissipation Rate [m2/s3] Yitim Oranı [m2/s3] - + Length Scale[m] Uzunluk Ölçeği[m] - + Viscosity Ratio [1] Viskozite Oranı [1] - + Hydraulic Diameter [m] Hidrolik Çap [m] - - + + Gradient [K/m] Gradyan [K/m] - + Flux [W/m2] Akı [W/m2] - + Empty selection Seçimi boşalt - + Select an edge or a face, please. Bir kenar veya bir yüz seçin, lütfen. - - - - - + + + + + Wrong selection Yanlış seçim - + Selected object is not a part object! Seçilen nesne bir parça nesnesi değil! - + Only one planar face or edge can be selected! Tek bir düzlemsel yüz veya kenar seçilebilir! - + Only planar faces can be picked for 3D 3B için yalnızca düzlemsel geometrik yüzler seçilebilir - + Only planar edges can be picked for 2D 2B için yalnızca düzlemsel kenarlar seçilebilir - + Only faces for 3D part or edges for 2D can be picked 3B parça için yalnızca geometrik yüzler veya 2B parça için yalnızca kenarlar seçilebilir - - + - - + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2209,39 +2132,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Yanlış seçim - + Select an edge or a face, please. Bir kenar veya bir yüz seçin, lütfen. @@ -2249,24 +2172,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Seçim hatası - + Only planar faces can be picked Yalnızca düzlemsel yüzler seçilebilir - + Only linear edges can be picked Yalnızca doğrusal kenarlar seçilebilir - + Only faces and edges can be picked Sadece yüzeyler ve kenarlar seçilebilir @@ -2274,30 +2197,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - - + + Selection must only consist of faces! Seçim sadece yüzlerden oluşmalıdır! @@ -2305,42 +2228,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Seçim hatası - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - + Only faces can be picked Sadece modelin yüzleri seçilebilir - + Only planar faces can be picked Yalnızca düzlemsel yüzler seçilebilir @@ -2348,28 +2271,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - + Only faces can be picked Sadece modelin yüzleri seçilebilir @@ -2377,12 +2300,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Makara çapı - + Torque [Nm] Tork [Nm] @@ -2390,28 +2313,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - + Only faces can be picked Sadece modelin yüzleri seçilebilir @@ -2419,22 +2342,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! @@ -2442,64 +2365,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! Dönüştürülebilir yüzler değiştirilmiş. Lütfen sadece dönüştürülebilir yüzleri ekleyin ve dönüştürülemez yüzleri kaldırın! - - - - - - - - - - + + + + + + + + + + Selection error Seçim hatası - - + + Nothing selected! Seçim yok! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Temel nesne bir parçası olmadığını! - + Only faces can be picked Sadece modelin yüzleri seçilebilir - + Only cylindrical faces can be picked Sadece silindirik yüzler seçilebilir @@ -2507,7 +2430,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName Nesne görev adı @@ -2515,7 +2438,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Bölgeyi alıntılayın, örtülü işlevi seçin @@ -2523,7 +2446,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Kesilecek, örtük fonksiyonu seçiniz @@ -2531,12 +2454,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Çizgisel veri seçenekleri - + Length X-Axis plot label Uzunluk @@ -2545,12 +2468,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Noktasal veri seçenekleri - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2558,7 +2481,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Sonuç ekranı seçenekleri @@ -2566,7 +2489,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Örtülü işlev @@ -2574,7 +2497,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Skaler kırpma seçenekleri @@ -2582,7 +2505,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Saptırma seçenekleri @@ -2606,12 +2529,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure İşlem hatası - + The FEM module is built without NETGEN support. Meshing will not work!!! FEM modülü NETGEN desteği olmadan oluşturulmuştur. Örgü işe yaramaz!!! @@ -3583,46 +3506,45 @@ Note: for 2D only setting for x is possible, Bir analiz oluşturmanız yada aktive etmeniz gerekmetedir - + Ok Tamam - + Cancel İptal - - - - - - - - + + + + + + + + A dialog is already open in the task panel Araç çubuğunda bir pencere zaten açık - - - - - - - - + + + + + + + + Do you want to close this dialog? Bu pencereyi kapatmak ister misiniz? - + Meshing Meshing - @@ -3639,22 +3561,22 @@ Note: for 2D only setting for x is possible, İçe-Dışa Aktar - + Constraint initial temperature Başlangıç sıcaklığı kısıtı - + Constraint pulley Kasnağı kısıtla - + Constraint spring Kısıtlama-yay - + Edit post processing object İşleme sonrası nesneyi düzenle @@ -3694,62 +3616,62 @@ Note: for 2D only setting for x is possible, Gruplar - + Are you sure you want to continue? Devam etmek istediğinizden emin misiniz? - + Contact constraint Temas kısıtlaması - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Akışkan sınır koşulu - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4087,7 +4009,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Nesne bağımlılıkları @@ -5367,20 +5289,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Hata: Bir filtre sadece tekil bir objeye uygulanabilir. - - - + + + The filter could not be set up. Filtre kurulamadı. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6095,13 +6017,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Sonlu elemanlar yöntemi - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6147,17 +6069,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Sonlu elemanlar yöntemi - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6165,17 +6087,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Sonlu elemanlar yöntemi - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6183,7 +6105,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6277,17 +6199,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Sonlu elemanlar yöntemi - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_uk.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_uk.ts index f2c67c5964..918d342d6d 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_uk.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_uk.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem МСЕ (Метод скінченних елементів) - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem МСЕ (Метод скінченних елементів) - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem МСЕ (Метод скінченних елементів) - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem МСЕ (Метод скінченних елементів) - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem МСЕ (Метод скінченних елементів) - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem МСЕ (Метод скінченних елементів) - - Constraint force - Constraint force + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem МСЕ (Метод скінченних елементів) - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem МСЕ (Метод скінченних елементів) - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem МСЕ (Метод скінченних елементів) - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem МСЕ (Метод скінченних елементів) - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem МСЕ (Метод скінченних елементів) - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem МСЕ (Метод скінченних елементів) - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem МСЕ (Метод скінченних елементів) - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem МСЕ (Метод скінченних елементів) - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem МСЕ (Метод скінченних елементів) - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem МСЕ (Метод скінченних елементів) - + Nodes set Набір вузлів - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Невірний вибір - + Select a single FEM mesh or nodes set, please. Select a single FEM mesh or nodes set, please. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem МСЕ (Метод скінченних елементів) - + Node set by poly Node set by poly - - + + Create node set by Poly Create node set by Poly @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem МСЕ (Метод скінченних елементів) - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem МСЕ (Метод скінченних елементів) - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Невірний вибір - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem МСЕ (Метод скінченних елементів) - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem МСЕ (Метод скінченних елементів) - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem МСЕ (Метод скінченних елементів) - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem МСЕ (Метод скінченних елементів) - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Площини - + Sphere Сфера - + Cylinder Циліндр - + Box Коробка @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Товщина [mm] - + Stress [MPa] Plot Y-Axis Label Напруження [MPa] - + Linearized Stresses Plot title Лінійні напруження - + Membrane Plot legend item label Оболонка - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Всього - - - Fem - МСЕ (Метод скінченних елементів) - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Невірний вибір - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - МСЕ (Метод скінченних елементів) - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Будь ласка, оберіть підсумковий об'єкт. - - - - CmdFemPostScalarClipFilter - - - Fem - МСЕ (Метод скінченних елементів) - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Невірний вибір + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + МСЕ (Метод скінченних елементів) + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Будь ласка, оберіть підсумковий об'єкт. + + + + CmdFemPostScalarClipFilter + + + Fem + МСЕ (Метод скінченних елементів) + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + МСЕ (Метод скінченних елементів) + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Розмістити робота - + Edit nodes set Редагувати набір вузлів - + Create nodes set Створити набір вузлів - + Create filter Створити фільтр - + Create function Створити функцію - + Create pipeline from result Create pipeline from result - + Edit Mirror Редагувати дзеркальне зображення @@ -775,22 +775,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Створити функцію площини, яка визначається її початком координат та нормаллю - + Create a sphere function, defined by its center and radius Створити функцію сфери, яка визначається її центром та радіусом - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1016,12 +1016,12 @@ Нижня межа частоти - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1118,12 +1118,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1134,20 +1134,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1384,12 +1384,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1461,83 +1461,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Матеріал - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - Карти, що вбудовані в FreeCAD, будуть показані як наявні. - - - - Use built-in materials - Use built-in materials - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Також перелічені картки з каталогу налаштувань FreeCAD будуть наявні. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Використовувати матеріали з каталогу матеріалів в каталозі налаштувань FreeCAD - - - - Also material cards also from the specified directory -will be listed as available. - Картки матеріалу також з вказаного каталогу -будуть показані як наявні. - - - - Use materials from user defined directory - Use materials from user defined directory - - - - User directory - Каталог користувача - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Повторювані карти будуть видалені зі списку показаних карт матеріалів. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Карти матеріалів будуть сортовані за їх ресурсами (розташуванням). -Якщо прапорець не встановлений, сортуватимуться за назвою. - - - - Sort by resources - Сортування за ресурсами - - FemGui::DlgSettingsFemMystranImp @@ -1576,12 +1499,12 @@ If unchecked, they will be sorted by their name. Записувати коментарі для вхідного файлу - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1690,12 +1613,12 @@ that "MAXKOI" needs to be increased. що «MAXKOI» потрібно збільшити. - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1706,18 +1629,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1741,13 +1664,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Помилка вводу - + You must specify at least one reference Потрібно вказати принаймні одне посилання @@ -1755,7 +1678,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Помилка вводу @@ -1763,7 +1686,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Помилка вводу @@ -1771,7 +1694,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Помилка вводу @@ -1779,7 +1702,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Помилка вводу @@ -1787,13 +1710,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Помилка вводу - + Please specify a force greater than 0 Please specify a force greater than 0 @@ -1801,7 +1724,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Помилка вводу @@ -1809,7 +1732,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Помилка вводу @@ -1817,8 +1740,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Помилка вводу @@ -1826,7 +1749,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Помилка вводу @@ -1834,7 +1757,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Помилка вводу @@ -1842,7 +1765,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Помилка вводу @@ -1850,7 +1773,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Помилка вводу @@ -1858,7 +1781,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Помилка вводу @@ -1866,12 +1789,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Редагувати сітку МСЕ - + Meshing failure Не вдалося побудувати сітку @@ -1879,7 +1802,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Помилка вводу @@ -1895,12 +1818,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Видалити @@ -1908,42 +1831,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Помилка виділення - + Please use only a single reference for bearing constraint Please use only a single reference for bearing constraint - + Only faces can be picked Можливо обрати лише грані - + Only cylindrical faces can be picked Можуть бути обраними лише циліндричні поверхні - + Only planar faces can be picked Можуть бути обрані лише планарні грані - + Only linear edges can be picked Only linear edges can be picked - + Only faces and edges can be picked Only faces and edges can be picked @@ -1952,77 +1875,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Видалити - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Помилка виділення - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! Nothing selected! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! Selected object is not a part! - - + + Only faces can be picked Можливо обрати лише грані - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2030,28 +1953,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2059,28 +1982,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2088,128 +2011,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Невірний вибір - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2217,39 +2140,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Невірний вибір - + Select an edge or a face, please. Select an edge or a face, please. @@ -2257,24 +2180,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Помилка виділення - + Only planar faces can be picked Можуть бути обрані лише планарні грані - + Only linear edges can be picked Only linear edges can be picked - + Only faces and edges can be picked Only faces and edges can be picked @@ -2282,30 +2205,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2313,42 +2236,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Помилка виділення - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only faces can be picked Можливо обрати лише грані - + Only planar faces can be picked Можуть бути обрані лише планарні грані @@ -2356,28 +2279,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only faces can be picked Можливо обрати лише грані @@ -2385,12 +2308,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Діаметр шківу - + Torque [Nm] Крутний момент [Nm] @@ -2398,28 +2321,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! - + Only faces can be picked Можливо обрати лише грані @@ -2427,22 +2350,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Selected object is not a part! Selected object is not a part! @@ -2450,64 +2373,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Помилка виділення - - + + Nothing selected! Nothing selected! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! Selected object is not a part! - + Only faces can be picked Можливо обрати лише грані - + Only cylindrical faces can be picked Можуть бути обраними лише циліндричні поверхні @@ -2515,7 +2438,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName TaskObjectName @@ -2523,7 +2446,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2531,7 +2454,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2539,12 +2462,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Довжина @@ -2553,12 +2476,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2566,7 +2489,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2574,7 +2497,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2582,7 +2505,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2590,7 +2513,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2614,12 +2537,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Не вдалося побудувати сітку - + The FEM module is built without NETGEN support. Meshing will not work!!! The FEM module is built without NETGEN support. Meshing will not work!!! @@ -3591,46 +3514,45 @@ Note: for 2D only setting for x is possible, Вам потрібно створити або активувати аналіз - + Ok Гаразд - + Cancel Скасувати - - - - - - - - + + + + + + + + A dialog is already open in the task panel Діалогове вікно вже відкрито в панелі задач - - - - - - - - + + + + + + + + Do you want to close this dialog? Ви бажаєте закрити це діалогове вікно? - + Meshing Побудова сітки - @@ -3647,22 +3569,22 @@ Note: for 2D only setting for x is possible, Імпорт-експорт - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3702,62 +3624,62 @@ Note: for 2D only setting for x is possible, Групи - + Are you sure you want to continue? Ви впевнені, що бажаєте продовжити? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4095,7 +4017,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Залежності обʼєктів @@ -4715,7 +4637,7 @@ normal vector of the face is used as direction 0 MPa - 0 MPa + 0 МПа @@ -5375,20 +5297,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Помилка: фільтр можна застосувати лише до одного об'єкта. - - - + + + The filter could not be set up. Не вдалося встановити фільтр. - - + + Error: no post processing object selected. Помилка: об'єкт для обробки не обраний. @@ -6103,13 +6025,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem МСЕ (Метод скінченних елементів) - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6155,17 +6077,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem МСЕ (Метод скінченних елементів) - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6173,17 +6095,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem МСЕ (Метод скінченних елементів) - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6191,7 +6113,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6285,17 +6207,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem МСЕ (Метод скінченних елементів) - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_val-ES.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_val-ES.ts index b47613cbf3..0de7453408 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_val-ES.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_val-ES.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem Fem - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem Fem - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem Fem - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem Fem - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem Fem - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem Fem - - Constraint force - Restricció de força + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem Fem - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem Fem - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem Fem - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem Fem - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem Fem - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem Fem - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem Fem - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem Fem - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem Fem - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem Fem - + Nodes set Conjunt de nodes - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection Selecció incorrecta - + Select a single FEM mesh or nodes set, please. Seleccioneu una única malla FEM o un conjunt de nodes. @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem Fem - + Node set by poly Node set by poly - - + + Create node set by Poly Crea un conjunt de nodes per polígons @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem Fem - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem Fem - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection Selecció incorrecta - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem Fem - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem Fem - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem Fem - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem Fem - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane Pla - + Sphere Esfera - + Cylinder Cilindre - + Box Box @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Thickness [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Total - - - Fem - Fem - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - Selecció incorrecta - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - Fem - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - Fem - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + Selecció incorrecta + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + Fem + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + Fem + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + Fem + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror Edit Mirror @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ Límit de baixa freqüència - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - Material - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - Utilitzeu materials integrats - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - Utilitzeu materials del directori definit per l'ususari - - - - User directory - Directori de l'usuari - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error Input error - + You must specify at least one reference Heu d'especificar com a mínim una referència @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error Input error @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error Input error @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error Input error @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error Input error @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error Input error - + Please specify a force greater than 0 Especifiqueu una força superior a 0 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error Input error @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error Input error @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error Input error @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error Input error @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error Input error @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error Input error @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error Input error @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error Input error @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh Edita la malla FEM - + Meshing failure Ha fallat el mallat @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error Input error @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete Elimina @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error Error de selecció - + Please use only a single reference for bearing constraint Utilitzeu només una referència per a restricció de rodament - + Only faces can be picked Únicament es poden seleccionar cares - + Only cylindrical faces can be picked Únicament es poden seleccionar cares cilíndriques - + Only planar faces can be picked Únicament es poden seleccionar cares planes - + Only linear edges can be picked Únicament es poden seleccionar arestes rectes - + Only faces and edges can be picked Únicament es poden seleccionar arestes i cares @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete Elimina - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error Error de selecció - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! No s'ha seleccionat cap element. - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! L'objecte seleccionat no és una peça. - - + + Only faces can be picked Únicament es poden seleccionar cares - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection Selecció incorrecta - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection Selecció incorrecta - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error Error de selecció - + Only planar faces can be picked Únicament es poden seleccionar cares planes - + Only linear edges can be picked Únicament es poden seleccionar arestes rectes - + Only faces and edges can be picked Únicament es poden seleccionar arestes i cares @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error Error de selecció - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only faces can be picked Únicament es poden seleccionar cares - + Only planar faces can be picked Únicament es poden seleccionar cares planes @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only faces can be picked Únicament es poden seleccionar cares @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter Diàmetre de la politja - + Torque [Nm] Parell [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only faces can be picked Únicament es poden seleccionar cares @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Selected object is not a part! L'objecte seleccionat no és una peça. @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error Error de selecció - - + + Nothing selected! No s'ha seleccionat cap element. - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! L'objecte seleccionat no és una peça. - + Only faces can be picked Únicament es poden seleccionar cares - + Only cylindrical faces can be picked Únicament es poden seleccionar cares cilíndriques @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName Nom de l'objecte Tasca @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label Longitud @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure Ha fallat el mallat - + The FEM module is built without NETGEN support. Meshing will not work!!! El mòdul MEF està compilat sense el suport de NETGEN. El mallat no funcionarà!!! @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, Heu de crear o activar una anàlisi - + Ok D'acord - + Cancel Cancel·la - - - - - - - - + + + + + + + + A dialog is already open in the task panel A dialog is already open in the task panel - - - - - - - - + + + + + + + + Do you want to close this dialog? Do you want to close this dialog? - + Meshing Mallat - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Importació-exportació - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, Grups - + Are you sure you want to continue? Are you sure you want to continue? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies Dependències de l'objecte @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem Fem - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem Fem - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem Fem - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem Fem - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_zh-CN.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_zh-CN.ts index a639048ecf..23a9d16dd9 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_zh-CN.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_zh-CN.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem 有限元 - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem 有限元 - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem 有限元 - - Constraint displacement - 位移约束 + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem 有限元 - - Constraint fixed - 固定约束 + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem 有限元 - + Fluid boundary condition 流体边界条件 - + Create fluid boundary condition on face entity for Computional Fluid Dynamics 为计算流体力学在面实体上创建流体边界条件 @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem 有限元 - - Constraint force - 力约束 + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem 有限元 - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem 有限元 - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem 有限元 - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem 有限元 - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem 有限元 - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem 有限元 - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem 有限元 - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem 有限元 - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem 有限元 - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem 有限元 - + Nodes set 节点集 - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection 选择错误 - + Select a single FEM mesh or nodes set, please. 请选取一个有限元格或节点集。 @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem 有限元 - + Node set by poly Node set by poly - - + + Create node set by Poly 藉由多边形建立节点集 @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem 有限元 - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem 有限元 - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection 选择错误 - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem 有限元 - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem 有限元 - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem 有限元 - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem 有限元 - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane 平面 - + Sphere 球体 - + Cylinder 圆柱体 - + Box 立方体 @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label 厚度 [mm] - + Stress [MPa] Plot Y-Axis Label 压强 [MPa] - + Linearized Stresses Plot title 线性压强 - + Membrane Plot legend item label 薄膜 - + Membrane and Bending Plot legend item label 薄膜和弯曲 - + Total Plot legend item label 总计 - - - Fem - 有限元 - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - 选择错误 - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - 有限元 - - - - Post pipeline from result - 从结果创建后处理管线 - - - - Creates a post processing pipeline from a result object - 从结果对象创建后处理管线 - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - 请选择一个结果对象。 - - - - CmdFemPostScalarClipFilter - - - Fem - 有限元 - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + 选择错误 + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + 有限元 + + + + Post pipeline from result + 从结果创建后处理管线 + + + + Creates a post processing pipeline from a result object + 从结果对象创建后处理管线 + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + 请选择一个结果对象。 + + + + CmdFemPostScalarClipFilter + + + Fem + 有限元 + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + 有限元 + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot 放置机器人 - + Edit nodes set 编辑节点集 - + Create nodes set 创建节点集 - + Create filter 创建筛选器 - + Create function 创建函数 - + Create pipeline from result Create pipeline from result - + Edit Mirror 编辑镜像 @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal 创建一个平面函数，由其原点和法线定义 - + Create a sphere function, defined by its center and radius 创建一个球形函数，由其球心和半径定义 - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ 低频限制 - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container 当为空白时使用默认的 Gmsh 二进制文件 - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD 结果对象 - - FemGui::DlgSettingsFemMaterialImp - - - Material - 材质 - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - 使用内置的材料 - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - 使用用户自定义目录内的材质 - - - - User directory - 用户目录 - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - 按资源排序 - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. 将注释写入到输入文件 - + File does not exist File does not exist - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist File does not exist - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file Wrong file - + You must specify the path to the z88r.exe! You must specify the path to the z88r.exe! - + You must specify the path to the z88r! You must specify the path to the z88r! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error 输入错误 - + You must specify at least one reference 您必须至少指定一个参考 @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error 输入错误 @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error 输入错误 @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error 输入错误 @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error 输入错误 @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error 输入错误 - + Please specify a force greater than 0 请指定一个大于 0 的力 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error 输入错误 @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error 输入错误 @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error 输入错误 @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error 输入错误 @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error 输入错误 @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error 输入错误 @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error 输入错误 @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error 输入错误 @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh 编辑有限元网格 - + Meshing failure 网格生成失败 @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error 输入错误 @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete 删除 @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error 选择错误 - + Please use only a single reference for bearing constraint 请对轴承约束仅用单一参考 - + Only faces can be picked 仅可以选取面 - + Only cylindrical faces can be picked 反可以选取圆柱面 - + Only planar faces can be picked 仅可以选取平面 - + Only linear edges can be picked 仅可选取直线边缘 - + Only faces and edges can be picked 仅可以选取面和边 @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete 删除 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error 选择错误 - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! 未选择任何内容 ！ - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! 所选之物件并非零件! - - + + Only faces can be picked 仅可以选取面 - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] 长度比例[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection 选择错误 - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection 选择错误 - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error 选择错误 - + Only planar faces can be picked 仅可以选取平面 - + Only linear edges can be picked 仅可选取直线边缘 - + Only faces and edges can be picked 仅可以选取面和边 @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error 选择错误 - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! - + Only faces can be picked 仅可以选取面 - + Only planar faces can be picked 仅可以选取平面 @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! - + Only faces can be picked 仅可以选取面 @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter 带轮直径 - + Torque [Nm] 扭矩 [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! - + Only faces can be picked 仅可以选取面 @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Selected object is not a part! 所选之物件并非零件! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error 选择错误 - - + + Nothing selected! 未选择任何内容 ！ - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! 所选之物件并非零件! - + Only faces can be picked 仅可以选取面 - + Only cylindrical faces can be picked 反可以选取圆柱面 @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName 任务物件名称 @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label 长度 @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 at (%2; %3; %4) is: %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function 隐函数 @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure 网格生成失败 - + The FEM module is built without NETGEN support. Meshing will not work!!! 有限元模块并未支持NETGEN，无法执行网格化！！！ @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, 您需要创建或激活一个分析 - + Ok 确认 - + Cancel 取消 - - - - - - - - + + + + + + + + A dialog is already open in the task panel 一个对话框已在任务面板打开 - - - - - - - - + + + + + + + + Do you want to close this dialog? 您要关闭此对话框吗? - + Meshing 建立网格 - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, Import-Export - + Constraint initial temperature 约束初始温度 - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, 组 - + Are you sure you want to continue? 您确定要继续吗？ - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition 流体边界条件 - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies 对象依赖关系 @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. 错误：未选取后处理对象。 @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem 有限元 - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem 有限元 - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem 有限元 - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem 有限元 - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_zh-TW.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_zh-TW.ts index 05a3c2d61b..6c26d5dd06 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_zh-TW.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_zh-TW.ts @@ -4,17 +4,17 @@ CmdFemConstraintBearing - + Fem 有限元素法 - + Bearing constraint Bearing constraint - + Creates a bearing constraint Creates a bearing constraint @@ -22,17 +22,17 @@ CmdFemConstraintContact - + Fem 有限元素法 - + Contact constraint Contact constraint - + Creates a contact constraint between faces Creates a contact constraint between faces @@ -40,17 +40,17 @@ CmdFemConstraintDisplacement - + Fem 有限元素法 - - Constraint displacement - Constraint displacement + + Displacement boundary condition + Displacement boundary condition - + Creates a displacement boundary condition for a geometric entity Creates a displacement boundary condition for a geometric entity @@ -58,17 +58,17 @@ CmdFemConstraintFixed - + Fem 有限元素法 - - Constraint fixed - Constraint fixed + + Fixed boundary condition + Fixed boundary condition - + Creates a fixed boundary condition for a geometric entity Creates a fixed boundary condition for a geometric entity @@ -76,17 +76,17 @@ CmdFemConstraintFluidBoundary - + Fem 有限元素法 - + Fluid boundary condition Fluid boundary condition - + Create fluid boundary condition on face entity for Computional Fluid Dynamics Create fluid boundary condition on face entity for Computional Fluid Dynamics @@ -94,17 +94,17 @@ CmdFemConstraintForce - + Fem 有限元素法 - - Constraint force - 力量拘束 + + Force load + Force load - + Creates a force load applied to a geometric entity Creates a force load applied to a geometric entity @@ -112,17 +112,17 @@ CmdFemConstraintGear - + Fem 有限元素法 - + Gear constraint Gear constraint - + Creates a gear constraint Creates a gear constraint @@ -130,17 +130,17 @@ CmdFemConstraintHeatflux - + Fem 有限元素法 - + Heat flux load Heat flux load - + Creates a heat flux load acting on a face Creates a heat flux load acting on a face @@ -148,17 +148,17 @@ CmdFemConstraintInitialTemperature - + Fem 有限元素法 - + Initial temperature Initial temperature - + Creates an initial temperature acting on a body Creates an initial temperature acting on a body @@ -166,17 +166,17 @@ CmdFemConstraintPlaneRotation - + Fem 有限元素法 - + Plane multi-point constraint Plane multi-point constraint - + Creates a plane multi-point constraint for a face Creates a plane multi-point constraint for a face @@ -184,17 +184,17 @@ CmdFemConstraintPressure - + Fem 有限元素法 - - Constraint pressure - Constraint pressure + + Pressure load + Pressure load - + Creates a pressure load acting on a face Creates a pressure load acting on a face @@ -202,17 +202,17 @@ CmdFemConstraintPulley - + Fem 有限元素法 - + Pulley constraint Pulley constraint - + Creates a pulley constraint Creates a pulley constraint @@ -220,17 +220,17 @@ CmdFemConstraintSpring - + Fem 有限元素法 - + Spring Spring - + Creates a spring acting on a face Creates a spring acting on a face @@ -238,17 +238,17 @@ CmdFemConstraintTemperature - + Fem 有限元素法 - - Constraint temperature - Constraint temperature + + Temperature boundary condition + Temperature boundary condition - + Creates a temperature/concentrated heat flux load acting on a face Creates a temperature/concentrated heat flux load acting on a face @@ -256,17 +256,17 @@ CmdFemConstraintTransform - + Fem 有限元素法 - - Constraint transform - Constraint transform + + Local coordinate system + Local coordinate system - + Create a local coordinate system on a face Create a local coordinate system on a face @@ -274,27 +274,27 @@ CmdFemCreateNodesSet - + Fem 有限元素法 - + Nodes set 節點組 - + Creates a FEM mesh nodes set Creates a FEM mesh nodes set - + Wrong selection 錯誤的選取 - + Select a single FEM mesh or nodes set, please. 請選取一個FEM網格或節點組 @@ -302,18 +302,18 @@ CmdFemDefineNodesSet - + Fem 有限元素法 - + Node set by poly Node set by poly - - + + Create node set by Poly 藉由多邊形建立節點組 @@ -321,17 +321,17 @@ CmdFemPostApllyChanges - + Fem 有限元素法 - + Apply changes to pipeline Apply changes to pipeline - + Apply changes to parameters directly and not on recompute only... Apply changes to parameters directly and not on recompute only... @@ -339,27 +339,27 @@ CmdFemPostClipFilter - + Fem 有限元素法 - + Region clip filter Region clip filter - + Define/create a clip filter which uses functions to define the clipped region Define/create a clip filter which uses functions to define the clipped region - + Wrong selection 錯誤的選取 - + Select a pipeline, please. Select a pipeline, please. @@ -367,17 +367,17 @@ CmdFemPostCutFilter - + Fem 有限元素法 - + Function cut filter Function cut filter - + Cut the data along an implicit function Cut the data along an implicit function @@ -385,17 +385,17 @@ CmdFemPostDataAlongLineFilter - + Fem 有限元素法 - + Line clip filter Line clip filter - + Define/create a clip filter which clips a field along a line Define/create a clip filter which clips a field along a line @@ -403,17 +403,17 @@ CmdFemPostDataAtPointFilter - + Fem 有限元素法 - + Data at point clip filter Data at point clip filter - + Define/create a clip filter which clips a field data at point Define/create a clip filter which clips a field data at point @@ -421,37 +421,37 @@ CmdFemPostFunctions - + Fem 有限元素法 - + Filter functions Filter functions - + Functions for use in postprocessing filter... Functions for use in postprocessing filter... - + Plane 平面 - + Sphere 球體 - + Cylinder 圓柱 - + Box 框 @@ -459,117 +459,41 @@ CmdFemPostLinearizedStressesFilter - + Thickness [mm] Plot X-Axis Label Thickness [mm] - + Stress [MPa] Plot Y-Axis Label Stress [MPa] - + Linearized Stresses Plot title Linearized Stresses - + Membrane Plot legend item label Membrane - + Membrane and Bending Plot legend item label Membrane and Bending - + Total Plot legend item label Total - - - Fem - 有限元素法 - - - - Stress linearization plot - Stress linearization plot - - - - Define/create stress linearization plots - Define/create stress linearization plots - - - - - Wrong selection - 錯誤的選取 - - - - - Select a Clip filter which clips a STRESS field along a line, please. - Select a Clip filter which clips a STRESS field along a line, please. - - - - CmdFemPostPipelineFromResult - - - Fem - 有限元素法 - - - - Post pipeline from result - Post pipeline from result - - - - Creates a post processing pipeline from a result object - Creates a post processing pipeline from a result object - - - - Wrong selection type - Wrong selection type - - - - Select a result object, please. - Select a result object, please. - - - - CmdFemPostScalarClipFilter - - - Fem - 有限元素法 - - - - Scalar clip filter - Scalar clip filter - - - - Define/create a clip filter which clips a field with a scalar value - Define/create a clip filter which clips a field with a scalar value - - - - CmdFemPostWarpVectorFilter Fem @@ -577,11 +501,87 @@ + Stress linearization plot + Stress linearization plot + + + + Define/create stress linearization plots + Define/create stress linearization plots + + + + + Wrong selection + 錯誤的選取 + + + + + Select a Clip filter which clips a STRESS field along a line, please. + Select a Clip filter which clips a STRESS field along a line, please. + + + + CmdFemPostPipelineFromResult + + + Fem + 有限元素法 + + + + Post pipeline from result + Post pipeline from result + + + + Creates a post processing pipeline from a result object + Creates a post processing pipeline from a result object + + + + Wrong selection type + Wrong selection type + + + + Select a result object, please. + Select a result object, please. + + + + CmdFemPostScalarClipFilter + + + Fem + 有限元素法 + + + + Scalar clip filter + Scalar clip filter + + + + Define/create a clip filter which clips a field with a scalar value + Define/create a clip filter which clips a field with a scalar value + + + + CmdFemPostWarpVectorFilter + + + Fem + 有限元素法 + + + Warp filter Warp filter - + Warp the geometry along a vector field by a certain factor Warp the geometry along a vector field by a certain factor @@ -589,112 +589,112 @@ Command - + Create fluid boundary condition Create fluid boundary condition - + Make bearing constraint Make bearing constraint - + Make contact constraint on a face Make contact constraint on a face - + Make displacement boundary condition on face Make displacement boundary condition on face - + Make fixed boundary condition for geometry Make fixed boundary condition for geometry - + Make force load on geometry Make force load on geometry - + Make gear constraint Make gear constraint - + Make heat flux load on face Make heat flux load on face - + Make initial temperature condition on body Make initial temperature condition on body - + Make plane multi-point constraint on face Make plane multi-point constraint on face - + Make pressure load on face Make pressure load on face - + Make spring on face Make spring on face - + Make pulley constraint Make pulley constraint - + Make temperature boundary condition on face Make temperature boundary condition on face - + Make local coordinate system on face Make local coordinate system on face - + Place robot Place robot - + Edit nodes set Edit nodes set - + Create nodes set Create nodes set - + Create filter Create filter - + Create function Create function - + Create pipeline from result Create pipeline from result - + Edit Mirror 編輯鏡像 @@ -776,22 +776,22 @@ FEM_PostCreateFunctions - + Create a plane function, defined by its origin and normal Create a plane function, defined by its origin and normal - + Create a sphere function, defined by its center and radius Create a sphere function, defined by its center and radius - + Create a cylinder function, defined by its center, axis and radius Create a cylinder function, defined by its center, axis and radius - + Create a box function, defined by its center, length, width and height Create a box function, defined by its center, length, width and height @@ -1017,12 +1017,12 @@ 低頻限制 - + File does not exist 檔案不存在 - + The specified executable '%1' does not exist! @@ -1119,12 +1119,12 @@ will be merged to make the volume boundaries invisible. <html><head/><body><p><span style=" font-weight:600;">Note:</span> It is recommended to use an even number of cores to benefit from mesh symmetries. (Using 8 cores can be faster than 9 cores.)<br/><span style=" font-weight:600;">Note too:</span> In extreme cases ElmerSolver might not converge if the core number is too high.</p></body></html> - + File does not exist 檔案不存在 - + The specified executable '%1' does not exist! @@ -1135,20 +1135,20 @@ Specify another file please. Specify another file please. - - + + FEM Elmer: Not suitable for multithreading FEM Elmer: Not suitable for multithreading - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi.exe' is required. - + Wrong Elmer setting: You use more than one CPU core. Therefore an executable with the suffix '_mpi' is required. Wrong Elmer setting: You use more than one CPU core. @@ -1385,12 +1385,12 @@ adding an analysis container Leave blank to use default gmsh binary file - + File does not exist 檔案不存在 - + The specified executable '%1' does not exist! @@ -1462,83 +1462,6 @@ exported from FreeCAD. FreeCAD result object - - FemGui::DlgSettingsFemMaterialImp - - - Material - 材質 - - - - Card resources - Card resources - - - - The cards built-in to FreeCAD will be listed as available. - The cards built-in to FreeCAD will be listed as available. - - - - Use built-in materials - 使用內建材質 - - - - Also cards from FreeCAD's preferences directory will be listed as available. - Also cards from FreeCAD's preferences directory will be listed as available. - - - - Use materials from Materials directory in user's FreeCAD preference directory - Use materials from Materials directory in user's FreeCAD preference directory - - - - Also material cards also from the specified directory -will be listed as available. - Also material cards also from the specified directory -will be listed as available. - - - - Use materials from user defined directory - 使用來自使用者自訂目錄內之材質 - - - - User directory - 使用者目錄 - - - - Card sorting and duplicates - Card sorting and duplicates - - - - Duplicate cards will be deleted from the displayed material card list. - Duplicate cards will be deleted from the displayed material card list. - - - - Delete card duplicates - Delete card duplicates - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - Sort by resources - Sort by resources - - FemGui::DlgSettingsFemMystranImp @@ -1577,12 +1500,12 @@ If unchecked, they will be sorted by their name. Write comments to input file - + File does not exist 檔案不存在 - + The specified executable '%1' does not exist! @@ -1689,12 +1612,12 @@ iterative solver and you get the error message that "MAXKOI" needs to be increased. - + File does not exist 檔案不存在 - + The specified z88r executable '%1' does not exist! @@ -1705,18 +1628,18 @@ Specify another file please. Specify another file please. - - + + Wrong file 錯誤檔案 - + You must specify the path to the z88r.exe! 你必須指定 z88r.exe 的路徑! - + You must specify the path to the z88r! 你必須指定 z88r 的路徑! @@ -1740,13 +1663,13 @@ Specify another file please. FemGui::TaskDlgFemConstraint - - + + Input error 輸入錯誤 - + You must specify at least one reference 您必須至少指定一個參考 @@ -1754,7 +1677,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintBearing - + Input error 輸入錯誤 @@ -1762,7 +1685,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintContact - + Input error 輸入錯誤 @@ -1770,7 +1693,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintDisplacement - + Input error 輸入錯誤 @@ -1778,7 +1701,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintFluidBoundary - + Input error 輸入錯誤 @@ -1786,13 +1709,13 @@ Specify another file please. FemGui::TaskDlgFemConstraintForce - - + + Input error 輸入錯誤 - + Please specify a force greater than 0 請指定一個大於 0 的力 @@ -1800,7 +1723,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintGear - + Input error 輸入錯誤 @@ -1808,7 +1731,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintHeatflux - + Input error 輸入錯誤 @@ -1816,8 +1739,8 @@ Specify another file please. FemGui::TaskDlgFemConstraintInitialTemperature - - + + Input error 輸入錯誤 @@ -1825,7 +1748,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPressure - + Input error 輸入錯誤 @@ -1833,7 +1756,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintPulley - + Input error 輸入錯誤 @@ -1841,7 +1764,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintSpring - + Input error 輸入錯誤 @@ -1849,7 +1772,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTemperature - + Input error 輸入錯誤 @@ -1857,7 +1780,7 @@ Specify another file please. FemGui::TaskDlgFemConstraintTransform - + Input error 輸入錯誤 @@ -1865,12 +1788,12 @@ Specify another file please. FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh 編輯FEM網格 - + Meshing failure 網格產生失敗 @@ -1878,7 +1801,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error 輸入錯誤 @@ -1894,12 +1817,12 @@ Specify another file please. FemGui::TaskFemConstraint - + Analysis feature parameters Analysis feature parameters - + Delete 刪除 @@ -1907,42 +1830,42 @@ Specify another file please. FemGui::TaskFemConstraintBearing - - - - - - + + + + + + Selection error 選取錯誤 - + Please use only a single reference for bearing constraint 請對軸承拘束僅用單一個參考 - + Only faces can be picked 僅可以選取面 - + Only cylindrical faces can be picked 僅可以選取圓柱面 - + Only planar faces can be picked 僅可以選取平面 - + Only linear edges can be picked 僅可以選取線性之邊 - + Only faces and edges can be picked 僅可以選取面和邊 @@ -1951,77 +1874,77 @@ Specify another file please. FemGui::TaskFemConstraintContact - + Delete 刪除 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Selection error 選取錯誤 - + Only one face in object! - moved to master face Only one face in object! - moved to master face - - + + Only one master face and one slave face for a contact constraint! Only one master face and one slave face for a contact constraint! - - - - + + + + Nothing selected! 尚未選取 ! - + Only one slave face for a contact constraint! Only one slave face for a contact constraint! - - - - + + + + Selected object is not a part! 所選之物件並非零件 ! - - + + Only faces can be picked 僅可以選取面 - + Only one master for a contact constraint! Only one master for a contact constraint! - + Only one master face for a contact constraint! Only one master face for a contact constraint! @@ -2029,28 +1952,28 @@ Specify another file please. FemGui::TaskFemConstraintDisplacement - - - - - + + + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! - + Only one type of selection (vertex,face or edge) per analysis feature allowed! Only one type of selection (vertex,face or edge) per analysis feature allowed! @@ -2058,28 +1981,28 @@ Specify another file please. FemGui::TaskFemConstraintFixed - - - - - + + + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2087,128 +2010,128 @@ Specify another file please. FemGui::TaskFemConstraintFluidBoundary - + Basic Basic - + Turbulence Turbulence - + Thermal Thermal - + select boundary type, faces and set value select boundary type, faces and set value - + Intensity [0~1] Intensity [0~1] - + Dissipation Rate [m2/s3] Dissipation Rate [m2/s3] - + Length Scale[m] Length Scale[m] - + Viscosity Ratio [1] Viscosity Ratio [1] - + Hydraulic Diameter [m] Hydraulic Diameter [m] - - + + Gradient [K/m] Gradient [K/m] - + Flux [W/m2] Flux [W/m2] - + Empty selection Empty selection - + Select an edge or a face, please. Select an edge or a face, please. - - - - - + + + + + Wrong selection 錯誤的選取 - + Selected object is not a part object! Selected object is not a part object! - + Only one planar face or edge can be selected! Only one planar face or edge can be selected! - + Only planar faces can be picked for 3D Only planar faces can be picked for 3D - + Only planar edges can be picked for 2D Only planar edges can be picked for 2D - + Only faces for 3D part or edges for 2D can be picked Only faces for 3D part or edges for 2D can be picked - - + - - + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! @@ -2216,39 +2139,39 @@ Specify another file please. FemGui::TaskFemConstraintForce - - - - + + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! - + Only one type of selection (vertex, face or edge) per analysis feature allowed! Only one type of selection (vertex, face or edge) per analysis feature allowed! - - + + Wrong selection 錯誤的選取 - + Select an edge or a face, please. Select an edge or a face, please. @@ -2256,24 +2179,24 @@ Specify another file please. FemGui::TaskFemConstraintGear - - - + + + Selection error 選取錯誤 - + Only planar faces can be picked 僅可以選取平面 - + Only linear edges can be picked 僅可以選取線性之邊 - + Only faces and edges can be picked 僅可以選取面和邊 @@ -2281,30 +2204,30 @@ Specify another file please. FemGui::TaskFemConstraintHeatflux - - - - - + + + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! - - + + Selection must only consist of faces! Selection must only consist of faces! @@ -2312,42 +2235,42 @@ Specify another file please. FemGui::TaskFemConstraintPlaneRotation - - - - - - - - + + + + + + + + Selection error 選取錯誤 - - + + Only one face can be selected for a plane multi-point constraint! Only one face can be selected for a plane multi-point constraint! - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! - + Only faces can be picked 僅可以選取面 - + Only planar faces can be picked 僅可以選取平面 @@ -2355,28 +2278,28 @@ Specify another file please. FemGui::TaskFemConstraintPressure - - + - - + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! - + Only faces can be picked 僅可以選取面 @@ -2384,12 +2307,12 @@ Specify another file please. FemGui::TaskFemConstraintPulley - + Pulley diameter 滑輪直徑 - + Torque [Nm] 力矩 [Nm] @@ -2397,28 +2320,28 @@ Specify another file please. FemGui::TaskFemConstraintSpring - - - - - + + + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! - + Only faces can be picked 僅可以選取面 @@ -2426,22 +2349,22 @@ Specify another file please. FemGui::TaskFemConstraintTemperature - - - - + + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Selected object is not a part! 所選之物件並非零件 ! @@ -2449,64 +2372,64 @@ Specify another file please. FemGui::TaskFemConstraintTransform - + Analysis feature update error Analysis feature update error - + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! - - - - - - - - - - + + + + + + + + + + Selection error 選取錯誤 - - + + Nothing selected! 尚未選取 ! - - + + Only one face for rectangular local coordinate system! Only one face for rectangular local coordinate system! - + Only one face for local coordinate system! Only one face for local coordinate system! - + Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface Only transformable faces can be selected! Apply displacement boundary condition to surface first then apply local coordinate system to surface - - + + Selected object is not a part! 所選之物件並非零件 ! - + Only faces can be picked 僅可以選取面 - + Only cylindrical faces can be picked 僅可以選取圓柱面 @@ -2514,7 +2437,7 @@ Specify another file please. FemGui::TaskObjectName - + TaskObjectName 任務物件名稱 @@ -2522,7 +2445,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function Clip region, choose implicit function @@ -2530,7 +2453,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function Function cut, choose implicit function @@ -2538,12 +2461,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options Data along a line options - + Length X-Axis plot label 間距 @@ -2552,12 +2475,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options Data at point options - + %1 at (%2; %3; %4) is: %5 %6 %1 在 (%2; %3; %4) 是： %5 %6 @@ -2565,7 +2488,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options Result display options @@ -2573,7 +2496,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function Implicit function @@ -2581,7 +2504,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options Scalar clip options @@ -2589,7 +2512,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options Warp options @@ -2613,12 +2536,12 @@ Specify another file please. FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure 網格產生失敗 - + The FEM module is built without NETGEN support. Meshing will not work!!! FEM模組並未支援NETGEN，無法執行網格化！！！ @@ -3590,46 +3513,45 @@ Note: for 2D only setting for x is possible, 您需要建立或啟動一個分析 - + Ok 確認 - + Cancel 取消 - - - - - - - - + + + + + + + + A dialog is already open in the task panel 於工作面板已開啟對話窗 - - - - - - - - + + + + + + + + Do you want to close this dialog? 您確定要關閉此對話窗嗎? - + Meshing 建立網格 - @@ -3646,22 +3568,22 @@ Note: for 2D only setting for x is possible, 匯入-匯出 - + Constraint initial temperature Constraint initial temperature - + Constraint pulley Constraint pulley - + Constraint spring Constraint spring - + Edit post processing object Edit post processing object @@ -3701,62 +3623,62 @@ Note: for 2D only setting for x is possible, 群組 - + Are you sure you want to continue? 您確定要繼續嗎? - + Contact constraint Contact constraint - + Displacement boundary condition Displacement boundary condition - + Fixed boundary condition Fixed boundary condition - + Fluid boundary condition Fluid boundary condition - + Force load Force load - + Heat flux load Heat flux load - + Plane multi-point constraint Plane multi-point constraint - + Pressure load Pressure load - + Temperature boundary condition Temperature boundary condition - + Local coordinate system Local coordinate system - + Edit analysis feature Edit analysis feature @@ -4094,7 +4016,7 @@ For possible variables, see the description box below. Std_Delete - + Object dependencies 物件相依 @@ -5374,20 +5296,20 @@ used for the Elmer solver setupFilter - + Error: A filter can only be applied to a single object. Error: A filter can only be applied to a single object. - - - + + + The filter could not be set up. The filter could not be set up. - - + + Error: no post processing object selected. Error: no post processing object selected. @@ -6102,13 +6024,13 @@ Please select a result type first. CmdFemCompEmConstraints - + Fem 有限元素法 - - + + Electromagnetic boundary conditions Electromagnetic boundary conditions @@ -6154,17 +6076,17 @@ Please select a result type first. CmdFemCompEmEquations - + Fem 有限元素法 - + Electromagnetic equations Electromagnetic equations - + Electromagnetic equations for the Elmer solver Electromagnetic equations for the Elmer solver @@ -6172,17 +6094,17 @@ Please select a result type first. CmdFemPostContoursFilter - + Fem 有限元素法 - + Contours filter Contours filter - + Define/create a contours filter which displays iso contours Define/create a contours filter which displays iso contours @@ -6190,7 +6112,7 @@ Please select a result type first. FemGui::TaskPostContours - + Contours filter options Contours filter options @@ -6284,17 +6206,17 @@ Please select a result type first. CmdFemCompMechEquations - + Fem 有限元素法 - + Mechanical equations Mechanical equations - + Mechanical equations for the Elmer solver Mechanical equations for the Elmer solver diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index 6d98e7e9e3..344ace35e0 100644 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -324,7 +324,6 @@ Gui::MenuItem* Workbench::setupMenuBar() const root->insertItem(item, solve); solve->setCommand("&Solve"); *solve << "FEM_SolverCalculixCxxtools" - << "FEM_SolverCalculiX" << "FEM_SolverElmer" << "FEM_SolverMystran" << "FEM_SolverZ88" diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp index a5ad694a30..57ce0be34a 100644 --- a/src/Mod/Import/App/AppImportPy.cpp +++ b/src/Mod/Import/App/AppImportPy.cpp @@ -25,22 +25,15 @@ #define WNT // avoid conflict with GUID #endif #ifndef _PreComp_ +#include +#include #include #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wextra-semi" #endif -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -74,27 +67,15 @@ #include "ImportOCAF2.h" #include "ReaderGltf.h" +#include "ReaderIges.h" +#include "ReaderStep.h" #include "WriterGltf.h" +#include "WriterIges.h" +#include "WriterStep.h" namespace Import { -class ImportOCAFExt: public Import::ImportOCAF2 -{ -public: - ImportOCAFExt(Handle(TDocStd_Document) hStdDoc, App::Document* doc, const std::string& name) - : ImportOCAF2(hStdDoc, doc, name) - {} - - std::map> partColors; - -private: - void applyFaceColors(Part::Feature* part, const std::vector& colors) override - { - partColors[part] = colors; - } -}; - class Module: public Py::ExtensionModule { public: @@ -131,7 +112,7 @@ public: private: Py::Object importer(const Py::Tuple& args, const Py::Dict& kwds) { - char* Name; + char* Name = nullptr; char* DocName = nullptr; PyObject* importHidden = Py_None; PyObject* merge = Py_None; @@ -158,7 +139,6 @@ private: std::string Utf8Name = std::string(Name); PyMem_Free(Name); - std::string name8bit = Part::encodeFilename(Utf8Name); try { Base::FileInfo file(Utf8Name.c_str()); @@ -177,25 +157,8 @@ private: if (file.hasExtension({"stp", "step"})) { try { - STEPCAFControl_Reader aReader; - aReader.SetColorMode(true); - aReader.SetNameMode(true); - aReader.SetLayerMode(true); - if (aReader.ReadFile((Standard_CString)(name8bit.c_str())) - != IFSelect_RetDone) { - throw Py::Exception(PyExc_IOError, "cannot read STEP file"); - } - -#if OCC_VERSION_HEX < 0x070500 - Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); - aReader.Reader().WS()->MapReader()->SetProgress(pi); - pi->NewScope(100, "Reading STEP file..."); - pi->Show(); -#endif - aReader.Transfer(hDoc); -#if OCC_VERSION_HEX < 0x070500 - pi->EndScope(); -#endif + Import::ReaderStep reader(file); + reader.read(hDoc); } catch (OSD_Exception& e) { Base::Console().Error("%s\n", e.GetMessageString()); @@ -206,40 +169,9 @@ private: } } else if (file.hasExtension({"igs", "iges"})) { - Base::Reference hGrp = App::GetApplication() - .GetUserParameter() - .GetGroup("BaseApp") - ->GetGroup("Preferences") - ->GetGroup("Mod/Part") - ->GetGroup("IGES"); - try { - IGESControl_Controller::Init(); - IGESCAFControl_Reader aReader; - // http://www.opencascade.org/org/forum/thread_20603/?forum=3 - aReader.SetReadVisible( - hGrp->GetBool("SkipBlankEntities", true) ? Standard_True : Standard_False); - aReader.SetColorMode(true); - aReader.SetNameMode(true); - aReader.SetLayerMode(true); - if (aReader.ReadFile((Standard_CString)(name8bit.c_str())) - != IFSelect_RetDone) { - throw Py::Exception(PyExc_IOError, "cannot read IGES file"); - } - -#if OCC_VERSION_HEX < 0x070500 - Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); - aReader.WS()->MapReader()->SetProgress(pi); - pi->NewScope(100, "Reading IGES file..."); - pi->Show(); -#endif - aReader.Transfer(hDoc); -#if OCC_VERSION_HEX < 0x070500 - pi->EndScope(); -#endif - // http://opencascade.blogspot.de/2009/03/unnoticeable-memory-leaks-part-2.html - Handle(IGESToBRep_Actor)::DownCast(aReader.WS()->TransferReader()->Actor()) - ->SetModel(new IGESData_IGESModel); + Import::ReaderIges reader(file); + reader.read(hDoc); } catch (OSD_Exception& e) { Base::Console().Error("%s\n", e.GetMessageString()); @@ -288,7 +220,7 @@ private: list.append(tuple); } - return list; + return list; // NOLINT } } catch (Standard_Failure& e) { @@ -303,11 +235,11 @@ private: } Py::Object exporter(const Py::Tuple& args, const Py::Dict& kwds) { - PyObject* object; - char* Name; - PyObject* exportHidden = Py_None; - PyObject* legacy = Py_None; - PyObject* keepPlacement = Py_None; + PyObject* object = nullptr; + char* Name = nullptr; + PyObject* pyexportHidden = Py_None; + PyObject* pylegacy = Py_None; + PyObject* pykeepPlacement = Py_None; static const std::array kwd_list {"obj", "name", "exportHidden", @@ -322,123 +254,99 @@ private: "utf-8", &Name, &PyBool_Type, - &exportHidden, + &pyexportHidden, &PyBool_Type, - &legacy, + &pylegacy, &PyBool_Type, - &keepPlacement)) { + &pykeepPlacement)) { throw Py::Exception(); } std::string Utf8Name = std::string(Name); PyMem_Free(Name); - std::string name8bit = Part::encodeFilename(Utf8Name); + + // clang-format off + // determine export options + Part::OCAF::ImportExportSettings settings; + + bool legacyExport = (pylegacy == Py_None ? settings.getExportLegacy() + : Base::asBoolean(pylegacy)); + bool exportHidden = (pyexportHidden == Py_None ? settings.getExportHiddenObject() + : Base::asBoolean(pyexportHidden)); + bool keepPlacement = (pykeepPlacement == Py_None ? settings.getExportKeepPlacement() + : Base::asBoolean(pykeepPlacement)); + // clang-format on try { Py::Sequence list(object); + std::vector objs; + std::map> partColor; + for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { + PyObject* item = (*it).ptr(); + if (PyObject_TypeCheck(item, &(App::DocumentObjectPy::Type))) { + auto pydoc = static_cast(item); + objs.push_back(pydoc->getDocumentObjectPtr()); + } + else if (PyTuple_Check(item) && PyTuple_Size(item) == 2) { + Py::Tuple tuple(*it); + Py::Object item0 = tuple.getItem(0); + Py::Object item1 = tuple.getItem(1); + if (PyObject_TypeCheck(item0.ptr(), &(App::DocumentObjectPy::Type))) { + auto pydoc = static_cast(item0.ptr()); + App::DocumentObject* obj = pydoc->getDocumentObjectPtr(); + objs.push_back(obj); + if (Part::Feature* part = dynamic_cast(obj)) { + App::PropertyColorList colors; + colors.setPyObject(item1.ptr()); + partColor[part] = colors.getValues(); + } + } + } + } + Handle(XCAFApp_Application) hApp = XCAFApp_Application::GetApplication(); Handle(TDocStd_Document) hDoc; hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc); - std::vector objs; - for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { - PyObject* item = (*it).ptr(); - if (PyObject_TypeCheck(item, &(App::DocumentObjectPy::Type))) { - objs.push_back( - static_cast(item)->getDocumentObjectPtr()); + auto getShapeColors = [partColor](App::DocumentObject* obj, const char* subname) { + std::map cols; + auto it = partColor.find(dynamic_cast(obj)); + if (it != partColor.end() && boost::starts_with(subname, "Face")) { + const auto& colors = it->second; + std::string face("Face"); + for (const auto& element : colors | boost::adaptors::indexed(1)) { + cols[face + std::to_string(element.index())] = element.value(); + } } - } + return cols; + }; - if (legacy == Py_None) { - Part::OCAF::ImportExportSettings settings; - legacy = settings.getExportLegacy() ? Py_True : Py_False; - } - - Import::ExportOCAF2 ocaf(hDoc); - if (!Base::asBoolean(legacy) || !ocaf.canFallback(objs)) { + Import::ExportOCAF2 ocaf(hDoc, getShapeColors); + if (!legacyExport || !ocaf.canFallback(objs)) { ocaf.setExportOptions(ExportOCAF2::customExportOptions()); - - if (exportHidden != Py_None) { - ocaf.setExportHiddenObject(Base::asBoolean(exportHidden)); - } - if (keepPlacement != Py_None) { - ocaf.setKeepPlacement(Base::asBoolean(keepPlacement)); - } + ocaf.setExportHiddenObject(exportHidden); + ocaf.setKeepPlacement(keepPlacement); ocaf.exportObjects(objs); } else { - bool keepExplicitPlacement = Standard_True; - ExportOCAF ocaf(hDoc, keepExplicitPlacement); - // That stuff is exporting a list of selected objects into FreeCAD Tree - std::vector hierarchical_label; - std::vector hierarchical_loc; - std::vector hierarchical_part; - for (auto obj : objs) { - ocaf.exportObject(obj, hierarchical_label, hierarchical_loc, hierarchical_part); - } - - // Free Shapes must have absolute placement and not explicit - std::vector FreeLabels; - std::vector part_id; - ocaf.getFreeLabels(hierarchical_label, FreeLabels, part_id); - // Update is not performed automatically anymore: - // https://tracker.dev.opencascade.org/view.php?id=28055 - XCAFDoc_DocumentTool::ShapeTool(hDoc->Main())->UpdateAssemblies(); + bool keepExplicitPlacement = true; + ExportOCAFCmd ocaf(hDoc, keepExplicitPlacement); + ocaf.setPartColorsMap(partColor); + ocaf.exportObjects(objs); } Base::FileInfo file(Utf8Name.c_str()); if (file.hasExtension({"stp", "step"})) { - STEPCAFControl_Writer writer; - Part::Interface::writeStepAssembly(Part::Interface::Assembly::On); - writer.Transfer(hDoc, STEPControl_AsIs); - - APIHeaderSection_MakeHeader makeHeader(writer.ChangeWriter().Model()); - Base::Reference hGrp = App::GetApplication() - .GetUserParameter() - .GetGroup("BaseApp") - ->GetGroup("Preferences") - ->GetGroup("Mod/Part") - ->GetGroup("STEP"); - - // Don't set name because STEP doesn't support UTF-8 - // https://forum.freecad.org/viewtopic.php?f=8&t=52967 - makeHeader.SetAuthorValue( - 1, - new TCollection_HAsciiString(hGrp->GetASCII("Author", "Author").c_str())); - makeHeader.SetOrganizationValue( - 1, - new TCollection_HAsciiString(hGrp->GetASCII("Company").c_str())); - makeHeader.SetOriginatingSystem( - new TCollection_HAsciiString(App::Application::getExecutableName().c_str())); - makeHeader.SetDescriptionValue(1, new TCollection_HAsciiString("FreeCAD Model")); - IFSelect_ReturnStatus ret = writer.Write(name8bit.c_str()); - if (ret == IFSelect_RetError || ret == IFSelect_RetFail - || ret == IFSelect_RetStop) { - PyErr_Format(PyExc_IOError, "Cannot open file '%s'", Utf8Name.c_str()); - throw Py::Exception(); - } + Import::WriterStep writer(file); + writer.write(hDoc); } else if (file.hasExtension({"igs", "iges"})) { - IGESControl_Controller::Init(); - IGESCAFControl_Writer writer; - IGESData_GlobalSection header = writer.Model()->GlobalSection(); - header.SetAuthorName( - new TCollection_HAsciiString(Part::Interface::writeIgesHeaderAuthor())); - header.SetCompanyName( - new TCollection_HAsciiString(Part::Interface::writeIgesHeaderCompany())); - header.SetSendName( - new TCollection_HAsciiString(Part::Interface::writeIgesHeaderProduct())); - writer.Model()->SetGlobalSection(header); - writer.Transfer(hDoc); - Standard_Boolean ret = writer.Write(name8bit.c_str()); - if (!ret) { - PyErr_Format(PyExc_IOError, "Cannot open file '%s'", Utf8Name.c_str()); - throw Py::Exception(); - } + Import::WriterIges writer(file); + writer.write(hDoc); } else if (file.hasExtension({"glb", "gltf"})) { - Import::WriterGltf writer(name8bit, file); + Import::WriterGltf writer(file); writer.write(hDoc); } @@ -457,7 +365,7 @@ private: Py::Object readDXF(const Py::Tuple& args) { - char* Name; + char* Name = nullptr; const char* DocName = nullptr; const char* optionSource = nullptr; std::string defaultOptions = "User parameter:BaseApp/Preferences/Mod/Draft"; @@ -484,7 +392,7 @@ private: defaultOptions = optionSource; } - App::Document* pcDoc; + App::Document* pcDoc = nullptr; if (DocName) { pcDoc = App::GetApplication().getDocument(DocName); } @@ -514,8 +422,8 @@ private: Py::Object writeDXFShape(const Py::Tuple& args) { - PyObject* shapeObj; - char* fname; + PyObject* shapeObj = nullptr; + char* fname = nullptr; std::string filePath; std::string layerName; const char* optionSource = nullptr; @@ -626,8 +534,8 @@ private: Py::Object writeDXFObject(const Py::Tuple& args) { - PyObject* docObj; - char* fname; + PyObject* docObj = nullptr; + char* fname = nullptr; std::string filePath; std::string layerName; const char* optionSource = nullptr; diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index ded2ae2886..47777c79bb 100644 --- a/src/Mod/Import/App/CMakeLists.txt +++ b/src/Mod/Import/App/CMakeLists.txt @@ -1,10 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppImport -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} @@ -29,6 +22,8 @@ SET(Import_SRCS AppImportPy.cpp ExportOCAF.cpp ExportOCAF.h + ExportOCAF2.cpp + ExportOCAF2.h ImportOCAF.cpp ImportOCAF.h ImportOCAF2.cpp @@ -37,14 +32,24 @@ SET(Import_SRCS #ImportOCAFAssembly.h ReaderGltf.cpp ReaderGltf.h + ReaderIges.cpp + ReaderIges.h + ReaderStep.cpp + ReaderStep.h StepShapePy.xml StepShape.h StepShape.cpp StepShapePyImp.cpp PreCompiled.cpp PreCompiled.h + Tools.cpp + Tools.h WriterGltf.cpp WriterGltf.h + WriterIges.cpp + WriterIges.h + WriterStep.cpp + WriterStep.h dxf/ImpExpDxf.cpp dxf/ImpExpDxf.h dxf/dxf.cpp diff --git a/src/Mod/Import/App/ExportOCAF.cpp b/src/Mod/Import/App/ExportOCAF.cpp index 1da458d8dd..adf65a1176 100644 --- a/src/Mod/Import/App/ExportOCAF.cpp +++ b/src/Mod/Import/App/ExportOCAF.cpp @@ -67,8 +67,8 @@ static inline Quantity_ColorRGBA convertColor(const App::Color& c) using namespace Import; -ExportOCAF::ExportOCAF(Handle(TDocStd_Document) h, bool explicitPlacement) - : pDoc(h) +ExportOCAF::ExportOCAF(Handle(TDocStd_Document) hDoc, bool explicitPlacement) + : pDoc(hDoc) , keepExplicitPlacement(explicitPlacement) { aShapeTool = XCAFDoc_DocumentTool::ShapeTool(pDoc->Main()); @@ -129,6 +129,30 @@ std::vector ExportOCAF::filterPart(App::Part* part) const return entries; } +void ExportOCAF::exportObjects(std::vector& objs) +{ + // That stuff is exporting a list of selected objects into FreeCAD Tree + std::vector hierarchical_label; + std::vector hierarchical_loc; + std::vector hierarchical_part; + for (auto obj : objs) { + exportObject(obj, hierarchical_label, hierarchical_loc, hierarchical_part); + } + + // Free Shapes must have absolute placement and not explicit + std::vector FreeLabels; + std::vector part_id; + getFreeLabels(hierarchical_label, FreeLabels, part_id); + + std::vector> Colors; + getPartColors(hierarchical_part, FreeLabels, part_id, Colors); + reallocateFreeShape(hierarchical_part, FreeLabels, part_id, Colors); + + // Update is not performed automatically anymore: + // https://tracker.dev.opencascade.org/view.php?id=28055 + XCAFDoc_DocumentTool::ShapeTool(pDoc->Main())->UpdateAssemblies(); +} + int ExportOCAF::exportObject(App::DocumentObject* obj, std::vector& hierarchical_label, std::vector& hierarchical_loc, diff --git a/src/Mod/Import/App/ExportOCAF.h b/src/Mod/Import/App/ExportOCAF.h index 53872ad608..3542f5169f 100644 --- a/src/Mod/Import/App/ExportOCAF.h +++ b/src/Mod/Import/App/ExportOCAF.h @@ -57,8 +57,9 @@ namespace Import class ImportExport ExportOCAF { public: - ExportOCAF(Handle(TDocStd_Document) h, bool explicitPlacement); + ExportOCAF(Handle(TDocStd_Document) hDoc, bool explicitPlacement); virtual ~ExportOCAF(); + void exportObjects(std::vector& objs); int exportObject(App::DocumentObject* obj, std::vector& hierarchical_label, std::vector& hierarchical_loc, diff --git a/src/Mod/Import/App/ExportOCAF2.cpp b/src/Mod/Import/App/ExportOCAF2.cpp new file mode 100644 index 0000000000..bddf5fc647 --- /dev/null +++ b/src/Mod/Import/App/ExportOCAF2.cpp @@ -0,0 +1,625 @@ +/**************************************************************************** + * Copyright (c) 2018 Zheng, Lei (realthunder) * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ****************************************************************************/ + +#include "PreCompiled.h" +#if defined(__MINGW32__) +#define WNT // avoid conflict with GUID +#endif +#ifndef _PreComp_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ExportOCAF2.h" + + +FC_LOG_LEVEL_INIT("Import", true, true) + +using namespace Import; + +ExportOCAFOptions::ExportOCAFOptions() +{ + defaultColor.setPackedValue(0xCCCCCC00); + defaultColor.a = 0; +} + +ExportOCAF2::ExportOCAF2(Handle(TDocStd_Document) h, GetShapeColorsFunc func) + : pDoc(h) + , getShapeColors(func) +{ + aShapeTool = XCAFDoc_DocumentTool::ShapeTool(pDoc->Main()); + aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main()); + + Part::Interface::writeStepAssembly(Part::Interface::Assembly::Auto); +} + +// ---------------------------------------------------------------------------- + +/*! + * \brief ExportOCAF2::customExportOptions + * \return options from user settings + */ +ExportOCAFOptions ExportOCAF2::customExportOptions() +{ + Part::OCAF::ImportExportSettings settings; + + ExportOCAFOptions defaultOptions; + defaultOptions.exportHidden = settings.getExportHiddenObject(); + defaultOptions.keepPlacement = settings.getExportKeepPlacement(); + + auto handle = + App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); + defaultOptions.defaultColor.setPackedValue( + handle->GetUnsigned("DefaultShapeColor", defaultOptions.defaultColor.getPackedValue())); + defaultOptions.defaultColor.a = 0; + + return defaultOptions; +} + +void ExportOCAF2::setName(TDF_Label label, App::DocumentObject* obj, const char* name) +{ + if (!name) { + if (!obj) { + return; + } + name = obj->Label.getValue(); + } + TDataStd_Name::Set(label, TCollection_ExtendedString(name, true)); +} + +// Similar to XCAFDoc_ShapeTool::FindSHUO but return only main SHUO, i.e. SHUO +// with no upper_usage. It should not be necessary if we strictly export from +// bottom up, but let's make sure of it. +static Standard_Boolean FindSHUO(const TDF_LabelSequence& theLabels, + Handle(XCAFDoc_GraphNode) & theSHUOAttr) +{ + assert(theLabels.Length() > 1); + theSHUOAttr.Nullify(); + TDF_AttributeSequence SHUOAttrs; + TDF_Label aCompLabel = theLabels.Value(1); + if (!::XCAFDoc_ShapeTool::GetAllComponentSHUO(aCompLabel, SHUOAttrs)) { + return Standard_False; + } + for (Standard_Integer i = 1; i <= SHUOAttrs.Length(); i++) { + Handle(XCAFDoc_GraphNode) anSHUO = Handle(XCAFDoc_GraphNode)::DownCast(SHUOAttrs.Value(i)); + TDF_LabelSequence aUpLabels; + // check for any upper_usage + ::XCAFDoc_ShapeTool::GetSHUOUpperUsage(anSHUO->Label(), aUpLabels); + if (aUpLabels.Length() > 0) { + continue; // reject if there is one + } + int j = 2; + for (; anSHUO->NbChildren(); ++j) { + if (j > theLabels.Length()) { + j = 0; + break; + } + anSHUO = anSHUO->GetChild(1); + if (theLabels.Value(j) != anSHUO->Label().Father()) { + j = 0; + break; + } + } + if (j != theLabels.Length() + 1) { + continue; + } + + theSHUOAttr = Handle(XCAFDoc_GraphNode)::DownCast(SHUOAttrs.Value(i)); + break; + } + return (!theSHUOAttr.IsNull()); +} + +TDF_Label +ExportOCAF2::findComponent(const char* subname, TDF_Label label, TDF_LabelSequence& labels) +{ + const char* dot = strchr(subname, '.'); + if (!dot) { + if (labels.Length() == 1) { + return labels.Value(1); + } + Handle(XCAFDoc_GraphNode) ret; + if (labels.Length() && (FindSHUO(labels, ret) || aShapeTool->SetSHUO(labels, ret))) { + return ret->Label(); + } + return {}; + } + TDF_LabelSequence components; + TDF_Label ref; + if (!aShapeTool->GetReferredShape(label, ref)) { + ref = label; + } + if (aShapeTool->GetComponents(ref, components)) { + for (int i = 1; i <= components.Length(); ++i) { + auto component = components.Value(i); + if (std::isdigit((int)subname[0])) { + auto n = std::to_string(i - 1) + "."; + if (boost::starts_with(subname, n)) { + labels.Append(component); + return findComponent(subname + n.size(), component, labels); + } + } + auto it = myNames.find(component); + if (it == myNames.end()) { + continue; + } + for (auto& n : it->second) { + if (boost::starts_with(subname, n)) { + labels.Append(component); + return findComponent(subname + n.size(), component, labels); + } + } + } + } + return {}; +} + +void ExportOCAF2::setupObject(TDF_Label label, + App::DocumentObject* obj, + const Part::TopoShape& shape, + const std::string& prefix, + const char* name, + bool force) +{ + setName(label, obj, name); + if (aShapeTool->IsComponent(label)) { + auto& names = myNames[label]; + // The subname reference may contain several possible namings. + if (!name) { + // simple object internal name + names.push_back(prefix + obj->getNameInDocument() + "."); + } + else { + // name is not NULL in case this is a collapsed link array element. + // Collapsed means that the element is not an actual object, and + // 'obj' here is actually the parent. The given 'name' is in fact + // the element index + names.push_back(prefix + name + "."); + // In case the subname reference is created when the link array is + // previously expanded, the element object will be named as the + // parent object internal name + '_i' + names.push_back(prefix + obj->getNameInDocument() + "_i" + name + "."); + } + // Finally, the subname reference allows to use the label for naming + // with preceding '$' + names.push_back(prefix + "$" + obj->Label.getValue() + "."); + } + + if (!getShapeColors || (!force && !mySetups.emplace(obj, name ? name : "").second)) { + return; + } + + std::map> colors; + static std::string marker(App::DocumentObject::hiddenMarker() + "*"); + static std::array keys = {"Face*", "Edge*", marker.c_str()}; + std::string childName; + if (name) { + childName = name; + childName += '.'; + } + for (auto key : keys) { + for (auto& v : getShapeColors(obj, key)) { + const char* subname = v.first.c_str(); + if (name) { + if (!boost::starts_with(v.first, childName)) { + continue; + } + subname += childName.size(); + } + const char* dot = strrchr(subname, '.'); + if (!dot) { + colors[""].emplace(subname, v.second); + } + else { + ++dot; + colors[std::string(subname, dot - subname)].emplace(dot, v.second); + } + } + } + + bool warned = false; + + for (auto& v : colors) { + TDF_Label nodeLabel = label; + if (!v.first.empty()) { + TDF_LabelSequence labels; + if (aShapeTool->IsComponent(label)) { + labels.Append(label); + } + nodeLabel = findComponent(v.first.c_str(), label, labels); + if (nodeLabel.IsNull()) { + FC_WARN("Failed to find component " << v.first); + continue; + } + } + for (auto& vv : v.second) { + if (vv.first == App::DocumentObject::hiddenMarker()) { + aColorTool->SetVisibility(nodeLabel, Standard_False); + continue; + } + const App::Color& c = vv.second; + Quantity_ColorRGBA color = Tools::convertColor(c); + auto colorType = vv.first[0] == 'F' ? XCAFDoc_ColorSurf : XCAFDoc_ColorCurv; + if (vv.first == "Face" || vv.first == "Edge") { + aColorTool->SetColor(nodeLabel, color, colorType); + continue; + } + + if (nodeLabel != label || aShapeTool->IsComponent(label)) { + // OCCT 7 seems to only support "Recommended practices for + // model styling and organization" version 1.2 + // (https://www.cax-if.org/documents/rec_prac_styling_org_v12.pdf). + // The SHUO described in section 5.3 does not mention the + // capability of overriding context-depdendent element color, + // only whole shape color. Newer version of the same document + // (https://www.cax-if.org/documents/rec_prac_styling_org_v15.pdf) + // does support this, in section 5.1. + // + // The above observation is confirmed by further inspection of + // OCCT code, XCAFDoc_ShapeTool.cxx and STEPCAFControl_Writer.cxx. + if (!warned) { + warned = true; + FC_WARN("Current OCCT does not support element color override, for object " + << obj->getFullName()); + } + // continue; + } + + auto subShape = shape.getSubShape(vv.first.c_str(), true); + if (subShape.IsNull()) { + FC_WARN("Failed to get subshape " << vv.first); + continue; + } + + // The following code is copied from OCCT 7.3 and is a work around + // a bug in previous versions + Handle(XCAFDoc_ShapeMapTool) A; + if (!nodeLabel.FindAttribute(XCAFDoc_ShapeMapTool::GetID(), A)) { + TopoDS_Shape aShape = aShapeTool->GetShape(nodeLabel); + if (!aShape.IsNull()) { + A = XCAFDoc_ShapeMapTool::Set(nodeLabel); + A->SetShape(aShape); + } + } + + TDF_Label subLabel = aShapeTool->AddSubShape(nodeLabel, subShape); + if (subLabel.IsNull()) { + FC_WARN("Failed to add subshape " << vv.first); + continue; + } + aColorTool->SetColor(subLabel, color, colorType); + } + } +} + +void ExportOCAF2::exportObjects(std::vector& objs, const char* name) +{ + if (objs.empty()) { + return; + } + myObjects.clear(); + myNames.clear(); + mySetups.clear(); + if (objs.size() == 1) { + exportObject(objs.front(), nullptr, TDF_Label()); + } + else { + auto label = aShapeTool->NewShape(); + App::Document* doc = nullptr; + bool sameDoc = true; + for (auto obj : objs) { + if (doc) { + sameDoc = sameDoc && doc == obj->getDocument(); + } + else { + doc = obj->getDocument(); + } + exportObject(obj, nullptr, label); + } + + if (!name && doc && sameDoc) { + name = doc->getName(); + } + setName(label, nullptr, name); + } + + if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) { + Tools::dumpLabels(pDoc->Main(), aShapeTool, aColorTool); + } + + // Update is not performed automatically anymore: + // https://tracker.dev.opencascade.org/view.php?id=28055 + aShapeTool->UpdateAssemblies(); +} + +TDF_Label ExportOCAF2::exportObject(App::DocumentObject* parentObj, + const char* sub, + TDF_Label parent, + const char* name) +{ + App::DocumentObject* obj; + auto shape = Part::Feature::getTopoShape(parentObj, sub, false, nullptr, &obj, false, !sub); + if (!obj || shape.isNull()) { + if (obj) { + FC_WARN(obj->getFullName() << " has null shape"); + } + return {}; + } + + // sub may contain more than one hierarchy, e.g. Assembly container may use + // getSubObjects to skip some hierarchy containing constraints and stuff + // when exporting. We search for extra '.', and set it as prefix if found. + // When setting SHUO's, we'll need this prefix for matching. + std::string prefix; + if (sub) { + auto len = strlen(sub); + if (len > 1) { + --len; + // The prefix ends with the second last '.', so search for it. + for (int i = 0; len != 0; --len) { + if (sub[len] == '.' && ++i == 2) { + prefix = std::string(sub, len + 1); + break; + } + } + } + } + + TDF_Label label; + std::vector links; + + int depth = 0; + auto linked = obj; + auto linkedShape = shape; + while (true) { + auto s = Part::Feature::getTopoShape(linked); + if (s.isNull() || !s.getShape().IsPartner(shape.getShape())) { + break; + } + linkedShape = s; + // Search using our own cache. We can't rely on ShapeTool::FindShape() + // in case this is an assembly. Because FindShape() search among its + // own computed shape, i.e. its own created compound, and thus will + // never match ours. + auto it = myObjects.find(linked); + if (it != myObjects.end()) { + for (auto l : links) { + myObjects.emplace(l, it->second); + } + // Note: OCAF does not seem to support reference of references. We + // have to flaten all multi-level link without scales. In other + // word, all link will all be forced to refer to the same + // non-located shape + + // retrieve OCAF computed shape, in case the current object returns + // a new shape every time Part::Feature::getTopoShape() is called. + auto baseShape = aShapeTool->GetShape(it->second); + shape.setShape(baseShape.Located(shape.getShape().Location())); + if (!parent.IsNull()) { + label = aShapeTool->AddComponent(parent, shape.getShape(), Standard_False); + } + else { + label = aShapeTool->AddShape(shape.getShape(), Standard_False, Standard_False); + } + setupObject(label, name ? parentObj : obj, shape, prefix, name); + return label; + } + auto next = linked->getLinkedObject(false, nullptr, false, depth++); + if (!next || linked == next) { + break; + } + linked = next; + links.push_back(linked); + } + + auto subs = obj->getSubObjects(); + // subs empty means obj is not a container. + if (subs.empty()) { + + if (!parent.IsNull()) { + // Search for non-located shape to see if we've stored the original shape before + if (!aShapeTool->FindShape(shape.getShape(), label)) { + auto baseShape = linkedShape; + auto linked = links.empty() ? obj : links.back(); + baseShape.setShape(baseShape.getShape().Located(TopLoc_Location())); + label = aShapeTool->NewShape(); + aShapeTool->SetShape(label, baseShape.getShape()); + setupObject(label, linked, baseShape, prefix); + } + + label = aShapeTool->AddComponent(parent, shape.getShape(), Standard_False); + setupObject(label, name ? parentObj : obj, shape, prefix, name); + } + else { + // Here means we are exporting a single non-assembly object. We must + // not call setupObject() on a non-located baseshape like above, + // because OCCT does not respect shape style sharing when not + // exporting assembly + if (!options.keepPlacement || shape.getPlacement() == Base::Placement()) { + shape.setShape(shape.getShape().Located(TopLoc_Location())); + } + else { + Base::Matrix4D mat = shape.getTransform(); + shape.setShape(shape.getShape().Located(TopLoc_Location())); + // Transform with copy to conceal the transformation + shape.transformShape(mat, true); + // Even if the shape has no transformation, TopoShape still sets + // a TopLoc_Location, so we need to clear it again. + shape.setShape(shape.getShape().Located(TopLoc_Location())); + } + label = aShapeTool->AddShape(shape.getShape(), Standard_False, Standard_False); + auto o = name ? parentObj : obj; + if (o != linked) { + setupObject(label, linked, shape, prefix, nullptr, true); + } + setupObject(label, o, shape, prefix, name, true); + } + + myObjects.emplace(obj, label); + for (auto link : links) { + myObjects.emplace(link, label); + } + return label; + } + + if (obj->getExtensionByType(true) + || obj->getExtensionByType(true)) { + groupLinks.push_back(obj); + } + + // Create a new assembly + label = aShapeTool->NewShape(); + + // check for link array + auto linkArray = obj->getLinkedObject(true)->getExtensionByType(true); + if (linkArray && (linkArray->getShowElementValue() || !linkArray->getElementCountValue())) { + linkArray = nullptr; + } + for (auto& subobj : subs) { + App::DocumentObject* parentGrp = nullptr; + std::string childName; + auto sobj = obj->resolve(subobj.c_str(), &parentGrp, &childName); + if (!sobj) { + FC_WARN("Cannot find object " << obj->getFullName() << '.' << subobj); + continue; + } + int vis = -1; + if (parentGrp) { + if (!groupLinks.empty() + && parentGrp->getExtensionByType(true, false)) { + vis = groupLinks.back()->isElementVisible(childName.c_str()); + } + else { + vis = parentGrp->isElementVisible(childName.c_str()); + } + } + + if (vis < 0) { + vis = sobj->Visibility.getValue() ? 1 : 0; + } + + if (!vis && !options.exportHidden) { + continue; + } + + TDF_Label childLabel = + exportObject(obj, subobj.c_str(), label, linkArray ? childName.c_str() : nullptr); + if (childLabel.IsNull()) { + continue; + } + + if (!vis) { + // Work around OCCT bug. If no color setting here, it will crash. + // The culprit is at STEPCAFControl_Writer::1093 as shown below + // + // surfColor = Styles.EncodeColor(Quantity_Color(1,1,1,OCC_COLOR_SPACE),DPDCs,ColRGBs); + // PSA = Styles.MakeColorPSA ( item, surfColor, curvColor, isComponent ); + // if ( isComponent ) + // setDefaultInstanceColor( override, PSA); + // + // Can be fixed with following + // if ( !override.IsNull() && isComponent ) + // setDefaultInstanceColor( override, PSA); + // + auto childShape = aShapeTool->GetShape(childLabel); + Quantity_ColorRGBA col; + if (!aColorTool->GetInstanceColor(childShape, XCAFDoc_ColorGen, col) + && !aColorTool->GetInstanceColor(childShape, XCAFDoc_ColorSurf, col) + && !aColorTool->GetInstanceColor(childShape, XCAFDoc_ColorCurv, col)) { + auto& c = options.defaultColor; + aColorTool->SetColor(childLabel, Tools::convertColor(c), XCAFDoc_ColorGen); + FC_WARN(Tools::labelName(childLabel) << " set default color"); + } + aColorTool->SetVisibility(childLabel, Standard_False); + } + } + + if (!groupLinks.empty() && groupLinks.back() == obj) { + groupLinks.pop_back(); + } + + // Finished adding components. Now retrieve the computed non-located shape + auto baseShape = shape; + baseShape.setShape(aShapeTool->GetShape(label)); + + myObjects.emplace(obj, label); + for (auto link : links) { + myObjects.emplace(link, label); + } + + if (!parent.IsNull() && !links.empty()) { + linked = links.back(); + } + else { + linked = obj; + } + setupObject(label, linked, baseShape, prefix); + + if (!parent.IsNull()) { + // If we are a component, swap in the base shape but keep our location. + shape.setShape(baseShape.getShape().Located(shape.getShape().Location())); + label = aShapeTool->AddComponent(parent, label, shape.getShape().Location()); + setupObject(label, name ? parentObj : obj, shape, prefix, name); + } + return label; +} + +bool ExportOCAF2::canFallback(std::vector objs) +{ + for (size_t i = 0; i < objs.size(); ++i) { + auto obj = objs[i]; + if (!obj || !obj->getNameInDocument()) { + continue; + } + if (obj->getExtensionByType(true)) { + return false; + } + for (auto& sub : obj->getSubObjects()) { + objs.push_back(obj->getSubObject(sub.c_str())); + } + } + return true; +} diff --git a/src/Mod/Import/App/ExportOCAF2.h b/src/Mod/Import/App/ExportOCAF2.h new file mode 100644 index 0000000000..f33308987f --- /dev/null +++ b/src/Mod/Import/App/ExportOCAF2.h @@ -0,0 +1,117 @@ +/**************************************************************************** + * Copyright (c) 2018 Zheng, Lei (realthunder) * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ****************************************************************************/ + +#ifndef IMPORT_EXPORTOCAF2_H +#define IMPORT_EXPORTOCAF2_H + +#include +#include +#include +#include +#include +#include + +#include + +#include +#include "Tools.h" + +namespace App +{ +class DocumentObject; +} + +namespace Part +{ +class TopoShape; +} + +namespace Import +{ + +struct ImportExport ExportOCAFOptions +{ + ExportOCAFOptions(); + App::Color defaultColor; + bool exportHidden = true; + bool keepPlacement = false; +}; + +class ImportExport ExportOCAF2 +{ +public: + using GetShapeColorsFunc = + std::function(App::DocumentObject*, const char*)>; + explicit ExportOCAF2(Handle(TDocStd_Document) hDoc, + GetShapeColorsFunc func = GetShapeColorsFunc()); + + static ExportOCAFOptions customExportOptions(); + void setExportOptions(ExportOCAFOptions opts) + { + options = opts; + } + void setExportHiddenObject(bool enable) + { + options.exportHidden = enable; + } + void setKeepPlacement(bool enable) + { + options.keepPlacement = enable; + } + void exportObjects(std::vector& objs, const char* name = nullptr); + bool canFallback(std::vector objs); + +private: + TDF_Label exportObject(App::DocumentObject* obj, + const char* sub, + TDF_Label parent, + const char* name = nullptr); + void setupObject(TDF_Label label, + App::DocumentObject* obj, + const Part::TopoShape& shape, + const std::string& prefix, + const char* name = nullptr, + bool force = false); + void setName(TDF_Label label, App::DocumentObject* obj, const char* name = nullptr); + TDF_Label findComponent(const char* subname, TDF_Label label, TDF_LabelSequence& labels); + +private: + Handle(TDocStd_Document) pDoc; + Handle(XCAFDoc_ShapeTool) aShapeTool; + Handle(XCAFDoc_ColorTool) aColorTool; + + std::unordered_map myObjects; + + std::unordered_map, LabelHasher> myNames; + + std::set> mySetups; + + std::vector groupLinks; + + GetShapeColorsFunc getShapeColors; + + ExportOCAFOptions options; +}; + +} // namespace Import + +#endif // IMPORT_EXPORTOCAF2_H diff --git a/src/Mod/Import/App/ImportOCAF2.cpp b/src/Mod/Import/App/ImportOCAF2.cpp index 7946aedd2c..0142073559 100644 --- a/src/Mod/Import/App/ImportOCAF2.cpp +++ b/src/Mod/Import/App/ImportOCAF2.cpp @@ -30,22 +30,16 @@ #include #include #include -#include #include #include -#include -#include #include #include #include -#include #include #include #include #endif -#include - #include #include @@ -75,108 +69,6 @@ FC_LOG_LEVEL_INIT("Import", true, true) using namespace Import; -///////////////////////////////////////////////////////////////////// - -static inline App::Color convertColor(const Quantity_ColorRGBA& c) -{ - Standard_Real r, g, b; - c.GetRGB().Values(r, g, b, OCC_COLOR_SPACE); - return App::Color(static_cast(r), - static_cast(g), - static_cast(b), - 1.0f - static_cast(c.Alpha())); -} - -static inline Quantity_ColorRGBA convertColor(const App::Color& c) -{ - return Quantity_ColorRGBA(Quantity_Color(c.r, c.g, c.b, OCC_COLOR_SPACE), 1.0f - c.a); -} - -static inline std::ostream& operator<<(std::ostream& os, const Quantity_ColorRGBA& c) -{ - App::Color color = convertColor(c); - auto toHex = [](float v) { - return boost::format("%02X") % static_cast(v * 255); - }; - return os << "#" << toHex(color.r) << toHex(color.g) << toHex(color.b) << toHex(color.a); -} - -static std::string labelName(TDF_Label label) -{ - std::string txt; - Handle(TDataStd_Name) name; - if (!label.IsNull() && label.FindAttribute(TDataStd_Name::GetID(), name)) { - TCollection_ExtendedString extstr = name->Get(); - char* str = new char[extstr.LengthOfCString() + 1]; - extstr.ToUTF8CString(str); - txt = str; - delete[] str; - boost::trim(txt); - } - return txt; -} - -static void printLabel(TDF_Label label, - Handle(XCAFDoc_ShapeTool) aShapeTool, - Handle(XCAFDoc_ColorTool) aColorTool, - const char* msg = nullptr) -{ - if (label.IsNull() || !FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) { - return; - } - if (!msg) { - msg = "Label: "; - } - TCollection_AsciiString entry; - TDF_Tool::Entry(label, entry); - std::ostringstream ss; - ss << msg << entry << ", " << labelName(label) << (aShapeTool->IsShape(label) ? ", shape" : "") - << (aShapeTool->IsTopLevel(label) ? ", topLevel" : "") - << (aShapeTool->IsFree(label) ? ", free" : "") - << (aShapeTool->IsAssembly(label) ? ", assembly" : "") - << (aShapeTool->IsSimpleShape(label) ? ", simple" : "") - << (aShapeTool->IsCompound(label) ? ", compound" : "") - << (aShapeTool->IsReference(label) ? ", reference" : "") - << (aShapeTool->IsComponent(label) ? ", component" : "") - << (aShapeTool->IsSubShape(label) ? ", subshape" : ""); - if (aShapeTool->IsSubShape(label)) { - auto shape = aShapeTool->GetShape(label); - if (!shape.IsNull()) { - ss << ", " << Part::TopoShape::shapeName(shape.ShapeType(), true); - } - } - if (aShapeTool->IsShape(label)) { - Quantity_ColorRGBA c; - if (aColorTool->GetColor(label, XCAFDoc_ColorGen, c)) { - ss << ", gc: " << c; - } - if (aColorTool->GetColor(label, XCAFDoc_ColorSurf, c)) { - ss << ", sc: " << c; - } - if (aColorTool->GetColor(label, XCAFDoc_ColorCurv, c)) { - ss << ", cc: " << c; - } - } - - ss << std::endl; - Base::Console().Notify("ImportOCAF2", ss.str().c_str()); -} - -static void dumpLabels(TDF_Label label, - Handle(XCAFDoc_ShapeTool) aShapeTool, - Handle(XCAFDoc_ColorTool) aColorTool, - int depth = 0) -{ - std::string indent(depth * 2, ' '); - printLabel(label, aShapeTool, aColorTool, indent.c_str()); - TDF_ChildIterator it; - for (it.Initialize(label); it.More(); it.Next()) { - dumpLabels(it.Value(), aShapeTool, aColorTool, depth + 1); - } -} - -///////////////////////////////////////////////////////////////////// - ImportOCAFOptions::ImportOCAFOptions() { defaultFaceColor.setPackedValue(0xCCCCCC00); @@ -186,16 +78,16 @@ ImportOCAFOptions::ImportOCAFOptions() defaultEdgeColor.a = 0; } -ImportOCAF2::ImportOCAF2(Handle(TDocStd_Document) h, App::Document* d, const std::string& name) - : pDoc(h) - , pDocument(d) +ImportOCAF2::ImportOCAF2(Handle(TDocStd_Document) hDoc, App::Document* doc, const std::string& name) + : pDoc(hDoc) + , pDocument(doc) , default_name(name) { aShapeTool = XCAFDoc_DocumentTool::ShapeTool(pDoc->Main()); aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main()); - if (d->isSaved()) { - Base::FileInfo fi(d->FileName.getValue()); + if (pDocument->isSaved()) { + Base::FileInfo fi(pDocument->FileName.getValue()); filePath = fi.dirPath(); } @@ -279,14 +171,14 @@ std::string ImportOCAF2::getLabelName(TDF_Label label) return name; } if (!XCAFDoc_ShapeTool::IsReference(label)) { - return labelName(label); + return Tools::labelName(label); } if (!options.useBaseName) { - name = labelName(label); + name = Tools::labelName(label); } TDF_Label ref; if (name.empty() && XCAFDoc_ShapeTool::GetReferredShape(label, ref)) { - name = labelName(ref); + name = Tools::labelName(ref); } return name; } @@ -314,7 +206,7 @@ bool ImportOCAF2::getColor(const TopoDS_Shape& shape, Info& info, bool check, bo bool ret = false; Quantity_ColorRGBA aColor; if (aColorTool->GetColor(shape, XCAFDoc_ColorSurf, aColor)) { - App::Color c = convertColor(aColor); + App::Color c = Tools::convertColor(aColor); if (!check || info.faceColor != c) { info.faceColor = c; info.hasFaceColor = true; @@ -322,7 +214,7 @@ bool ImportOCAF2::getColor(const TopoDS_Shape& shape, Info& info, bool check, bo } } if (!noDefault && !info.hasFaceColor && aColorTool->GetColor(shape, XCAFDoc_ColorGen, aColor)) { - App::Color c = convertColor(aColor); + App::Color c = Tools::convertColor(aColor); if (!check || info.faceColor != c) { info.faceColor = c; info.hasFaceColor = true; @@ -330,7 +222,7 @@ bool ImportOCAF2::getColor(const TopoDS_Shape& shape, Info& info, bool check, bo } } if (aColorTool->GetColor(shape, XCAFDoc_ColorCurv, aColor)) { - App::Color c = convertColor(aColor); + App::Color c = Tools::convertColor(aColor); // Some STEP include a curve color with the same value of the face // color. And this will look weird in FC. So for shape with face // we'll ignore the curve color, if it is the same as the face color. @@ -415,7 +307,7 @@ bool ImportOCAF2::createObject(App::Document* doc, bool newDoc) { if (shape.IsNull() || !TopExp_Explorer(shape, TopAbs_VERTEX).More()) { - FC_WARN(labelName(label) << " has empty shape"); + FC_WARN(Tools::labelName(label) << " has empty shape"); return false; } @@ -460,11 +352,11 @@ bool ImportOCAF2::createObject(App::Document* doc, Quantity_ColorRGBA aColor; if (aColorTool->GetColor(l, XCAFDoc_ColorSurf, aColor) || aColorTool->GetColor(l, XCAFDoc_ColorGen, aColor)) { - faceColor = convertColor(aColor); + faceColor = Tools::convertColor(aColor); foundFaceColor = true; } if (aColorTool->GetColor(l, XCAFDoc_ColorCurv, aColor)) { - edgeColor = convertColor(aColor); + edgeColor = Tools::convertColor(aColor); foundEdgeColor = true; if (j == 0 && foundFaceColor && !faceColors.empty() && edgeColor == faceColor) { // Do not set edge the same color as face @@ -643,7 +535,7 @@ App::DocumentObject* ImportOCAF2::loadShapes() } if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) { - dumpLabels(pDoc->Main(), aShapeTool, aColorTool); + Tools::dumpLabels(pDoc->Main(), aShapeTool, aColorTool); } TDF_LabelSequence labels; @@ -696,7 +588,7 @@ App::DocumentObject* ImportOCAF2::loadShapes() auto shape = Part::Feature::getTopoShape(ret); auto feature = static_cast(pDocument->addObject("Part::Feature", "Feature")); - auto name = labelName(pDoc->Main()); + auto name = Tools::labelName(pDoc->Main()); feature->Label.setValue(name.empty() ? default_name.c_str() : name.c_str()); feature->Shape.setValue(shape); applyFaceColors(feature, {}); @@ -750,7 +642,7 @@ void ImportOCAF2::getSHUOColors(TDF_Label label, TDF_Label l = shuo->Label().Father(); auto it = myNames.find(l); if (it == myNames.end()) { - FC_WARN("Failed to find object of label " << labelName(l)); + FC_WARN("Failed to find object of label " << Tools::labelName(l)); ss.str(""); break; } @@ -775,7 +667,7 @@ void ImportOCAF2::getSHUOColors(TDF_Label label, Quantity_ColorRGBA aColor; if (aColorTool->GetColor(slabel, XCAFDoc_ColorSurf, aColor) || aColorTool->GetColor(slabel, XCAFDoc_ColorGen, aColor)) { - colors.emplace(subname, convertColor(aColor)); + colors.emplace(subname, Tools::convertColor(aColor)); } } } @@ -929,7 +821,7 @@ bool ImportOCAF2::createAssembly(App::Document* _doc, Part::TopoShape::convert(childShape.Location().Transformation())); Quantity_ColorRGBA aColor; if (aColorTool->GetColor(childShape, XCAFDoc_ColorSurf, aColor)) { - childInfo.colors[childInfo.plas.size() - 1] = convertColor(aColor); + childInfo.colors[childInfo.plas.size() - 1] = Tools::convertColor(aColor); } } assert(visibilities.size() == children.size()); @@ -1004,564 +896,13 @@ bool ImportOCAF2::createAssembly(App::Document* _doc, // ---------------------------------------------------------------------------- -ExportOCAFOptions::ExportOCAFOptions() +ImportOCAFExt::ImportOCAFExt(Handle(TDocStd_Document) hStdDoc, + App::Document* doc, + const std::string& name) + : ImportOCAF2(hStdDoc, doc, name) +{} + +void ImportOCAFExt::applyFaceColors(Part::Feature* part, const std::vector& colors) { - defaultColor.setPackedValue(0xCCCCCC00); - defaultColor.a = 0; -} - -ExportOCAF2::ExportOCAF2(Handle(TDocStd_Document) h, GetShapeColorsFunc func) - : pDoc(h) - , getShapeColors(func) -{ - aShapeTool = XCAFDoc_DocumentTool::ShapeTool(pDoc->Main()); - aColorTool = XCAFDoc_DocumentTool::ColorTool(pDoc->Main()); - - Part::Interface::writeStepAssembly(Part::Interface::Assembly::Auto); -} - -/*! - * \brief ExportOCAF2::customExportOptions - * \return options from user settings - */ -ExportOCAFOptions ExportOCAF2::customExportOptions() -{ - Part::OCAF::ImportExportSettings settings; - - ExportOCAFOptions defaultOptions; - defaultOptions.exportHidden = settings.getExportHiddenObject(); - defaultOptions.keepPlacement = settings.getExportKeepPlacement(); - - auto handle = - App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); - defaultOptions.defaultColor.setPackedValue( - handle->GetUnsigned("DefaultShapeColor", defaultOptions.defaultColor.getPackedValue())); - defaultOptions.defaultColor.a = 0; - - return defaultOptions; -} - -void ExportOCAF2::setName(TDF_Label label, App::DocumentObject* obj, const char* name) -{ - if (!name) { - if (!obj) { - return; - } - name = obj->Label.getValue(); - } - TDataStd_Name::Set(label, TCollection_ExtendedString(name, true)); -} - -// Similar to XCAFDoc_ShapeTool::FindSHUO but return only main SHUO, i.e. SHUO -// with no upper_usage. It should not be necessary if we strictly export from -// bottom up, but let's make sure of it. -static Standard_Boolean FindSHUO(const TDF_LabelSequence& theLabels, - Handle(XCAFDoc_GraphNode) & theSHUOAttr) -{ - assert(theLabels.Length() > 1); - theSHUOAttr.Nullify(); - TDF_AttributeSequence SHUOAttrs; - TDF_Label aCompLabel = theLabels.Value(1); - if (!::XCAFDoc_ShapeTool::GetAllComponentSHUO(aCompLabel, SHUOAttrs)) { - return Standard_False; - } - for (Standard_Integer i = 1; i <= SHUOAttrs.Length(); i++) { - Handle(XCAFDoc_GraphNode) anSHUO = Handle(XCAFDoc_GraphNode)::DownCast(SHUOAttrs.Value(i)); - TDF_LabelSequence aUpLabels; - // check for any upper_usage - ::XCAFDoc_ShapeTool::GetSHUOUpperUsage(anSHUO->Label(), aUpLabels); - if (aUpLabels.Length() > 0) { - continue; // reject if there is one - } - int j = 2; - for (; anSHUO->NbChildren(); ++j) { - if (j > theLabels.Length()) { - j = 0; - break; - } - anSHUO = anSHUO->GetChild(1); - if (theLabels.Value(j) != anSHUO->Label().Father()) { - j = 0; - break; - } - } - if (j != theLabels.Length() + 1) { - continue; - } - - theSHUOAttr = Handle(XCAFDoc_GraphNode)::DownCast(SHUOAttrs.Value(i)); - break; - } - return (!theSHUOAttr.IsNull()); -} - -TDF_Label -ExportOCAF2::findComponent(const char* subname, TDF_Label label, TDF_LabelSequence& labels) -{ - const char* dot = strchr(subname, '.'); - if (!dot) { - if (labels.Length() == 1) { - return labels.Value(1); - } - Handle(XCAFDoc_GraphNode) ret; - if (labels.Length() && (FindSHUO(labels, ret) || aShapeTool->SetSHUO(labels, ret))) { - return ret->Label(); - } - return {}; - } - TDF_LabelSequence components; - TDF_Label ref; - if (!aShapeTool->GetReferredShape(label, ref)) { - ref = label; - } - if (aShapeTool->GetComponents(ref, components)) { - for (int i = 1; i <= components.Length(); ++i) { - auto component = components.Value(i); - if (std::isdigit((int)subname[0])) { - auto n = std::to_string(i - 1) + "."; - if (boost::starts_with(subname, n)) { - labels.Append(component); - return findComponent(subname + n.size(), component, labels); - } - } - auto it = myNames.find(component); - if (it == myNames.end()) { - continue; - } - for (auto& n : it->second) { - if (boost::starts_with(subname, n)) { - labels.Append(component); - return findComponent(subname + n.size(), component, labels); - } - } - } - } - return {}; -} - -void ExportOCAF2::setupObject(TDF_Label label, - App::DocumentObject* obj, - const Part::TopoShape& shape, - const std::string& prefix, - const char* name, - bool force) -{ - setName(label, obj, name); - if (aShapeTool->IsComponent(label)) { - auto& names = myNames[label]; - // The subname reference may contain several possible namings. - if (!name) { - // simple object internal name - names.push_back(prefix + obj->getNameInDocument() + "."); - } - else { - // name is not NULL in case this is a collapsed link array element. - // Collapsed means that the element is not an actual object, and - // 'obj' here is actually the parent. The given 'name' is in fact - // the element index - names.push_back(prefix + name + "."); - // In case the subname reference is created when the link array is - // previously expanded, the element object will be named as the - // parent object internal name + '_i' - names.push_back(prefix + obj->getNameInDocument() + "_i" + name + "."); - } - // Finally, the subname reference allows to use the label for naming - // with preceding '$' - names.push_back(prefix + "$" + obj->Label.getValue() + "."); - } - - if (!getShapeColors || (!force && !mySetups.emplace(obj, name ? name : "").second)) { - return; - } - - std::map> colors; - static std::string marker(App::DocumentObject::hiddenMarker() + "*"); - static std::array keys = {"Face*", "Edge*", marker.c_str()}; - std::string childName; - if (name) { - childName = name; - childName += '.'; - } - for (auto key : keys) { - for (auto& v : getShapeColors(obj, key)) { - const char* subname = v.first.c_str(); - if (name) { - if (!boost::starts_with(v.first, childName)) { - continue; - } - subname += childName.size(); - } - const char* dot = strrchr(subname, '.'); - if (!dot) { - colors[""].emplace(subname, v.second); - } - else { - ++dot; - colors[std::string(subname, dot - subname)].emplace(dot, v.second); - } - } - } - - bool warned = false; - - for (auto& v : colors) { - TDF_Label nodeLabel = label; - if (!v.first.empty()) { - TDF_LabelSequence labels; - if (aShapeTool->IsComponent(label)) { - labels.Append(label); - } - nodeLabel = findComponent(v.first.c_str(), label, labels); - if (nodeLabel.IsNull()) { - FC_WARN("Failed to find component " << v.first); - continue; - } - } - for (auto& vv : v.second) { - if (vv.first == App::DocumentObject::hiddenMarker()) { - aColorTool->SetVisibility(nodeLabel, Standard_False); - continue; - } - const App::Color& c = vv.second; - Quantity_ColorRGBA color = convertColor(c); - auto colorType = vv.first[0] == 'F' ? XCAFDoc_ColorSurf : XCAFDoc_ColorCurv; - if (vv.first == "Face" || vv.first == "Edge") { - aColorTool->SetColor(nodeLabel, color, colorType); - continue; - } - - if (nodeLabel != label || aShapeTool->IsComponent(label)) { - // OCCT 7 seems to only support "Recommended practices for - // model styling and organization" version 1.2 - // (https://www.cax-if.org/documents/rec_prac_styling_org_v12.pdf). - // The SHUO described in section 5.3 does not mention the - // capability of overriding context-depdendent element color, - // only whole shape color. Newer version of the same document - // (https://www.cax-if.org/documents/rec_prac_styling_org_v15.pdf) - // does support this, in section 5.1. - // - // The above observation is confirmed by further inspection of - // OCCT code, XCAFDoc_ShapeTool.cxx and STEPCAFControl_Writer.cxx. - if (!warned) { - warned = true; - FC_WARN("Current OCCT does not support element color override, for object " - << obj->getFullName()); - } - // continue; - } - - auto subShape = shape.getSubShape(vv.first.c_str(), true); - if (subShape.IsNull()) { - FC_WARN("Failed to get subshape " << vv.first); - continue; - } - - // The following code is copied from OCCT 7.3 and is a work around - // a bug in previous versions - Handle(XCAFDoc_ShapeMapTool) A; - if (!nodeLabel.FindAttribute(XCAFDoc_ShapeMapTool::GetID(), A)) { - TopoDS_Shape aShape = aShapeTool->GetShape(nodeLabel); - if (!aShape.IsNull()) { - A = XCAFDoc_ShapeMapTool::Set(nodeLabel); - A->SetShape(aShape); - } - } - - TDF_Label subLabel = aShapeTool->AddSubShape(nodeLabel, subShape); - if (subLabel.IsNull()) { - FC_WARN("Failed to add subshape " << vv.first); - continue; - } - aColorTool->SetColor(subLabel, color, colorType); - } - } -} - -void ExportOCAF2::exportObjects(std::vector& objs, const char* name) -{ - if (objs.empty()) { - return; - } - myObjects.clear(); - myNames.clear(); - mySetups.clear(); - if (objs.size() == 1) { - exportObject(objs.front(), nullptr, TDF_Label()); - } - else { - auto label = aShapeTool->NewShape(); - App::Document* doc = nullptr; - bool sameDoc = true; - for (auto obj : objs) { - if (doc) { - sameDoc = sameDoc && doc == obj->getDocument(); - } - else { - doc = obj->getDocument(); - } - exportObject(obj, nullptr, label); - } - - if (!name && doc && sameDoc) { - name = doc->getName(); - } - setName(label, nullptr, name); - } - - if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) { - dumpLabels(pDoc->Main(), aShapeTool, aColorTool); - } - - // Update is not performed automatically anymore: - // https://tracker.dev.opencascade.org/view.php?id=28055 - aShapeTool->UpdateAssemblies(); -} - -TDF_Label ExportOCAF2::exportObject(App::DocumentObject* parentObj, - const char* sub, - TDF_Label parent, - const char* name) -{ - App::DocumentObject* obj; - auto shape = Part::Feature::getTopoShape(parentObj, sub, false, nullptr, &obj, false, !sub); - if (!obj || shape.isNull()) { - if (obj) { - FC_WARN(obj->getFullName() << " has null shape"); - } - return {}; - } - - // sub may contain more than one hierarchy, e.g. Assembly container may use - // getSubObjects to skip some hierarchy containing constraints and stuff - // when exporting. We search for extra '.', and set it as prefix if found. - // When setting SHUO's, we'll need this prefix for matching. - std::string prefix; - if (sub) { - auto len = strlen(sub); - if (len > 1) { - --len; - // The prefix ends with the second last '.', so search for it. - for (int i = 0; len != 0; --len) { - if (sub[len] == '.' && ++i == 2) { - prefix = std::string(sub, len + 1); - break; - } - } - } - } - - TDF_Label label; - std::vector links; - - int depth = 0; - auto linked = obj; - auto linkedShape = shape; - while (true) { - auto s = Part::Feature::getTopoShape(linked); - if (s.isNull() || !s.getShape().IsPartner(shape.getShape())) { - break; - } - linkedShape = s; - // Search using our own cache. We can't rely on ShapeTool::FindShape() - // in case this is an assembly. Because FindShape() search among its - // own computed shape, i.e. its own created compound, and thus will - // never match ours. - auto it = myObjects.find(linked); - if (it != myObjects.end()) { - for (auto l : links) { - myObjects.emplace(l, it->second); - } - // Note: OCAF does not seem to support reference of references. We - // have to flaten all multi-level link without scales. In other - // word, all link will all be forced to refer to the same - // non-located shape - - // retrieve OCAF computed shape, in case the current object returns - // a new shape every time Part::Feature::getTopoShape() is called. - auto baseShape = aShapeTool->GetShape(it->second); - shape.setShape(baseShape.Located(shape.getShape().Location())); - if (!parent.IsNull()) { - label = aShapeTool->AddComponent(parent, shape.getShape(), Standard_False); - } - else { - label = aShapeTool->AddShape(shape.getShape(), Standard_False, Standard_False); - } - setupObject(label, name ? parentObj : obj, shape, prefix, name); - return label; - } - auto next = linked->getLinkedObject(false, nullptr, false, depth++); - if (!next || linked == next) { - break; - } - linked = next; - links.push_back(linked); - } - - auto subs = obj->getSubObjects(); - // subs empty means obj is not a container. - if (subs.empty()) { - - if (!parent.IsNull()) { - // Search for non-located shape to see if we've stored the original shape before - if (!aShapeTool->FindShape(shape.getShape(), label)) { - auto baseShape = linkedShape; - auto linked = links.empty() ? obj : links.back(); - baseShape.setShape(baseShape.getShape().Located(TopLoc_Location())); - label = aShapeTool->NewShape(); - aShapeTool->SetShape(label, baseShape.getShape()); - setupObject(label, linked, baseShape, prefix); - } - - label = aShapeTool->AddComponent(parent, shape.getShape(), Standard_False); - setupObject(label, name ? parentObj : obj, shape, prefix, name); - } - else { - // Here means we are exporting a single non-assembly object. We must - // not call setupObject() on a non-located baseshape like above, - // because OCCT does not respect shape style sharing when not - // exporting assembly - if (!options.keepPlacement || shape.getPlacement() == Base::Placement()) { - shape.setShape(shape.getShape().Located(TopLoc_Location())); - } - else { - Base::Matrix4D mat = shape.getTransform(); - shape.setShape(shape.getShape().Located(TopLoc_Location())); - // Transform with copy to conceal the transformation - shape.transformShape(mat, true); - // Even if the shape has no transformation, TopoShape still sets - // a TopLoc_Location, so we need to clear it again. - shape.setShape(shape.getShape().Located(TopLoc_Location())); - } - label = aShapeTool->AddShape(shape.getShape(), Standard_False, Standard_False); - auto o = name ? parentObj : obj; - if (o != linked) { - setupObject(label, linked, shape, prefix, nullptr, true); - } - setupObject(label, o, shape, prefix, name, true); - } - - myObjects.emplace(obj, label); - for (auto link : links) { - myObjects.emplace(link, label); - } - return label; - } - - if (obj->getExtensionByType(true) - || obj->getExtensionByType(true)) { - groupLinks.push_back(obj); - } - - // Create a new assembly - label = aShapeTool->NewShape(); - - // check for link array - auto linkArray = obj->getLinkedObject(true)->getExtensionByType(true); - if (linkArray && (linkArray->getShowElementValue() || !linkArray->getElementCountValue())) { - linkArray = nullptr; - } - for (auto& subobj : subs) { - App::DocumentObject* parentGrp = nullptr; - std::string childName; - auto sobj = obj->resolve(subobj.c_str(), &parentGrp, &childName); - if (!sobj) { - FC_WARN("Cannot find object " << obj->getFullName() << '.' << subobj); - continue; - } - int vis = -1; - if (parentGrp) { - if (!groupLinks.empty() - && parentGrp->getExtensionByType(true, false)) { - vis = groupLinks.back()->isElementVisible(childName.c_str()); - } - else { - vis = parentGrp->isElementVisible(childName.c_str()); - } - } - - if (vis < 0) { - vis = sobj->Visibility.getValue() ? 1 : 0; - } - - if (!vis && !options.exportHidden) { - continue; - } - - TDF_Label childLabel = - exportObject(obj, subobj.c_str(), label, linkArray ? childName.c_str() : nullptr); - if (childLabel.IsNull()) { - continue; - } - - if (!vis) { - // Work around OCCT bug. If no color setting here, it will crash. - // The culprit is at STEPCAFControl_Writer::1093 as shown below - // - // surfColor = Styles.EncodeColor(Quantity_Color(1,1,1,OCC_COLOR_SPACE),DPDCs,ColRGBs); - // PSA = Styles.MakeColorPSA ( item, surfColor, curvColor, isComponent ); - // if ( isComponent ) - // setDefaultInstanceColor( override, PSA); - // - // Can be fixed with following - // if ( !override.IsNull() && isComponent ) - // setDefaultInstanceColor( override, PSA); - // - auto childShape = aShapeTool->GetShape(childLabel); - Quantity_ColorRGBA col; - if (!aColorTool->GetInstanceColor(childShape, XCAFDoc_ColorGen, col) - && !aColorTool->GetInstanceColor(childShape, XCAFDoc_ColorSurf, col) - && !aColorTool->GetInstanceColor(childShape, XCAFDoc_ColorCurv, col)) { - auto& c = options.defaultColor; - aColorTool->SetColor(childLabel, convertColor(c), XCAFDoc_ColorGen); - FC_WARN(labelName(childLabel) << " set default color"); - } - aColorTool->SetVisibility(childLabel, Standard_False); - } - } - - if (!groupLinks.empty() && groupLinks.back() == obj) { - groupLinks.pop_back(); - } - - // Finished adding components. Now retrieve the computed non-located shape - auto baseShape = shape; - baseShape.setShape(aShapeTool->GetShape(label)); - - myObjects.emplace(obj, label); - for (auto link : links) { - myObjects.emplace(link, label); - } - - if (!parent.IsNull() && !links.empty()) { - linked = links.back(); - } - else { - linked = obj; - } - setupObject(label, linked, baseShape, prefix); - - if (!parent.IsNull()) { - // If we are a component, swap in the base shape but keep our location. - shape.setShape(baseShape.getShape().Located(shape.getShape().Location())); - label = aShapeTool->AddComponent(parent, label, shape.getShape().Location()); - setupObject(label, name ? parentObj : obj, shape, prefix, name); - } - return label; -} - -bool ExportOCAF2::canFallback(std::vector objs) -{ - for (size_t i = 0; i < objs.size(); ++i) { - auto obj = objs[i]; - if (!obj || !obj->getNameInDocument()) { - continue; - } - if (obj->getExtensionByType(true)) { - return false; - } - for (auto& sub : obj->getSubObjects()) { - objs.push_back(obj->getSubObject(sub.c_str())); - } - } - return true; + partColors[part] = colors; } diff --git a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h index 45f434ea4c..17cf8a7df9 100644 --- a/src/Mod/Import/App/ImportOCAF2.h +++ b/src/Mod/Import/App/ImportOCAF2.h @@ -41,6 +41,7 @@ #include "ExportOCAF.h" #include "ImportOCAF.h" +#include "Tools.h" class TDF_Label; @@ -59,22 +60,6 @@ class Feature; namespace Import { -struct ShapeHasher -{ - std::size_t operator()(const TopoDS_Shape& s) const - { - return s.HashCode(INT_MAX); - } -}; - -struct LabelHasher -{ - std::size_t operator()(const TDF_Label& l) const - { - return TDF_LabelMapHasher::HashCode(l, INT_MAX); - } -}; - struct ImportExport ImportOCAFOptions { ImportOCAFOptions(); @@ -228,6 +213,17 @@ private: Base::SequencerLauncher* sequencer {nullptr}; }; +class ImportExport ImportOCAFExt: public ImportOCAF2 +{ +public: + ImportOCAFExt(Handle(TDocStd_Document) hStdDoc, App::Document* doc, const std::string& name); + + std::map> partColors; + +private: + void applyFaceColors(Part::Feature* part, const std::vector& colors) override; +}; + struct ImportExport ExportOCAFOptions { ExportOCAFOptions(); diff --git a/src/Mod/Import/App/PreCompiled.h b/src/Mod/Import/App/PreCompiled.h index 1f00597316..0343a3c77b 100644 --- a/src/Mod/Import/App/PreCompiled.h +++ b/src/Mod/Import/App/PreCompiled.h @@ -49,6 +49,10 @@ #include #include +// boost +#include +#include + // OpenCasCade ===================================================================================== // Base #include diff --git a/src/Mod/Import/App/ReaderGltf.cpp b/src/Mod/Import/App/ReaderGltf.cpp index a32b2f42dc..4fd2449352 100644 --- a/src/Mod/Import/App/ReaderGltf.cpp +++ b/src/Mod/Import/App/ReaderGltf.cpp @@ -24,30 +24,37 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include #include +#if OCC_VERSION_HEX >= 0x070500 +#include +#include +#include +#include #include #include #include +#include #include -#if OCC_VERSION_HEX >= 0x070500 -#include -#include +#include +#include #endif #endif #include "ReaderGltf.h" +#include "Tools.h" #include #include #include using namespace Import; -ReaderGltf::ReaderGltf(const Base::FileInfo& file) // NOLINT +// NOLINTNEXTLINE +ReaderGltf::ReaderGltf(const Base::FileInfo& file) : file {file} {} -void ReaderGltf::read(Handle(TDocStd_Document) hDoc) // NOLINT +// NOLINTNEXTLINE +void ReaderGltf::read(Handle(TDocStd_Document) hDoc) { #if OCC_VERSION_HEX >= 0x070500 const double unit = 0.001; // mm @@ -60,27 +67,82 @@ void ReaderGltf::read(Handle(TDocStd_Document) hDoc) // NOLINT TCollection_AsciiString filename(file.filePath().c_str()); Standard_Boolean ret = aReader.Perform(filename, Message_ProgressRange()); if (!ret) { - std::stringstream str; - str << "Cannot read from file '" - << "" << file.filePath() << "'"; + throw Base::FileException("Cannot read from file: ", file); } - Handle(XCAFDoc_ShapeTool) aShapeTool = XCAFDoc_DocumentTool::ShapeTool(hDoc->Main()); - TDF_LabelSequence labels; - aShapeTool->GetShapes(labels); - for (Standard_Integer i = 1; i <= labels.Length(); i++) { - auto label = labels.Value(i); - TopoDS_Shape shape = aShapeTool->GetShape(label); - if (!shape.IsNull()) { - aShapeTool->SetShape(label, fixShape(shape)); - } - } + processDocument(hDoc); #else + (void)hDoc; throw Base::RuntimeError("gITF support requires OCCT 7.5.0 or later"); #endif } +// NOLINTNEXTLINE +void ReaderGltf::processDocument(Handle(TDocStd_Document) hDoc) +{ +#if OCC_VERSION_HEX >= 0x070500 + Handle(XCAFDoc_ShapeTool) aShapeTool = XCAFDoc_DocumentTool::ShapeTool(hDoc->Main()); + + TDF_LabelSequence shapeLabels; + aShapeTool->GetShapes(shapeLabels); + for (Standard_Integer i = 1; i <= shapeLabels.Length(); i++) { + auto topLevelshape = shapeLabels.Value(i); + TopoDS_Shape shape = aShapeTool->GetShape(topLevelshape); + if (!shape.IsNull()) { + TDF_LabelSequence subShapeLabels; + if (XCAFDoc_ShapeTool::GetSubShapes(topLevelshape, subShapeLabels)) { + TopoDS_Shape compound = processSubShapes(hDoc, subShapeLabels); + aShapeTool->SetShape(topLevelshape, compound); + } + else { + aShapeTool->SetShape(topLevelshape, fixShape(shape)); + } + } + } +#endif +} + +// NOLINTNEXTLINE +TopoDS_Shape ReaderGltf::processSubShapes(Handle(TDocStd_Document) hDoc, + const TDF_LabelSequence& subShapeLabels) +{ + TopoDS_Compound compound; +#if OCC_VERSION_HEX >= 0x070500 + Handle(XCAFDoc_ShapeTool) aShapeTool = XCAFDoc_DocumentTool::ShapeTool(hDoc->Main()); + Handle(XCAFDoc_ColorTool) aColorTool = XCAFDoc_DocumentTool::ColorTool(hDoc->Main()); + Handle(XCAFDoc_VisMaterialTool) aVisTool = XCAFDoc_DocumentTool::VisMaterialTool(hDoc->Main()); + + BRep_Builder builder; + builder.MakeCompound(compound); + for (Standard_Integer i = 1; i <= subShapeLabels.Length(); i++) { + auto faceLabel = subShapeLabels.Value(i); + + // OCCT handles colors of a glTF with material labels but the ImportOCAF(2) class + // expects color labels. Thus, the material labels are converted into color labels. + Handle(XCAFDoc_VisMaterial) aVisMat = aVisTool->GetShapeMaterial(faceLabel); + + Quantity_ColorRGBA rgba; + bool hasVisMat {false}; + if (!aVisMat.IsNull()) { + rgba = aVisMat->BaseColor(); + hasVisMat = true; + } + + TopoDS_Shape face = aShapeTool->GetShape(faceLabel); + TopoDS_Shape fixed = fixShape(face); + builder.Add(compound, fixed); + aShapeTool->SetShape(faceLabel, fixed); + + if (hasVisMat) { + aColorTool->SetColor(faceLabel, rgba, XCAFDoc_ColorSurf); + } + } +#endif + + return {std::move(compound)}; +} + bool ReaderGltf::cleanup() const { return clean; diff --git a/src/Mod/Import/App/ReaderGltf.h b/src/Mod/Import/App/ReaderGltf.h index 5925100bba..2b6e9f9895 100644 --- a/src/Mod/Import/App/ReaderGltf.h +++ b/src/Mod/Import/App/ReaderGltf.h @@ -27,6 +27,7 @@ #include #include #include +#include #include namespace Import @@ -43,6 +44,9 @@ public: private: TopoDS_Shape fixShape(TopoDS_Shape); + void processDocument(Handle(TDocStd_Document) hDoc); + TopoDS_Shape processSubShapes(Handle(TDocStd_Document) hDoc, + const TDF_LabelSequence& subShapeLabels); private: Base::FileInfo file; diff --git a/src/Mod/Import/App/ReaderIges.cpp b/src/Mod/Import/App/ReaderIges.cpp new file mode 100644 index 0000000000..22171052e2 --- /dev/null +++ b/src/Mod/Import/App/ReaderIges.cpp @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif + +#include "ReaderIges.h" +#include +#include +#include +#include + +using namespace Import; + +ReaderIges::ReaderIges(const Base::FileInfo& file) // NOLINT + : file {file} +{} + +void ReaderIges::read(Handle(TDocStd_Document) hDoc) // NOLINT +{ + Base::Reference hGrp = App::GetApplication() + .GetUserParameter() + .GetGroup("BaseApp") + ->GetGroup("Preferences") + ->GetGroup("Mod/Part") + ->GetGroup("IGES"); + std::string utf8Name = file.filePath(); + std::string name8bit = Part::encodeFilename(utf8Name); + + IGESControl_Controller::Init(); + IGESCAFControl_Reader aReader; + // http://www.opencascade.org/org/forum/thread_20603/?forum=3 + aReader.SetReadVisible(hGrp->GetBool("SkipBlankEntities", true)); + aReader.SetColorMode(true); + aReader.SetNameMode(true); + aReader.SetLayerMode(true); + if (aReader.ReadFile(name8bit.c_str()) != IFSelect_RetDone) { + throw Base::FileException("Cannot read IGES file", file); + } + +#if OCC_VERSION_HEX < 0x070500 + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); + aReader.WS()->MapReader()->SetProgress(pi); + pi->NewScope(100, "Reading IGES file..."); + pi->Show(); +#endif + aReader.Transfer(hDoc); +#if OCC_VERSION_HEX < 0x070500 + pi->EndScope(); +#endif + // http://opencascade.blogspot.de/2009/03/unnoticeable-memory-leaks-part-2.html + Handle(IGESToBRep_Actor)::DownCast(aReader.WS()->TransferReader()->Actor()) + ->SetModel(new IGESData_IGESModel); +} diff --git a/src/Gui/NavigationAnimator.h b/src/Mod/Import/App/ReaderIges.h similarity index 55% rename from src/Gui/NavigationAnimator.h rename to src/Mod/Import/App/ReaderIges.h index d3d654560f..7e6cddf37b 100644 --- a/src/Gui/NavigationAnimator.h +++ b/src/Mod/Import/App/ReaderIges.h @@ -1,55 +1,47 @@ // SPDX-License-Identifier: LGPL-2.1-or-later -/**************************************************************************** - * * - * Copyright (c) 2023 Bas Ruigrok (Rexbas) * - * * - * This file is part of FreeCAD. * - * * - * FreeCAD is free software: you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation, either version 2.1 of the * - * License, or (at your option) any later version. * - * * - * FreeCAD is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with FreeCAD. If not, see * - * . * - * * - ***************************************************************************/ -#ifndef GUI_NAVIGATIONANIMATOR_H -#define GUI_NAVIGATIONANIMATOR_H +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ -#include "NavigationStyle.h" -#include -#include +#ifndef IMPORT_READER_IGES_H +#define IMPORT_READER_IGES_H -namespace Gui +#include +#include +#include + +namespace Import { -class NavigationAnimation; - -class GuiExport NavigationAnimator : public QObject +class ImportExport ReaderIges { - Q_OBJECT public: - NavigationAnimator(); - ~NavigationAnimator(); - void start(const std::shared_ptr& animation); - bool startAndWait(const std::shared_ptr& animation); - void stop(); + explicit ReaderIges(const Base::FileInfo& file); -private Q_SLOTS: - void reset(); + void read(Handle(TDocStd_Document) hDoc); private: - std::shared_ptr activeAnimation; + Base::FileInfo file; }; -} // namespace Gui +} // namespace Import -#endif // GUI_NAVIGATIONANIMATOR_H +#endif // IMPORT_READER_IGES_H diff --git a/src/Mod/Import/App/ReaderStep.cpp b/src/Mod/Import/App/ReaderStep.cpp new file mode 100644 index 0000000000..47cbb48f5b --- /dev/null +++ b/src/Mod/Import/App/ReaderStep.cpp @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#include +#include +#endif + +#include "ReaderStep.h" +#include +#include +#include + +using namespace Import; + +ReaderStep::ReaderStep(const Base::FileInfo& file) // NOLINT + : file {file} +{} + +void ReaderStep::read(Handle(TDocStd_Document) hDoc) // NOLINT +{ + std::string utf8Name = file.filePath(); + std::string name8bit = Part::encodeFilename(utf8Name); + STEPCAFControl_Reader aReader; + aReader.SetColorMode(true); + aReader.SetNameMode(true); + aReader.SetLayerMode(true); + aReader.SetSHUOMode(true); + if (aReader.ReadFile(name8bit.c_str()) != IFSelect_RetDone) { + throw Base::FileException("Cannot read STEP file", file); + } + +#if OCC_VERSION_HEX < 0x070500 + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); + aReader.Reader().WS()->MapReader()->SetProgress(pi); + pi->NewScope(100, "Reading STEP file..."); + pi->Show(); +#endif + aReader.Transfer(hDoc); +#if OCC_VERSION_HEX < 0x070500 + pi->EndScope(); +#endif +} diff --git a/src/Mod/Import/App/ReaderStep.h b/src/Mod/Import/App/ReaderStep.h new file mode 100644 index 0000000000..febd1760a3 --- /dev/null +++ b/src/Mod/Import/App/ReaderStep.h @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef IMPORT_READER_STEP_H +#define IMPORT_READER_STEP_H + +#include +#include +#include + +namespace Import +{ + +class ImportExport ReaderStep +{ +public: + explicit ReaderStep(const Base::FileInfo& file); + + void read(Handle(TDocStd_Document) hDoc); + +private: + Base::FileInfo file; +}; + +} // namespace Import + +#endif // IMPORT_READER_STEP_H diff --git a/src/Mod/Import/App/Tools.cpp b/src/Mod/Import/App/Tools.cpp new file mode 100644 index 0000000000..f052043952 --- /dev/null +++ b/src/Mod/Import/App/Tools.cpp @@ -0,0 +1,145 @@ +/**************************************************************************** + * Copyright (c) 2018 Zheng, Lei (realthunder) * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ****************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#endif + +#include +#include + +#include "Tools.h" +#include +#include + +#if OCC_VERSION_HEX >= 0x070500 +// See https://dev.opencascade.org/content/occt-3d-viewer-becomes-srgb-aware +#define OCC_COLOR_SPACE Quantity_TOC_sRGB +#else +#define OCC_COLOR_SPACE Quantity_TOC_RGB +#endif + +FC_LOG_LEVEL_INIT("Import", true, true) + +using namespace Import; + +App::Color Tools::convertColor(const Quantity_ColorRGBA& rgba) +{ + Standard_Real red, green, blue; + rgba.GetRGB().Values(red, green, blue, OCC_COLOR_SPACE); + return App::Color(static_cast(red), + static_cast(green), + static_cast(blue), + 1.0f - static_cast(rgba.Alpha())); +} + +Quantity_ColorRGBA Tools::convertColor(const App::Color& col) +{ + return Quantity_ColorRGBA(Quantity_Color(col.r, col.g, col.b, OCC_COLOR_SPACE), 1.0f - col.a); +} + +static inline std::ostream& operator<<(std::ostream& os, const Quantity_ColorRGBA& rgba) +{ + App::Color color = Tools::convertColor(rgba); + auto toHex = [](float v) { + return boost::format("%02X") % static_cast(v * 255); + }; + return os << "#" << toHex(color.r) << toHex(color.g) << toHex(color.b) << toHex(color.a); +} + +std::string Tools::labelName(TDF_Label label) +{ + std::string txt; + Handle(TDataStd_Name) name; + if (!label.IsNull() && label.FindAttribute(TDataStd_Name::GetID(), name)) { + TCollection_ExtendedString extstr = name->Get(); + char* str = new char[extstr.LengthOfCString() + 1]; + extstr.ToUTF8CString(str); + txt = str; + delete[] str; + boost::trim(txt); + } + return txt; +} + +void Tools::printLabel(TDF_Label label, + Handle(XCAFDoc_ShapeTool) aShapeTool, + Handle(XCAFDoc_ColorTool) aColorTool, + const char* msg) +{ + if (label.IsNull() || !FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) { + return; + } + if (!msg) { + msg = "Label: "; + } + TCollection_AsciiString entry; + TDF_Tool::Entry(label, entry); + std::ostringstream ss; + ss << msg << entry << ", " << labelName(label) << (aShapeTool->IsShape(label) ? ", shape" : "") + << (aShapeTool->IsTopLevel(label) ? ", topLevel" : "") + << (aShapeTool->IsFree(label) ? ", free" : "") + << (aShapeTool->IsAssembly(label) ? ", assembly" : "") + << (aShapeTool->IsSimpleShape(label) ? ", simple" : "") + << (aShapeTool->IsCompound(label) ? ", compound" : "") + << (aShapeTool->IsReference(label) ? ", reference" : "") + << (aShapeTool->IsComponent(label) ? ", component" : "") + << (aShapeTool->IsSubShape(label) ? ", subshape" : ""); + if (aShapeTool->IsSubShape(label)) { + auto shape = aShapeTool->GetShape(label); + if (!shape.IsNull()) { + ss << ", " << Part::TopoShape::shapeName(shape.ShapeType(), true); + } + } + if (aShapeTool->IsShape(label)) { + Quantity_ColorRGBA c; + if (aColorTool->GetColor(label, XCAFDoc_ColorGen, c)) { + ss << ", gc: " << c; + } + if (aColorTool->GetColor(label, XCAFDoc_ColorSurf, c)) { + ss << ", sc: " << c; + } + if (aColorTool->GetColor(label, XCAFDoc_ColorCurv, c)) { + ss << ", cc: " << c; + } + } + + ss << std::endl; + Base::Console().Notify("ImportOCAF2", ss.str().c_str()); +} + +void Tools::dumpLabels(TDF_Label label, + Handle(XCAFDoc_ShapeTool) aShapeTool, + Handle(XCAFDoc_ColorTool) aColorTool, + int depth) +{ + std::string indent(depth * 2, ' '); + printLabel(label, aShapeTool, aColorTool, indent.c_str()); + TDF_ChildIterator it; + for (it.Initialize(label); it.More(); it.Next()) { + dumpLabels(it.Value(), aShapeTool, aColorTool, depth + 1); + } +} diff --git a/src/Mod/Import/App/Tools.h b/src/Mod/Import/App/Tools.h new file mode 100644 index 0000000000..dc0ba5a7bb --- /dev/null +++ b/src/Mod/Import/App/Tools.h @@ -0,0 +1,70 @@ +/**************************************************************************** + * Copyright (c) 2018 Zheng, Lei (realthunder) * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ****************************************************************************/ + +#ifndef IMPORT_TOOLS_H +#define IMPORT_TOOLS_H + +#include +#include +#include +#include +#include +#include + +namespace Import +{ + +struct ShapeHasher +{ + std::size_t operator()(const TopoDS_Shape& shape) const + { + return shape.HashCode(INT_MAX); + } +}; + +struct LabelHasher +{ + std::size_t operator()(const TDF_Label& label) const + { + return TDF_LabelMapHasher::HashCode(label, INT_MAX); + } +}; + +struct Tools +{ + static App::Color convertColor(const Quantity_ColorRGBA& rgba); + static Quantity_ColorRGBA convertColor(const App::Color& col); + static std::string labelName(TDF_Label label); + static void printLabel(TDF_Label label, + Handle(XCAFDoc_ShapeTool) aShapeTool, + Handle(XCAFDoc_ColorTool) aColorTool, + const char* msg = nullptr); + + static void dumpLabels(TDF_Label label, + Handle(XCAFDoc_ShapeTool) aShapeTool, + Handle(XCAFDoc_ColorTool) aColorTool, + int depth = 0); +}; + +} // namespace Import + +#endif // IMPORT_IMPORTOCAF2_H diff --git a/src/Mod/Import/App/WriterGltf.cpp b/src/Mod/Import/App/WriterGltf.cpp index e6cb037fd0..43ef543c4a 100644 --- a/src/Mod/Import/App/WriterGltf.cpp +++ b/src/Mod/Import/App/WriterGltf.cpp @@ -24,7 +24,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include #include #include #if OCC_VERSION_HEX >= 0x070500 @@ -35,16 +34,19 @@ #include "WriterGltf.h" #include +#include using namespace Import; -WriterGltf::WriterGltf(std::string name8bit, const Base::FileInfo& file) // NOLINT - : name8bit {std::move(name8bit)} - , file {file} +WriterGltf::WriterGltf(const Base::FileInfo& file) // NOLINT + : file {file} {} void WriterGltf::write(Handle(TDocStd_Document) hDoc) const // NOLINT { + std::string utf8Name = file.filePath(); + std::string name8bit = Part::encodeFilename(utf8Name); + #if OCC_VERSION_HEX >= 0x070500 TColStd_IndexedDataMapOfStringString aMetadata; RWGltf_CafWriter aWriter(name8bit.c_str(), file.hasExtension("glb")); @@ -57,9 +59,7 @@ void WriterGltf::write(Handle(TDocStd_Document) hDoc) const // NOLINT #endif Standard_Boolean ret = aWriter.Perform(hDoc, aMetadata, Message_ProgressRange()); if (!ret) { - std::stringstream str; - str << "Cannot save to file '" - << "" << file.filePath() << "'"; + throw Base::FileException("Cannot save to file: ", file); } #else throw Base::RuntimeError("gITF support requires OCCT 7.5.0 or later"); diff --git a/src/Mod/Import/App/WriterGltf.h b/src/Mod/Import/App/WriterGltf.h index 8ab4cba5e4..d7ebcf89ea 100644 --- a/src/Mod/Import/App/WriterGltf.h +++ b/src/Mod/Import/App/WriterGltf.h @@ -34,12 +34,11 @@ namespace Import class ImportExport WriterGltf { public: - WriterGltf(std::string name8bit, const Base::FileInfo& file); + explicit WriterGltf(const Base::FileInfo& file); void write(Handle(TDocStd_Document) hDoc) const; private: - std::string name8bit; Base::FileInfo file; }; } // namespace Import diff --git a/src/Mod/Import/App/WriterIges.cpp b/src/Mod/Import/App/WriterIges.cpp new file mode 100644 index 0000000000..37fe3e367f --- /dev/null +++ b/src/Mod/Import/App/WriterIges.cpp @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#include +#include +#endif + +#include "WriterIges.h" +#include +#include +#include +#include + +using namespace Import; + +WriterIges::WriterIges(const Base::FileInfo& file) // NOLINT + : file {file} +{} + +void WriterIges::write(Handle(TDocStd_Document) hDoc) const // NOLINT +{ + std::string utf8Name = file.filePath(); + std::string name8bit = Part::encodeFilename(utf8Name); + + IGESControl_Controller::Init(); + IGESCAFControl_Writer writer; + IGESData_GlobalSection header = writer.Model()->GlobalSection(); + header.SetAuthorName(new TCollection_HAsciiString(Part::Interface::writeIgesHeaderAuthor())); + header.SetCompanyName(new TCollection_HAsciiString(Part::Interface::writeIgesHeaderCompany())); + header.SetSendName(new TCollection_HAsciiString(Part::Interface::writeIgesHeaderProduct())); + writer.Model()->SetGlobalSection(header); + writer.Transfer(hDoc); + Standard_Boolean ret = writer.Write(name8bit.c_str()); + if (!ret) { + throw Base::FileException("Cannot open file: ", file); + } +} diff --git a/src/Mod/Import/App/WriterIges.h b/src/Mod/Import/App/WriterIges.h new file mode 100644 index 0000000000..4b485eafee --- /dev/null +++ b/src/Mod/Import/App/WriterIges.h @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef IMPORT_WRITER_IGES_H +#define IMPORT_WRITER_IGES_H + +#include +#include +#include + +namespace Import +{ + +class ImportExport WriterIges +{ +public: + explicit WriterIges(const Base::FileInfo& file); + + void write(Handle(TDocStd_Document) hDoc) const; + +private: + Base::FileInfo file; +}; +} // namespace Import + +#endif // IMPORT_WRITER_IGES_H diff --git a/src/Mod/Import/App/WriterStep.cpp b/src/Mod/Import/App/WriterStep.cpp new file mode 100644 index 0000000000..31165b2cd2 --- /dev/null +++ b/src/Mod/Import/App/WriterStep.cpp @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#endif + +#include "WriterStep.h" +#include +#include +#include +#include + +using namespace Import; + +WriterStep::WriterStep(const Base::FileInfo& file) // NOLINT + : file {file} +{} + +void WriterStep::write(Handle(TDocStd_Document) hDoc) const // NOLINT +{ + std::string utf8Name = file.filePath(); + std::string name8bit = Part::encodeFilename(utf8Name); + + STEPCAFControl_Writer writer; + Part::Interface::writeStepAssembly(Part::Interface::Assembly::On); + writer.Transfer(hDoc, STEPControl_AsIs); + + APIHeaderSection_MakeHeader makeHeader(writer.ChangeWriter().Model()); + Base::Reference hGrp = App::GetApplication() + .GetUserParameter() + .GetGroup("BaseApp") + ->GetGroup("Preferences") + ->GetGroup("Mod/Part") + ->GetGroup("STEP"); + + // Don't set name because STEP doesn't support UTF-8 + // https://forum.freecad.org/viewtopic.php?f=8&t=52967 + makeHeader.SetAuthorValue( + 1, + new TCollection_HAsciiString(hGrp->GetASCII("Author", "Author").c_str())); + makeHeader.SetOrganizationValue( + 1, + new TCollection_HAsciiString(hGrp->GetASCII("Company").c_str())); + makeHeader.SetOriginatingSystem( + new TCollection_HAsciiString(App::Application::getExecutableName().c_str())); + makeHeader.SetDescriptionValue(1, new TCollection_HAsciiString("FreeCAD Model")); + IFSelect_ReturnStatus ret = writer.Write(name8bit.c_str()); + if (ret == IFSelect_RetError || ret == IFSelect_RetFail || ret == IFSelect_RetStop) { + throw Base::FileException("Cannot open file: ", file); + } +} diff --git a/src/Mod/Import/App/WriterStep.h b/src/Mod/Import/App/WriterStep.h new file mode 100644 index 0000000000..1e7c32d258 --- /dev/null +++ b/src/Mod/Import/App/WriterStep.h @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef IMPORT_WRITER_STEP_H +#define IMPORT_WRITER_STEP_H + +#include +#include +#include + +namespace Import +{ + +class ImportExport WriterStep +{ +public: + explicit WriterStep(const Base::FileInfo& file); + + void write(Handle(TDocStd_Document) hDoc) const; + +private: + Base::FileInfo file; +}; +} // namespace Import + +#endif // IMPORT_WRITER_GLTF_H diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp index 0228cdb37f..3043938f41 100644 --- a/src/Mod/Import/Gui/AppImportGuiPy.cpp +++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp @@ -28,72 +28,29 @@ #include #include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wextra-semi" #endif -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if OCC_VERSION_HEX >= 0x070500 -#include -#endif #if defined(__clang__) #pragma clang diagnostic pop #endif #endif +#include "ExportOCAFGui.h" +#include "ImportOCAFGui.h" +#include "OCAFBrowser.h" + #include #include #include @@ -103,9 +60,12 @@ #include #include #include -#include #include +#include +#include #include +#include +#include #include #include #include @@ -120,252 +80,6 @@ FC_LOG_LEVEL_INIT("Import", true, true) namespace ImportGui { -class OCAFBrowser -{ -public: - explicit OCAFBrowser(Handle(TDocStd_Document) h) - : pDoc(h) - { - myGroupIcon = QApplication::style()->standardIcon(QStyle::SP_DirIcon); - - TDataStd::IDList(myList); - myList.Append(TDataStd_TreeNode::GetDefaultTreeID()); - myList.Append(TDataStd_Integer::GetID()); - myList.Append(TDocStd_Owner::GetID()); - myList.Append(TNaming_NamedShape::GetID()); - myList.Append(TNaming_UsedShapes::GetID()); - myList.Append(XCAFDoc_Color::GetID()); - myList.Append(XCAFDoc_ColorTool::GetID()); - myList.Append(XCAFDoc_LayerTool::GetID()); - myList.Append(XCAFDoc_ShapeTool::GetID()); - myList.Append(XCAFDoc_ShapeMapTool::GetID()); - myList.Append(XCAFDoc_Location::GetID()); - } - - void load(QTreeWidget*); - -private: - void load(const TDF_Label& label, QTreeWidgetItem* item, const QString&); - std::string toString(const TCollection_ExtendedString& extstr) const - { - char* str = new char[extstr.LengthOfCString() + 1]; - extstr.ToUTF8CString(str); - std::string text(str); - delete[] str; - return text; - } - -private: - QIcon myGroupIcon; - TDF_IDList myList; - Handle(TDocStd_Document) pDoc; -}; - -void OCAFBrowser::load(QTreeWidget* theTree) -{ - theTree->clear(); - - QTreeWidgetItem* root = new QTreeWidgetItem(); - root->setText(0, QLatin1String("0")); - root->setIcon(0, myGroupIcon); - theTree->addTopLevelItem(root); - - load(pDoc->GetData()->Root(), root, QString::fromLatin1("0")); -} - -void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QString& s) -{ - label.Dump(std::cout); - - Handle(TDataStd_Name) name; - if (label.FindAttribute(TDataStd_Name::GetID(), name)) { - QString text = - QString::fromLatin1("%1 %2").arg(s, QString::fromUtf8(toString(name->Get()).c_str())); - item->setText(0, text); - } - - - TDF_IDList localList; - TDF_AttributeIterator itr(label); - for (; itr.More(); itr.Next()) { - localList.Append(itr.Value()->ID()); - } - - for (TDF_ListIteratorOfIDList it(localList); it.More(); it.Next()) { - Handle(TDF_Attribute) attr; - if (label.FindAttribute(it.Value(), attr)) { - QTreeWidgetItem* child = new QTreeWidgetItem(); - item->addChild(child); - if (it.Value() == TDataStd_Name::GetID()) { - QString text; - QTextStream str(&text); - str << attr->DynamicType()->Name(); - str << " = " << toString(Handle(TDataStd_Name)::DownCast(attr)->Get()).c_str(); - child->setText(0, text); - } - else if (it.Value() == TDF_TagSource::GetID()) { - QString text; - QTextStream str(&text); - str << attr->DynamicType()->Name(); - str << " = " << Handle(TDF_TagSource)::DownCast(attr)->Get(); - child->setText(0, text); - } - else if (it.Value() == TDataStd_Integer::GetID()) { - QString text; - QTextStream str(&text); - str << attr->DynamicType()->Name(); - str << " = " << Handle(TDataStd_Integer)::DownCast(attr)->Get(); - child->setText(0, text); - } - else if (it.Value() == TNaming_NamedShape::GetID()) { - TopoDS_Shape shape = Handle(TNaming_NamedShape)::DownCast(attr)->Get(); - QString text; - QTextStream str(&text); - str << attr->DynamicType()->Name() << " = "; - if (!shape.IsNull()) { - switch (shape.ShapeType()) { - case TopAbs_COMPOUND: - str << "COMPOUND PRIMITIVE"; - break; - case TopAbs_COMPSOLID: - str << "COMPSOLID PRIMITIVE"; - break; - case TopAbs_SOLID: - str << "SOLID PRIMITIVE"; - break; - case TopAbs_SHELL: - str << "SHELL PRIMITIVE"; - break; - case TopAbs_FACE: - str << "FACE PRIMITIVE"; - break; - case TopAbs_WIRE: - str << "WIRE PRIMITIVE"; - break; - case TopAbs_EDGE: - str << "EDGE PRIMITIVE"; - break; - case TopAbs_VERTEX: - str << "VERTEX PRIMITIVE"; - break; - case TopAbs_SHAPE: - str << "SHAPE PRIMITIVE"; - break; - } - } - child->setText(0, text); - } - else { - child->setText(0, QLatin1String(attr->DynamicType()->Name())); - } - } - } - - - int i = 1; - for (TDF_ChildIterator it(label); it.More(); it.Next(), i++) { - QString text = QString::fromLatin1("%1:%2").arg(s).arg(i); - QTreeWidgetItem* child = new QTreeWidgetItem(); - child->setText(0, text); - child->setIcon(0, myGroupIcon); - item->addChild(child); - load(it.Value(), child, text); - } -} - -class ImportOCAFExt: public Import::ImportOCAF2 -{ -public: - ImportOCAFExt(Handle(TDocStd_Document) h, App::Document* d, const std::string& name) - : ImportOCAF2(h, d, name) - {} - -private: - void applyFaceColors(Part::Feature* part, const std::vector& colors) override - { - auto vp = dynamic_cast( - Gui::Application::Instance->getViewProvider(part)); - if (!vp) { - return; - } - if (colors.empty()) { - return; - } - - if (colors.size() == 1) { - vp->ShapeColor.setValue(colors.front()); - vp->Transparency.setValue(100 * colors.front().a); - } - else { - vp->DiffuseColor.setValues(colors); - } - } - void applyEdgeColors(Part::Feature* part, const std::vector& colors) override - { - auto vp = dynamic_cast( - Gui::Application::Instance->getViewProvider(part)); - if (!vp) { - return; - } - if (colors.size() == 1) { - vp->LineColor.setValue(colors.front()); - } - else { - vp->LineColorArray.setValues(colors); - } - } - void applyLinkColor(App::DocumentObject* obj, int index, App::Color color) override - { - auto vp = - dynamic_cast(Gui::Application::Instance->getViewProvider(obj)); - if (!vp) { - return; - } - if (index < 0) { - vp->OverrideMaterial.setValue(true); - vp->ShapeMaterial.setDiffuseColor(color); - return; - } - if (vp->OverrideMaterialList.getSize() <= index) { - vp->OverrideMaterialList.setSize(index + 1); - } - vp->OverrideMaterialList.set1Value(index, true); - App::Material mat(App::Material::DEFAULT); - if (vp->MaterialList.getSize() <= index) { - vp->MaterialList.setSize(index + 1, mat); - } - mat.diffuseColor = color; - vp->MaterialList.set1Value(index, mat); - } - void applyElementColors(App::DocumentObject* obj, - const std::map& colors) override - { - auto vp = Gui::Application::Instance->getViewProvider(obj); - if (!vp) { - return; - } - (void)colors; - } -}; - -class ExportOCAFGui: public Import::ExportOCAF -{ -public: - ExportOCAFGui(Handle(TDocStd_Document) h, bool explicitPlacement) - : ExportOCAF(h, explicitPlacement) - {} - void findColors(Part::Feature* part, std::vector& colors) const override - { - Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(part); - if (vp && vp->isDerivedFrom(PartGui::ViewProviderPartExt::getClassTypeId())) { - colors = static_cast(vp)->DiffuseColor.getValues(); - if (colors.empty()) { - colors.push_back( - static_cast(vp)->ShapeColor.getValue()); - } - } - } -}; class Module: public Py::ExtensionModule { @@ -435,8 +149,8 @@ private: Handle(XCAFApp_Application) hApp = XCAFApp_Application::GetApplication(); Handle(TDocStd_Document) hDoc; hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc); - ImportOCAFExt ocaf(hDoc, pcDoc, file.fileNamePure()); - ocaf.setImportOptions(ImportOCAFExt::customImportOptions()); + ImportOCAFGui ocaf(hDoc, pcDoc, file.fileNamePure()); + ocaf.setImportOptions(ImportOCAFGui::customImportOptions()); FC_TIME_INIT(t); FC_DURATION_DECL_INIT2(d1, d2); @@ -453,25 +167,8 @@ private: } try { - STEPCAFControl_Reader aReader; - aReader.SetColorMode(true); - aReader.SetNameMode(true); - aReader.SetLayerMode(true); - aReader.SetSHUOMode(true); - if (aReader.ReadFile((const char*)name8bit.c_str()) != IFSelect_RetDone) { - throw Py::Exception(PyExc_IOError, "cannot read STEP file"); - } - -#if OCC_VERSION_HEX < 0x070500 - Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); - aReader.Reader().WS()->MapReader()->SetProgress(pi); - pi->NewScope(100, "Reading STEP file..."); - pi->Show(); -#endif - aReader.Transfer(hDoc); -#if OCC_VERSION_HEX < 0x070500 - pi->EndScope(); -#endif + Import::ReaderStep reader(file); + reader.read(hDoc); } catch (OSD_Exception& e) { Base::Console().Error("%s\n", e.GetMessageString()); @@ -482,39 +179,9 @@ private: } } else if (file.hasExtension({"igs", "iges"})) { - Base::Reference hGrp = App::GetApplication() - .GetUserParameter() - .GetGroup("BaseApp") - ->GetGroup("Preferences") - ->GetGroup("Mod/Part") - ->GetGroup("IGES"); - try { - IGESControl_Controller::Init(); - IGESCAFControl_Reader aReader; - // http://www.opencascade.org/org/forum/thread_20603/?forum=3 - aReader.SetReadVisible( - hGrp->GetBool("SkipBlankEntities", true) ? Standard_True : Standard_False); - aReader.SetColorMode(true); - aReader.SetNameMode(true); - aReader.SetLayerMode(true); - if (aReader.ReadFile((const char*)name8bit.c_str()) != IFSelect_RetDone) { - throw Py::Exception(PyExc_IOError, "cannot read IGES file"); - } - -#if OCC_VERSION_HEX < 0x070500 - Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); - aReader.WS()->MapReader()->SetProgress(pi); - pi->NewScope(100, "Reading IGES file..."); - pi->Show(); -#endif - aReader.Transfer(hDoc); -#if OCC_VERSION_HEX < 0x070500 - pi->EndScope(); -#endif - // http://opencascade.blogspot.de/2009/03/unnoticeable-memory-leaks-part-2.html - Handle(IGESToBRep_Actor)::DownCast(aReader.WS()->TransferReader()->Actor()) - ->SetModel(new IGESData_IGESModel); + Import::ReaderIges reader(file); + reader.read(hDoc); } catch (OSD_Exception& e) { Base::Console().Error("%s\n", e.GetMessageString()); @@ -640,18 +307,19 @@ private: std::string Utf8Name = std::string(Name); PyMem_Free(Name); - std::string name8bit = Part::encodeFilename(Utf8Name); + // clang-format off // determine export options Part::OCAF::ImportExportSettings settings; // still support old way - bool legacyExport = - (pylegacy == Py_None ? settings.getExportLegacy() : Base::asBoolean(pylegacy)); - bool exportHidden = (pyexportHidden == Py_None ? settings.getExportHiddenObject() - : Base::asBoolean(pyexportHidden)); + bool legacyExport = (pylegacy == Py_None ? settings.getExportLegacy() + : Base::asBoolean(pylegacy)); + bool exportHidden = (pyexportHidden == Py_None ? settings.getExportHiddenObject() + : Base::asBoolean(pyexportHidden)); bool keepPlacement = (pykeepPlacement == Py_None ? settings.getExportKeepPlacement() : Base::asBoolean(pykeepPlacement)); + // clang-format on // new way if (pyoptions) { @@ -669,19 +337,19 @@ private: try { Py::Sequence list(object); - Handle(XCAFApp_Application) hApp = XCAFApp_Application::GetApplication(); - Handle(TDocStd_Document) hDoc; - hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc); - std::vector objs; for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { PyObject* item = (*it).ptr(); if (PyObject_TypeCheck(item, &(App::DocumentObjectPy::Type))) { - objs.push_back( - static_cast(item)->getDocumentObjectPtr()); + auto pydoc = static_cast(item); + objs.push_back(pydoc->getDocumentObjectPtr()); } } + Handle(XCAFApp_Application) hApp = XCAFApp_Application::GetApplication(); + Handle(TDocStd_Document) hDoc; + hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc); + Import::ExportOCAF2 ocaf(hDoc, &getShapeColors); if (!legacyExport || !ocaf.canFallback(objs)) { ocaf.setExportOptions(Import::ExportOCAF2::customExportOptions()); @@ -691,92 +359,30 @@ private: ocaf.exportObjects(objs); } else { - bool keepExplicitPlacement = Standard_True; + bool keepExplicitPlacement = true; ExportOCAFGui ocaf(hDoc, keepExplicitPlacement); - // That stuff is exporting a list of selected objects into FreeCAD Tree - std::vector hierarchical_label; - std::vector hierarchical_loc; - std::vector hierarchical_part; - for (auto obj : objs) { - ocaf.exportObject(obj, hierarchical_label, hierarchical_loc, hierarchical_part); - } - - // Free Shapes must have absolute placement and not explicit - std::vector FreeLabels; - std::vector part_id; - ocaf.getFreeLabels(hierarchical_label, FreeLabels, part_id); - // Got issue with the colors as they are coming from the View Provider they can't be - // determined into the App Code. - std::vector> Colors; - ocaf.getPartColors(hierarchical_part, FreeLabels, part_id, Colors); - ocaf.reallocateFreeShape(hierarchical_part, FreeLabels, part_id, Colors); - - XCAFDoc_DocumentTool::ShapeTool(hDoc->Main())->UpdateAssemblies(); + ocaf.exportObjects(objs); } Base::FileInfo file(Utf8Name.c_str()); if (file.hasExtension({"stp", "step"})) { - ParameterGrp::handle hGrp_stp = App::GetApplication().GetParameterGroupByPath( + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath( "User parameter:BaseApp/Preferences/Mod/Part/STEP"); - std::string scheme = - hGrp_stp->GetASCII("Scheme", Part::Interface::writeStepScheme()); + std::string scheme = hGrp->GetASCII("Scheme", Part::Interface::writeStepScheme()); std::list supported = Part::supportedSTEPSchemes(); if (std::find(supported.begin(), supported.end(), scheme) != supported.end()) { Part::Interface::writeStepScheme(scheme.c_str()); } - STEPCAFControl_Writer writer; - Part::Interface::writeStepAssembly(Part::Interface::Assembly::On); - writer.Transfer(hDoc, STEPControl_AsIs); - - // edit STEP header - APIHeaderSection_MakeHeader makeHeader(writer.ChangeWriter().Model()); - - Base::Reference hGrp = App::GetApplication() - .GetUserParameter() - .GetGroup("BaseApp") - ->GetGroup("Preferences") - ->GetGroup("Mod/Part") - ->GetGroup("STEP"); - - // Don't set name because STEP doesn't support UTF-8 - // https://forum.freecad.org/viewtopic.php?f=8&t=52967 - makeHeader.SetAuthorValue( - 1, - new TCollection_HAsciiString(hGrp->GetASCII("Author", "Author").c_str())); - makeHeader.SetOrganizationValue( - 1, - new TCollection_HAsciiString(hGrp->GetASCII("Company").c_str())); - makeHeader.SetOriginatingSystem( - new TCollection_HAsciiString(App::Application::getExecutableName().c_str())); - makeHeader.SetDescriptionValue(1, new TCollection_HAsciiString("FreeCAD Model")); - IFSelect_ReturnStatus ret = writer.Write(name8bit.c_str()); - if (ret == IFSelect_RetError || ret == IFSelect_RetFail - || ret == IFSelect_RetStop) { - PyErr_Format(PyExc_IOError, "Cannot open file '%s'", Utf8Name.c_str()); - throw Py::Exception(); - } + Import::WriterStep writer(file); + writer.write(hDoc); } else if (file.hasExtension({"igs", "iges"})) { - IGESControl_Controller::Init(); - IGESCAFControl_Writer writer; - IGESData_GlobalSection header = writer.Model()->GlobalSection(); - header.SetAuthorName( - new TCollection_HAsciiString(Part::Interface::writeIgesHeaderAuthor())); - header.SetCompanyName( - new TCollection_HAsciiString(Part::Interface::writeIgesHeaderCompany())); - header.SetSendName( - new TCollection_HAsciiString(Part::Interface::writeIgesHeaderProduct())); - writer.Model()->SetGlobalSection(header); - writer.Transfer(hDoc); - Standard_Boolean ret = writer.Write((const char*)name8bit.c_str()); - if (!ret) { - PyErr_Format(PyExc_IOError, "Cannot open file '%s'", Utf8Name.c_str()); - throw Py::Exception(); - } + Import::WriterIges writer(file); + writer.write(hDoc); } else if (file.hasExtension({"glb", "gltf"})) { - Import::WriterGltf writer(name8bit, file); + Import::WriterGltf writer(file); writer.write(hDoc); } @@ -807,87 +413,22 @@ private: hApp->NewDocument(TCollection_ExtendedString("MDTV-CAF"), hDoc); if (file.hasExtension({"stp", "step"})) { - STEPCAFControl_Reader aReader; - aReader.SetColorMode(true); - aReader.SetNameMode(true); - aReader.SetLayerMode(true); - aReader.SetSHUOMode(true); - if (aReader.ReadFile((Standard_CString)Name) != IFSelect_RetDone) { - throw Py::Exception(PyExc_IOError, "cannot read STEP file"); - } - -#if OCC_VERSION_HEX < 0x070500 - Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); - aReader.Reader().WS()->MapReader()->SetProgress(pi); - pi->NewScope(100, "Reading STEP file..."); - pi->Show(); -#endif - aReader.Transfer(hDoc); -#if OCC_VERSION_HEX < 0x070500 - pi->EndScope(); -#endif + Import::ReaderStep reader(file); + reader.read(hDoc); } else if (file.hasExtension({"igs", "iges"})) { - Base::Reference hGrp = App::GetApplication() - .GetUserParameter() - .GetGroup("BaseApp") - ->GetGroup("Preferences") - ->GetGroup("Mod/Part") - ->GetGroup("IGES"); - IGESControl_Controller::Init(); - IGESCAFControl_Reader aReader; - // http://www.opencascade.org/org/forum/thread_20603/?forum=3 - aReader.SetReadVisible(hGrp->GetBool("SkipBlankEntities", true) ? Standard_True - : Standard_False); - aReader.SetColorMode(true); - aReader.SetNameMode(true); - aReader.SetLayerMode(true); - if (aReader.ReadFile((Standard_CString)Name) != IFSelect_RetDone) { - throw Py::Exception(PyExc_IOError, "cannot read IGES file"); - } - -#if OCC_VERSION_HEX < 0x070500 - Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); - aReader.WS()->MapReader()->SetProgress(pi); - pi->NewScope(100, "Reading IGES file..."); - pi->Show(); -#endif - aReader.Transfer(hDoc); -#if OCC_VERSION_HEX < 0x070500 - pi->EndScope(); -#endif - // http://opencascade.blogspot.de/2009/03/unnoticeable-memory-leaks-part-2.html - Handle(IGESToBRep_Actor)::DownCast(aReader.WS()->TransferReader()->Actor()) - ->SetModel(new IGESData_IGESModel); + Import::ReaderIges reader(file); + reader.read(hDoc); + } + else if (file.hasExtension({"glb", "gltf"})) { + Import::ReaderGltf reader(file); + reader.read(hDoc); } else { throw Py::Exception(PyExc_IOError, "no supported file format"); } - static QPointer dlg = nullptr; - if (!dlg) { - dlg = new QDialog(Gui::getMainWindow()); - QTreeWidget* tree = new QTreeWidget(); - tree->setHeaderLabel(QString::fromLatin1("OCAF Browser")); - - QVBoxLayout* layout = new QVBoxLayout; - layout->addWidget(tree); - dlg->setLayout(layout); - - QDialogButtonBox* btn = new QDialogButtonBox(dlg); - btn->setStandardButtons(QDialogButtonBox::Close); - QObject::connect(btn, &QDialogButtonBox::rejected, dlg, &QDialog::reject); - QHBoxLayout* boxlayout = new QHBoxLayout; - boxlayout->addWidget(btn); - layout->addLayout(boxlayout); - } - - dlg->setWindowTitle(QString::fromUtf8(file.fileName().c_str())); - dlg->setAttribute(Qt::WA_DeleteOnClose); - dlg->show(); - - OCAFBrowser browse(hDoc); - browse.load(dlg->findChild()); + OCAFBrowser::showDialog(QString::fromStdString(file.fileName()), hDoc); hApp->Close(hDoc); } catch (Standard_Failure& e) { diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt index a0fae5a58d..c5ea01a5f2 100644 --- a/src/Mod/Import/Gui/CMakeLists.txt +++ b/src/Mod/Import/Gui/CMakeLists.txt @@ -1,10 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppPart -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} @@ -30,6 +23,12 @@ SET(ImportGui_SRCS AppImportGui.cpp AppImportGuiPy.cpp Command.cpp + ExportOCAFGui.cpp + ExportOCAFGui.h + ImportOCAFGui.cpp + ImportOCAFGui.h + OCAFBrowser.cpp + OCAFBrowser.h PreCompiled.cpp PreCompiled.h Workbench.cpp diff --git a/src/Mod/Import/Gui/ExportOCAFGui.cpp b/src/Mod/Import/Gui/ExportOCAFGui.cpp new file mode 100644 index 0000000000..8d92481c01 --- /dev/null +++ b/src/Mod/Import/Gui/ExportOCAFGui.cpp @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" + +#include "ExportOCAFGui.h" +#include +#include + +using namespace ImportGui; + + +ExportOCAFGui::ExportOCAFGui(Handle(TDocStd_Document) hDoc, bool explicitPlacement) + : ExportOCAF(hDoc, explicitPlacement) +{} + +void ExportOCAFGui::findColors(Part::Feature* part, std::vector& colors) const +{ + Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(part); + if (vp && vp->isDerivedFrom(PartGui::ViewProviderPartExt::getClassTypeId())) { + colors = static_cast(vp)->DiffuseColor.getValues(); + if (colors.empty()) { + colors.push_back(static_cast(vp)->ShapeColor.getValue()); + } + } +} diff --git a/src/Mod/Import/Gui/ExportOCAFGui.h b/src/Mod/Import/Gui/ExportOCAFGui.h new file mode 100644 index 0000000000..6c31b7f48d --- /dev/null +++ b/src/Mod/Import/Gui/ExportOCAFGui.h @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef IMPORT_EXPORTOCAFGUI_H +#define IMPORT_EXPORTOCAFGUI_H + +#include + +namespace ImportGui +{ + +class ExportOCAFGui: public Import::ExportOCAF +{ +public: + ExportOCAFGui(Handle(TDocStd_Document) hDoc, bool explicitPlacement); + void findColors(Part::Feature* part, std::vector& colors) const override; +}; + +} // namespace ImportGui + +#endif // IMPORT_EXPORTOCAFGUI_H diff --git a/src/Mod/Import/Gui/ImportOCAFGui.cpp b/src/Mod/Import/Gui/ImportOCAFGui.cpp new file mode 100644 index 0000000000..99aa445919 --- /dev/null +++ b/src/Mod/Import/Gui/ImportOCAFGui.cpp @@ -0,0 +1,108 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Zheng Lei * + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" + +#include "ImportOCAFGui.h" +#include +#include +#include + +using namespace ImportGui; + +ImportOCAFGui::ImportOCAFGui(Handle(TDocStd_Document) hDoc, + App::Document* pDoc, + const std::string& name) + : ImportOCAF2(hDoc, pDoc, name) +{} + +void ImportOCAFGui::applyFaceColors(Part::Feature* part, const std::vector& colors) +{ + auto vp = dynamic_cast( + Gui::Application::Instance->getViewProvider(part)); + if (!vp) { + return; + } + if (colors.empty()) { + return; + } + + if (colors.size() == 1) { + vp->ShapeColor.setValue(colors.front()); + vp->Transparency.setValue(100 * colors.front().a); + } + else { + vp->DiffuseColor.setValues(colors); + } +} + +void ImportOCAFGui::applyEdgeColors(Part::Feature* part, const std::vector& colors) +{ + auto vp = dynamic_cast( + Gui::Application::Instance->getViewProvider(part)); + if (!vp) { + return; + } + if (colors.size() == 1) { + vp->LineColor.setValue(colors.front()); + } + else { + vp->LineColorArray.setValues(colors); + } +} + +void ImportOCAFGui::applyLinkColor(App::DocumentObject* obj, int index, App::Color color) +{ + auto vp = + dynamic_cast(Gui::Application::Instance->getViewProvider(obj)); + if (!vp) { + return; + } + if (index < 0) { + vp->OverrideMaterial.setValue(true); + vp->ShapeMaterial.setDiffuseColor(color); + return; + } + if (vp->OverrideMaterialList.getSize() <= index) { + vp->OverrideMaterialList.setSize(index + 1); + } + vp->OverrideMaterialList.set1Value(index, true); + App::Material mat(App::Material::DEFAULT); + if (vp->MaterialList.getSize() <= index) { + vp->MaterialList.setSize(index + 1, mat); + } + mat.diffuseColor = color; + vp->MaterialList.set1Value(index, mat); +} + +void ImportOCAFGui::applyElementColors(App::DocumentObject* obj, + const std::map& colors) +{ + auto vp = Gui::Application::Instance->getViewProvider(obj); + if (!vp) { + return; + } + (void)colors; +} diff --git a/src/Mod/Import/Gui/ImportOCAFGui.h b/src/Mod/Import/Gui/ImportOCAFGui.h new file mode 100644 index 0000000000..1b5c7d13c1 --- /dev/null +++ b/src/Mod/Import/Gui/ImportOCAFGui.h @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Zheng Lei * + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef IMPORT_IMPORTOCAFGUI_H +#define IMPORT_IMPORTOCAFGUI_H + +#include + +namespace ImportGui +{ + +class ImportOCAFGui: public Import::ImportOCAF2 +{ +public: + ImportOCAFGui(Handle(TDocStd_Document) hDoc, App::Document* pDoc, const std::string& name); + +private: + void applyFaceColors(Part::Feature* part, const std::vector& colors) override; + void applyEdgeColors(Part::Feature* part, const std::vector& colors) override; + void applyLinkColor(App::DocumentObject* obj, int index, App::Color color) override; + void applyElementColors(App::DocumentObject* obj, + const std::map& colors) override; +}; + +} // namespace ImportGui + +#endif // IMPORT_IMPORTOCAFGUI_H diff --git a/src/Mod/Import/Gui/OCAFBrowser.cpp b/src/Mod/Import/Gui/OCAFBrowser.cpp new file mode 100644 index 0000000000..8371fd2df5 --- /dev/null +++ b/src/Mod/Import/Gui/OCAFBrowser.cpp @@ -0,0 +1,341 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif + +#include "OCAFBrowser.h" +#include + +using namespace ImportGui; + +OCAFBrowser::OCAFBrowser(const Handle(TDocStd_Document) & hDoc) + : pDoc(hDoc) +{ + myGroupIcon = QApplication::style()->standardIcon(QStyle::SP_DirIcon); + + TDataStd::IDList(myList); + myList.Append(TDataStd_TreeNode::GetDefaultTreeID()); + myList.Append(TDataStd_Integer::GetID()); + myList.Append(TDocStd_Owner::GetID()); + myList.Append(TNaming_NamedShape::GetID()); + myList.Append(TNaming_UsedShapes::GetID()); + myList.Append(XCAFDoc_Color::GetID()); + myList.Append(XCAFDoc_ColorTool::GetID()); + myList.Append(XCAFDoc_LayerTool::GetID()); + myList.Append(XCAFDoc_ShapeTool::GetID()); + myList.Append(XCAFDoc_ShapeMapTool::GetID()); + myList.Append(XCAFDoc_Location::GetID()); +} + +std::string OCAFBrowser::toString(const TCollection_ExtendedString& extstr) +{ + // NOLINTBEGIN + char* str = new char[extstr.LengthOfCString() + 1]; + extstr.ToUTF8CString(str); + std::string text(str); + delete[] str; + return text; + // NOLINTEND +} + +void OCAFBrowser::load(QTreeWidget* theTree) +{ + theTree->clear(); + + QTreeWidgetItem* root = new QTreeWidgetItem(); + root->setText(0, QLatin1String("0")); + root->setIcon(0, myGroupIcon); + theTree->addTopLevelItem(root); + + load(pDoc->GetData()->Root(), root, QString::fromLatin1("0")); +} + +void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QString& str) +{ + label.Dump(std::cout); + + Handle(TDataStd_Name) name; + if (label.FindAttribute(TDataStd_Name::GetID(), name)) { + QString text = + QString::fromLatin1("%1 %2").arg(str, QString::fromUtf8(toString(name->Get()).c_str())); + item->setText(0, text); + } + + + TDF_IDList localList; + TDF_AttributeIterator itr(label); + for (; itr.More(); itr.Next()) { + localList.Append(itr.Value()->ID()); + } + + // Hint: In OCC 7.7 use XCAFDoc::AttributeInfo + for (TDF_ListIteratorOfIDList it(localList); it.More(); it.Next()) { + Handle(TDF_Attribute) attr; + if (label.FindAttribute(it.Value(), attr)) { + QTreeWidgetItem* child = new QTreeWidgetItem(); + item->addChild(child); + if (it.Value() == TDataStd_Name::GetID()) { + QString text; + QTextStream str(&text); + str << attr->DynamicType()->Name(); + str << " = " << toString(Handle(TDataStd_Name)::DownCast(attr)->Get()).c_str(); + child->setText(0, text); + } + else if (it.Value() == TNaming_UsedShapes::GetID()) { + QString text; + QTextStream str(&text); + str << attr->DynamicType()->Name(); + str << " = " << Handle(TNaming_UsedShapes)::DownCast(attr)->Map().Size(); + child->setText(0, text); + } + else if (it.Value() == TDF_TagSource::GetID()) { + QString text; + QTextStream str(&text); + str << attr->DynamicType()->Name(); + str << " = " << Handle(TDF_TagSource)::DownCast(attr)->Get(); + child->setText(0, text); + } + else if (it.Value() == TDataStd_Integer::GetID()) { + QString text; + QTextStream str(&text); + str << attr->DynamicType()->Name(); + str << " = " << Handle(TDataStd_Integer)::DownCast(attr)->Get(); + child->setText(0, text); + } + else if (it.Value() == TDataStd_Real::GetID()) { + QString text; + QTextStream str(&text); + str << attr->DynamicType()->Name(); + str << " = " << Handle(TDataStd_Real)::DownCast(attr)->Get(); + child->setText(0, text); + } + else if (it.Value() == XCAFDoc_Color::GetID()) { + Quantity_ColorRGBA rgba = Handle(XCAFDoc_Color)::DownCast(attr)->GetColorRGBA(); + Quantity_Color rgb = rgba.GetRGB(); + QString tuple = QString::fromLatin1("(%1, %2, %3, %4)") + .arg(rgb.Red()) + .arg(rgb.Green()) + .arg(rgb.Blue()) + .arg(rgba.Alpha()); + QString text; + QTextStream str(&text); + str << attr->DynamicType()->Name(); + str << " = " << Quantity_Color::StringName(rgb.Name()) << " " << tuple; + child->setText(0, text); + } + else if (it.Value() == XCAFDoc_ShapeMapTool::GetID()) { + QString text; + QTextStream str(&text); + str << attr->DynamicType()->Name(); + str << " = " << Handle(XCAFDoc_ShapeMapTool)::DownCast(attr)->GetMap().Size(); + child->setText(0, text); + } + else if (it.Value() == TNaming_NamedShape::GetID()) { + child->setText(0, toText(Handle(TNaming_NamedShape)::DownCast(attr))); + } + else if (!Handle(TDataStd_TreeNode)::DownCast(attr).IsNull()) { + Handle(TDataStd_TreeNode) aTreeNode = Handle(TDataStd_TreeNode)::DownCast(attr); + child->setText(0, toText(aTreeNode)); + } + else { + child->setText(0, QLatin1String(attr->DynamicType()->Name())); + } + } + } + + + int index = 1; + for (TDF_ChildIterator it(label); it.More(); it.Next(), index++) { + QString text = QString::fromLatin1("%1:%2").arg(str).arg(index); + QTreeWidgetItem* child = new QTreeWidgetItem(); + child->setText(0, text); + child->setIcon(0, myGroupIcon); + item->addChild(child); + load(it.Value(), child, text); + } +} + +QString OCAFBrowser::toText(const Handle(TNaming_NamedShape) & namedShape) +{ + TopoDS_Shape shape = namedShape->Get(); + QString text; + QTextStream str(&text); + str << namedShape->DynamicType()->Name() << " = "; + if (!shape.IsNull()) { + switch (shape.ShapeType()) { + case TopAbs_COMPOUND: + str << "COMPOUND PRIMITIVE"; + break; + case TopAbs_COMPSOLID: + str << "COMPSOLID PRIMITIVE"; + break; + case TopAbs_SOLID: + str << "SOLID PRIMITIVE"; + break; + case TopAbs_SHELL: + str << "SHELL PRIMITIVE"; + break; + case TopAbs_FACE: + str << "FACE PRIMITIVE"; + break; + case TopAbs_WIRE: + str << "WIRE PRIMITIVE"; + break; + case TopAbs_EDGE: + str << "EDGE PRIMITIVE"; + break; + case TopAbs_VERTEX: + str << "VERTEX PRIMITIVE"; + break; + case TopAbs_SHAPE: + str << "SHAPE PRIMITIVE"; + break; + } + } + + return text; +} + +QString OCAFBrowser::toText(const Handle(TDataStd_TreeNode) & treeNode) +{ + Standard_CString type = ""; + if (treeNode->ID() == XCAFDoc::ShapeRefGUID()) { + type = "Shape Instance Link"; + } + else if (treeNode->ID() == XCAFDoc::ColorRefGUID(XCAFDoc_ColorGen)) { + type = "Generic Color Link"; + } + else if (treeNode->ID() == XCAFDoc::ColorRefGUID(XCAFDoc_ColorSurf)) { + type = "Surface Color Link"; + } + else if (treeNode->ID() == XCAFDoc::ColorRefGUID(XCAFDoc_ColorCurv)) { + type = "Curve Color Link"; + } + else if (treeNode->ID() == XCAFDoc::DimTolRefGUID()) { + type = "DGT Link"; + } + else if (treeNode->ID() == XCAFDoc::DatumRefGUID()) { + type = "Datum Link"; + } + else if (treeNode->ID() == XCAFDoc::MaterialRefGUID()) { + type = "Material Link"; + } + + QString prefix = QString::fromLatin1(type); + + QString display; + if (treeNode->HasFather()) { + TDF_Label aLabel = treeNode->Father()->Label(); + TCollection_AsciiString entry; + TDF_Tool::Entry(aLabel, entry); + QString suffix = QString::fromLatin1(entry.ToCString()); + display = QString::fromLatin1("%1 ==> %2").arg(prefix, suffix); + } + else { + Handle(TDataStd_TreeNode) aFirstChild = treeNode->First(); + QStringList aRefs; + while (!aFirstChild.IsNull()) { + TDF_Label aLabel = aFirstChild->Label(); + TCollection_AsciiString entry; + TDF_Tool::Entry(aLabel, entry); + QString suffix = QString::fromLatin1(entry.ToCString()); + aRefs.append(suffix); + aFirstChild = aFirstChild->Next(); + } + display = QString::fromLatin1("%1 <== %2").arg(prefix, aRefs.join(QChar::fromLatin1(','))); + } + + QString text; + QTextStream str(&text); + str << treeNode->DynamicType()->Name(); + if (!display.isEmpty()) { + str << " = " << display; + } + + return text; +} + +void OCAFBrowser::showDialog(const QString& title, const Handle(TDocStd_Document) & hDoc) +{ + // NOLINTBEGIN + QDialog* dlg = new QDialog(Gui::getMainWindow()); + + QTreeWidget* tree = new QTreeWidget(); + tree->setHeaderLabel(QString::fromLatin1("OCAF Browser")); + + QVBoxLayout* layout = new QVBoxLayout; + layout->addWidget(tree); + dlg->setLayout(layout); + + QDialogButtonBox* btn = new QDialogButtonBox(dlg); + btn->setStandardButtons(QDialogButtonBox::Close); + QObject::connect(btn, &QDialogButtonBox::rejected, dlg, &QDialog::reject); + QHBoxLayout* boxlayout = new QHBoxLayout; + boxlayout->addWidget(btn); + layout->addLayout(boxlayout); + + dlg->setWindowTitle(title); + dlg->setAttribute(Qt::WA_DeleteOnClose); + dlg->show(); + + OCAFBrowser browse(hDoc); + browse.load(dlg->findChild()); + tree->expandAll(); + dlg->resize(400, 600); + // NOLINTEND +} diff --git a/src/Mod/Import/Gui/OCAFBrowser.h b/src/Mod/Import/Gui/OCAFBrowser.h new file mode 100644 index 0000000000..c6b498a1b9 --- /dev/null +++ b/src/Mod/Import/Gui/OCAFBrowser.h @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef IMPORT_OCAFBROWSER_H +#define IMPORT_OCAFBROWSER_H + +#include +#include +#include +#include +#include +#include +#include + +class QString; +class QTreeWidget; +class QTreeWidgetItem; + +namespace ImportGui +{ +class OCAFBrowser +{ +public: + explicit OCAFBrowser(const Handle(TDocStd_Document) & hDoc); + void load(QTreeWidget*); + + static void showDialog(const QString& title, const Handle(TDocStd_Document) & hDoc); + +private: + void load(const TDF_Label& label, QTreeWidgetItem* item, const QString&); + static std::string toString(const TCollection_ExtendedString& extstr); + static QString toText(const Handle(TDataStd_TreeNode) & treeNode); + static QString toText(const Handle(TNaming_NamedShape) & namedShape); + +private: + QIcon myGroupIcon; + TDF_IDList myList; + Handle(TDocStd_Document) pDoc; +}; + +} // namespace ImportGui + +#endif // IMPORT_OCAFBROWSER_H diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index 9790087a51..80b4e7ed22 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/src/Mod/Inspection/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/Mod/JtReader/App/CMakeLists.txt b/src/Mod/JtReader/App/CMakeLists.txt index 7b8d9c390b..5286ef896c 100644 --- a/src/Mod/JtReader/App/CMakeLists.txt +++ b/src/Mod/JtReader/App/CMakeLists.txt @@ -1,10 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppImport -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/Mod/Material/App/AppMaterial.cpp b/src/Mod/Material/App/AppMaterial.cpp new file mode 100644 index 0000000000..ced297ec95 --- /dev/null +++ b/src/Mod/Material/App/AppMaterial.cpp @@ -0,0 +1,73 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include +#include +#include + +// #include "Model.h" +#include "MaterialManagerPy.h" +#include "MaterialPy.h" +#include "ModelManagerPy.h" +#include "ModelPropertyPy.h" +#include "ModelPy.h" + +namespace Materials +{ +class Module: public Py::ExtensionModule +{ +public: + Module() + : Py::ExtensionModule("Material") + { + initialize("This module is the Material module."); // register with Python + } + + ~Module() override = default; + +private: +}; + +PyObject* initModule() +{ + return Base::Interpreter().addModule(new Module); +} + +} // namespace Materials + +PyMOD_INIT_FUNC(Material) +{ + PyObject* module = Materials::initModule(); + + Base::Console().Log("Loading Material module... done\n"); + + Base::Interpreter().addType(&Materials::MaterialManagerPy ::Type, module, "MaterialManager"); + Base::Interpreter().addType(&Materials::MaterialPy ::Type, module, "Material"); + Base::Interpreter().addType(&Materials::ModelManagerPy ::Type, module, "ModelManager"); + Base::Interpreter().addType(&Materials::ModelPropertyPy ::Type, module, "ModelProperty"); + Base::Interpreter().addType(&Materials::ModelPy ::Type, module, "Model"); + + PyMOD_Return(module); +} diff --git a/src/Mod/Material/App/CMakeLists.txt b/src/Mod/Material/App/CMakeLists.txt new file mode 100644 index 0000000000..21258ea53a --- /dev/null +++ b/src/Mod/Material/App/CMakeLists.txt @@ -0,0 +1,99 @@ +if(MSVC) + add_definitions(-DFCAppMaterial -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) +else(MSVC) + add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) +endif(MSVC) + +add_definitions(-DYAML_CPP_STATIC_DEFINE) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/src + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${Boost_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} + ${XercesC_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} + ${YAML_CPP_INCLUDE_DIR} +) +link_directories(${YAML_CPP_LIBRARY_DIR}) + +set(Material_LIBS + ${Boost_LIBRARIES} + FreeCADApp +) + +include_directories( + ${QtConcurrent_INCLUDE_DIRS} +) +list(APPEND Material_LIBS + ${QtConcurrent_LIBRARIES} + ${YAML_CPP_LIBRARIES} +) + +generate_from_xml(MaterialManagerPy) +generate_from_xml(MaterialPy) +generate_from_xml(ModelManagerPy) +generate_from_xml(ModelPropertyPy) +generate_from_xml(ModelPy) + +SET(Python_SRCS + Exceptions.h + MaterialManagerPy.xml + MaterialManagerPyImpl.cpp + MaterialPy.xml + MaterialPyImpl.cpp + ModelManagerPy.xml + ModelManagerPyImpl.cpp + ModelPropertyPy.xml + ModelPropertyPyImpl.cpp + ModelPy.xml + ModelPyImpl.cpp +) +SOURCE_GROUP("Python" FILES ${Python_SRCS}) + +SET(Material_SRCS + ${Python_SRCS} + AppMaterial.cpp + FolderTree.h + MaterialConfigLoader.cpp + MaterialConfigLoader.h + MaterialLibrary.cpp + MaterialLibrary.h + MaterialLoader.cpp + MaterialLoader.h + MaterialManager.cpp + MaterialManager.h + Materials.cpp + Materials.h + MaterialValue.cpp + MaterialValue.h + Model.cpp + Model.h + ModelLibrary.cpp + ModelLibrary.h + ModelLoader.cpp + ModelLoader.h + ModelManager.cpp + ModelManager.h + ModelUuids.h + PreCompiled.cpp + PreCompiled.h + trim.h +) + +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Material_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(Material PreCompiled.h PreCompiled.cpp PCH_SRCS) +endif(FREECAD_USE_PCH) + +add_library(Material SHARED ${Material_SRCS}) +target_link_libraries(Material ${Material_LIBS}) + +SET_BIN_DIR(Material Material /Mod/Material) +SET_PYTHON_PREFIX_SUFFIX(Material) + +INSTALL(TARGETS Material DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/Material/App/Exceptions.h b/src/Mod/Material/App/Exceptions.h new file mode 100644 index 0000000000..c67e9df4eb --- /dev/null +++ b/src/Mod/Material/App/Exceptions.h @@ -0,0 +1,153 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_EXCEPTIONS_H +#define MATERIAL_EXCEPTIONS_H + +#include +#include + +namespace Materials +{ + +class Uninitialized: public Base::Exception +{ +public: + Uninitialized() + {} + explicit Uninitialized(const char* msg) + { + this->setMessage(msg); + } + ~Uninitialized() noexcept override = default; +}; + +class ModelNotFound: public Base::Exception +{ +public: + ModelNotFound() + {} + explicit ModelNotFound(const char* msg) + { + this->setMessage(msg); + } + ~ModelNotFound() noexcept override = default; +}; + +class MaterialNotFound: public Base::Exception +{ +public: + MaterialNotFound() + {} + explicit MaterialNotFound(const char* msg) + { + this->setMessage(msg); + } + ~MaterialNotFound() noexcept override = default; +}; + +class PropertyNotFound: public Base::Exception +{ +public: + PropertyNotFound() + {} + explicit PropertyNotFound(const char* msg) + { + this->setMessage(msg); + } + ~PropertyNotFound() noexcept override = default; +}; + +class LibraryNotFound: public Base::Exception +{ +public: + LibraryNotFound() + {} + explicit LibraryNotFound(const char* msg) + { + this->setMessage(msg); + } + ~LibraryNotFound() noexcept override = default; +}; + +class InvalidModel: public Base::Exception +{ +public: + InvalidModel() + {} + explicit InvalidModel(const char* msg) + { + this->setMessage(msg); + } + ~InvalidModel() noexcept override = default; +}; + +class InvalidRow: public Base::Exception +{ +public: + InvalidRow() + {} + explicit InvalidRow(char* msg) + { + this->setMessage(msg); + } + ~InvalidRow() noexcept override = default; +}; + +class InvalidColumn: public Base::Exception +{ +public: + InvalidColumn() + {} + explicit InvalidColumn(char* msg) + { + this->setMessage(msg); + } + ~InvalidColumn() noexcept override = default; +}; + +class InvalidIndex: public Base::Exception +{ +public: + InvalidIndex() + {} + explicit InvalidIndex(char* msg) + { + this->setMessage(msg); + } + ~InvalidIndex() noexcept override = default; +}; + +class UnknownValueType: public Base::Exception +{ +public: + UnknownValueType() + {} + explicit UnknownValueType(char* msg) + { + this->setMessage(msg); + } + ~UnknownValueType() noexcept override = default; +}; + +} // namespace Materials + +#endif // MATERIAL_EXCEPTIONS_H diff --git a/src/Mod/Material/App/FolderTree.h b/src/Mod/Material/App/FolderTree.h new file mode 100644 index 0000000000..2cc3133fa6 --- /dev/null +++ b/src/Mod/Material/App/FolderTree.h @@ -0,0 +1,88 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_FOLDERTREE_H +#define MATERIAL_FOLDERTREE_H + +#include +#include +#include + + +namespace Materials +{ + +template +class FolderTreeNode +{ +public: + enum NodeType + { + DataNode, + FolderNode + }; + + FolderTreeNode() + {} + virtual ~FolderTreeNode() = default; + + NodeType getType() const + { + return _type; + } + void setType(NodeType type) + { + _type = type; + } + + const std::shared_ptr*>> getFolder() const + { + return _folder; + } + std::shared_ptr*>> getFolder() + { + return _folder; + } + const T* getData() const + { + return _data; + } + + void setFolder(std::shared_ptr*>> folder) + { + setType(FolderNode); + _folder = folder; + } + void setData(const T* data) + { + setType(DataNode); + _data = data; + } + +private: + NodeType _type; + std::shared_ptr*>> _folder; + const T* _data; +}; + +} // namespace Materials + +#endif // MATERIAL_FOLDERTREE_H diff --git a/src/Mod/Material/App/MaterialConfigLoader.cpp b/src/Mod/Material/App/MaterialConfigLoader.cpp new file mode 100644 index 0000000000..6e5e287600 --- /dev/null +++ b/src/Mod/Material/App/MaterialConfigLoader.cpp @@ -0,0 +1,395 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#endif + +#include + +#include +#include +#include + + +#include "MaterialConfigLoader.h" +#include "MaterialLoader.h" +#include "Model.h" +#include "ModelUuids.h" + + +using namespace Materials; + +MaterialConfigLoader::MaterialConfigLoader() +{} + +bool MaterialConfigLoader::isConfigStyle(const QString& path) +{ + std::ifstream infile(path.toStdString()); + + // Check the first 2 lines for a ";" + for (int i = 0; i < 2; i++) { + std::string line; + if (!std::getline(infile, line)) { + return false; + } + if (line.at(0) != ';') { + return false; + } + } + + return true; +} + +QString MaterialConfigLoader::getAuthorAndLicense(const QString& path) +{ + std::ifstream infile(path.toStdString()); + QString noAuthor; + + // Skip the first line + std::string line; + if (!std::getline(infile, line)) { + return noAuthor; + } + + // The second line has it in a comment + if (!std::getline(infile, line)) { + return noAuthor; + } + std::size_t found = line.find(";"); + if (found != std::string::npos) { + return QString::fromStdString(trim_copy(line.substr(found + 1))); + } + + return noAuthor; +} + +void MaterialConfigLoader::addVectorRendering(const QSettings& fcmat, Material* finalModel) +{ + QString sectionFillPattern = value(fcmat, "VectorRendering/SectionFillPattern", ""); + QString sectionLinewidth = value(fcmat, "VectorRendering/SectionLinewidth", ""); + QString sectionColor = value(fcmat, "VectorRendering/SectionColor", ""); + QString viewColor = value(fcmat, "VectorRendering/ViewColor", ""); + QString viewFillPattern = value(fcmat, "VectorRendering/ViewFillPattern", ""); + QString viewLinewidth = value(fcmat, "VectorRendering/ViewLinewidth", ""); + + if (sectionFillPattern.length() + sectionLinewidth.length() + sectionColor.length() + + viewColor.length() + viewFillPattern.length() + viewLinewidth.length() + > 0) { + finalModel->addAppearance(ModelUUID_Rendering_Vector); + } + + // Now add the data + setAppearanceValue(finalModel, "SectionFillPattern", sectionFillPattern); + setAppearanceValue(finalModel, "SectionLinewidth", sectionLinewidth); + setAppearanceValue(finalModel, "SectionColor", sectionColor); + setAppearanceValue(finalModel, "ViewColor", viewColor); + setAppearanceValue(finalModel, "ViewFillPattern", viewFillPattern); + setAppearanceValue(finalModel, "ViewLinewidth", viewLinewidth); +} + +void MaterialConfigLoader::addRendering(const QSettings& fcmat, Material* finalModel) +{ + QString ambientColor = value(fcmat, "Rendering/AmbientColor", ""); + QString diffuseColor = value(fcmat, "Rendering/DiffuseColor", ""); + QString emissiveColor = value(fcmat, "Rendering/EmissiveColor", ""); + QString shininess = value(fcmat, "Rendering/Shininess", ""); + QString specularColor = value(fcmat, "Rendering/SpecularColor", ""); + QString transparency = value(fcmat, "Rendering/Transparency", ""); + QString texturePath = value(fcmat, "Rendering/TexturePath", ""); + QString textureScaling = value(fcmat, "Rendering/TextureScaling", ""); + QString fragmentShader = value(fcmat, "Rendering/FragmentShader", ""); + QString vertexShader = value(fcmat, "Rendering/VertexShader", ""); + + // Check which model we need + bool useTexture = false; + bool useAdvanced = false; + bool useBasic = false; + if (texturePath.length() + textureScaling.length() > 0) { + useTexture = true; + } + if (fragmentShader.length() + vertexShader.length() > 0) { + useAdvanced = true; + } + if (ambientColor.length() + diffuseColor.length() + emissiveColor.length() + shininess.length() + + specularColor.length() + transparency.length() + > 0) { + useBasic = true; + } + + if (useAdvanced) { + finalModel->addAppearance(ModelUUID_Rendering_Advanced); + } + else if (useTexture) { + finalModel->addAppearance(ModelUUID_Rendering_Texture); + } + else if (useBasic) { + finalModel->addAppearance(ModelUUID_Rendering_Basic); + } + + // Now add the data + setAppearanceValue(finalModel, "AmbientColor", ambientColor); + setAppearanceValue(finalModel, "DiffuseColor", diffuseColor); + setAppearanceValue(finalModel, "EmissiveColor", emissiveColor); + setAppearanceValue(finalModel, "Shininess", shininess); + setAppearanceValue(finalModel, "SpecularColor", specularColor); + setAppearanceValue(finalModel, "Transparency", transparency); + setAppearanceValue(finalModel, "TexturePath", texturePath); + setAppearanceValue(finalModel, "TextureScaling", textureScaling); + setAppearanceValue(finalModel, "FragmentShader", fragmentShader); + setAppearanceValue(finalModel, "VertexShader", vertexShader); +} + +void MaterialConfigLoader::addCosts(const QSettings& fcmat, Material* finalModel) +{ + QString productURL = value(fcmat, "Cost/ProductURL", ""); + QString specificPrice = value(fcmat, "Cost/SpecificPrice", ""); + QString vendor = value(fcmat, "Cost/Vendor", ""); + + if (productURL.length() + specificPrice.length() + vendor.length() > 0) { + finalModel->addPhysical(ModelUUID_Costs_Default); + } + + // Now add the data + setPhysicalValue(finalModel, "ProductURL", productURL); + setPhysicalValue(finalModel, "SpecificPrice", specificPrice); + setPhysicalValue(finalModel, "Vendor", vendor); +} + +void MaterialConfigLoader::addArchitectural(const QSettings& fcmat, Material* finalModel) +{ + QString color = value(fcmat, "Architectural/Color", ""); + QString environmentalEfficiencyClass = + value(fcmat, "Architectural/EnvironmentalEfficiencyClass", ""); + QString executionInstructions = value(fcmat, "Architectural/ExecutionInstructions", ""); + QString finish = value(fcmat, "Architectural/Finish", ""); + QString fireResistanceClass = value(fcmat, "Architectural/FireResistanceClass", ""); + QString model = value(fcmat, "Architectural/Model", ""); + QString soundTransmissionClass = value(fcmat, "Architectural/SoundTransmissionClass", ""); + QString unitsPerQuantity = value(fcmat, "Architectural/UnitsPerQuantity", ""); + + if (color.length() + environmentalEfficiencyClass.length() + executionInstructions.length() + + finish.length() + fireResistanceClass.length() + model.length() + + soundTransmissionClass.length() + unitsPerQuantity.length() + > 0) { + finalModel->addPhysical(ModelUUID_Architectural_Default); + } + + // Now add the data + setPhysicalValue(finalModel, "Color", color); + setPhysicalValue(finalModel, "EnvironmentalEfficiencyClass", environmentalEfficiencyClass); + setPhysicalValue(finalModel, "ExecutionInstructions", executionInstructions); + setPhysicalValue(finalModel, "Finish", finish); + setPhysicalValue(finalModel, "FireResistanceClass", fireResistanceClass); + setPhysicalValue(finalModel, "Model", model); + setPhysicalValue(finalModel, "SoundTransmissionClass", soundTransmissionClass); + setPhysicalValue(finalModel, "UnitsPerQuantity", unitsPerQuantity); +} + +void MaterialConfigLoader::addElectromagnetic(const QSettings& fcmat, Material* finalModel) +{ + QString relativePermittivity = value(fcmat, "Electromagnetic/RelativePermittivity", ""); + QString electricalConductivity = value(fcmat, "Electromagnetic/ElectricalConductivity", ""); + QString relativePermeability = value(fcmat, "Electromagnetic/RelativePermeability", ""); + + if (relativePermittivity.length() + electricalConductivity.length() + + relativePermeability.length() + > 0) { + finalModel->addPhysical(ModelUUID_Electromagnetic_Default); + } + + // Now add the data + setPhysicalValue(finalModel, "RelativePermittivity", relativePermittivity); + setPhysicalValue(finalModel, "ElectricalConductivity", electricalConductivity); + setPhysicalValue(finalModel, "RelativePermeability", relativePermeability); +} + +void MaterialConfigLoader::addThermal(const QSettings& fcmat, Material* finalModel) +{ + QString specificHeat = value(fcmat, "Thermal/SpecificHeat", ""); + QString thermalConductivity = value(fcmat, "Thermal/ThermalConductivity", ""); + QString thermalExpansionCoefficient = value(fcmat, "Thermal/ThermalExpansionCoefficient", ""); + + if (specificHeat.length() + thermalConductivity.length() + thermalExpansionCoefficient.length() + > 0) { + finalModel->addPhysical(ModelUUID_Thermal_Default); + } + + // Now add the data + setPhysicalValue(finalModel, "SpecificHeat", specificHeat); + setPhysicalValue(finalModel, "ThermalConductivity", thermalConductivity); + setPhysicalValue(finalModel, "ThermalExpansionCoefficient", thermalExpansionCoefficient); +} + +void MaterialConfigLoader::addFluid(const QSettings& fcmat, Material* finalModel) +{ + QString density = value(fcmat, "Fluidic/Density", ""); + QString dynamicViscosity = value(fcmat, "Fluidic/DynamicViscosity", ""); + QString kinematicViscosity = value(fcmat, "Fluidic/KinematicViscosity", ""); + QString prandtlNumber = value(fcmat, "Fluidic/PrandtlNumber", ""); + + // Check which model we need + bool useDensity = false; + bool useFluid = false; + if (density.length() > 0) { + useDensity = true; + } + if (dynamicViscosity.length() + kinematicViscosity.length() + prandtlNumber.length() > 0) { + useFluid = true; + } + + if (useFluid) { + finalModel->addPhysical(ModelUUID_Fluid_Default); + } + else if (useDensity) { + finalModel->addPhysical(ModelUUID_Mechanical_Density); + } + + // Now add the data + setPhysicalValue(finalModel, "Density", density); + setPhysicalValue(finalModel, "DynamicViscosity", dynamicViscosity); + setPhysicalValue(finalModel, "KinematicViscosity", kinematicViscosity); + setPhysicalValue(finalModel, "PrandtlNumber", prandtlNumber); +} + +void MaterialConfigLoader::addMechanical(const QSettings& fcmat, Material* finalModel) +{ + QString density = value(fcmat, "Mechanical/Density", ""); + QString bulkModulus = value(fcmat, "Mechanical/BulkModulus", ""); + QString poissonRatio = value(fcmat, "Mechanical/PoissonRatio", ""); + QString shearModulus = value(fcmat, "Mechanical/ShearModulus", ""); + QString youngsModulus = value(fcmat, "Mechanical/YoungsModulus", ""); + QString angleOfFriction = value(fcmat, "Mechanical/AngleOfFriction", ""); + QString compressiveStrength = value(fcmat, "Mechanical/CompressiveStrength", ""); + QString fractureToughness = value(fcmat, "Mechanical/FractureToughness", ""); + QString ultimateStrain = value(fcmat, "Mechanical/UltimateStrain", ""); + QString ultimateTensileStrength = value(fcmat, "Mechanical/UltimateTensileStrength", ""); + QString yieldStrength = value(fcmat, "Mechanical/YieldStrength", ""); + QString stiffness = value(fcmat, "Mechanical/Stiffness", ""); + + // Check which model we need + bool useDensity = false; + bool useIso = false; + bool useLinearElastic = false; + if (density.length() > 0) { + useDensity = true; + } + if (bulkModulus.length() + poissonRatio.length() + shearModulus.length() + + youngsModulus.length() + > 0) { + useIso = true; + } + if (angleOfFriction.length() + compressiveStrength.length() + fractureToughness.length() + + ultimateStrain.length() + ultimateTensileStrength.length() + yieldStrength.length() + + stiffness.length() + > 0) { + useLinearElastic = true; + } + + if (useLinearElastic) { + finalModel->addPhysical(ModelUUID_Mechanical_LinearElastic); + } + else { + if (useIso) { + finalModel->addPhysical(ModelUUID_Mechanical_IsotropicLinearElastic); + } + if (useDensity) { + finalModel->addPhysical(ModelUUID_Mechanical_Density); + } + } + + // Now add the data + setPhysicalValue(finalModel, "Density", density); + setPhysicalValue(finalModel, "BulkModulus", bulkModulus); + setPhysicalValue(finalModel, "PoissonRatio", poissonRatio); + setPhysicalValue(finalModel, "ShearModulus", shearModulus); + setPhysicalValue(finalModel, "YoungsModulus", youngsModulus); + setPhysicalValue(finalModel, "AngleOfFriction", angleOfFriction); + setPhysicalValue(finalModel, "CompressiveStrength", compressiveStrength); + setPhysicalValue(finalModel, "FractureToughness", fractureToughness); + setPhysicalValue(finalModel, "UltimateStrain", ultimateStrain); + setPhysicalValue(finalModel, "UltimateTensileStrength", ultimateTensileStrength); + setPhysicalValue(finalModel, "YieldStrength", yieldStrength); + setPhysicalValue(finalModel, "Stiffness", stiffness); +} + +Material* MaterialConfigLoader::getMaterialFromPath(const MaterialLibrary& library, + const QString& path) +{ + QString authorAndLicense = getAuthorAndLicense(path); + + QSettings fcmat(path, QSettings::IniFormat); + + // General section + // QString name = value(fcmat, "Name", ""); - always get the name from the filename + QFileInfo filepath(path); + QString name = + filepath.fileName().remove(QString::fromStdString(".FCMat"), Qt::CaseInsensitive); + QString uuid = QUuid::createUuid().toString(QUuid::WithoutBraces); + + QString description = value(fcmat, "Description", ""); + QString sourceReference = value(fcmat, "ReferenceSource", ""); + QString sourceURL = value(fcmat, "SourceURL", ""); + + Material* finalModel = new Material(library, path, uuid, name); + finalModel->setAuthorAndLicense(authorAndLicense); + finalModel->setDescription(description); + finalModel->setReference(sourceReference); + finalModel->setURL(sourceURL); + + QString father = value(fcmat, "Father", ""); + if (father.length() > 0) { + finalModel->addPhysical(ModelUUID_Legacy_Father); + + // Now add the data + setPhysicalValue(finalModel, "Father", father); + } + + QString kindOfMaterial = value(fcmat, "KindOfMaterial", ""); + QString materialNumber = value(fcmat, "MaterialNumber", ""); + QString norm = value(fcmat, "Norm", ""); + QString standardCode = value(fcmat, "StandardCode", ""); + if (kindOfMaterial.length() + materialNumber.length() + norm.length() + standardCode.length() + > 0) { + finalModel->addPhysical(ModelUUID_Legacy_MaterialStandard); + + // Now add the data + setPhysicalValue(finalModel, "KindOfMaterial", kindOfMaterial); + setPhysicalValue(finalModel, "MaterialNumber", materialNumber); + setPhysicalValue(finalModel, "StandardCode", norm); // Norm is the same as StandardCode + setPhysicalValue(finalModel, "StandardCode", standardCode); + } + + // Add the remaining sections + addMechanical(fcmat, finalModel); + addFluid(fcmat, finalModel); + addThermal(fcmat, finalModel); + addElectromagnetic(fcmat, finalModel); + addArchitectural(fcmat, finalModel); + addCosts(fcmat, finalModel); + addRendering(fcmat, finalModel); + addVectorRendering(fcmat, finalModel); + + return finalModel; +} diff --git a/src/Mod/Material/App/MaterialConfigLoader.h b/src/Mod/Material/App/MaterialConfigLoader.h new file mode 100644 index 0000000000..f2337cd04f --- /dev/null +++ b/src/Mod/Material/App/MaterialConfigLoader.h @@ -0,0 +1,80 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MATERIALCONFIGLOADER_H +#define MATERIAL_MATERIALCONFIGLOADER_H + +#include +#include +#include + +#include "Materials.h" + +namespace Materials +{ + +class MaterialConfigLoader +{ +public: + MaterialConfigLoader(); + virtual ~MaterialConfigLoader() = default; + + + static bool isConfigStyle(const QString& path); + static Material* getMaterialFromPath(const MaterialLibrary& library, const QString& path); + +private: + static QString + value(const QSettings& fcmat, const std::string& name, const std::string& defaultValue) + { + return fcmat.value(QString::fromStdString(name), QString::fromStdString(defaultValue)) + .toString(); + } + + static void + setPhysicalValue(Material* finalModel, const std::string& name, const QString& value) + { + if (value.length() > 0) { + finalModel->setPhysicalValue(QString::fromStdString(name), value); + } + } + static void + setAppearanceValue(Material* finalModel, const std::string& name, const QString& value) + { + if (value.length() > 0) { + finalModel->setAppearanceValue(QString::fromStdString(name), value); + } + } + + static QString getAuthorAndLicense(const QString& path); + static void addMechanical(const QSettings& fcmat, Material* finalModel); + static void addFluid(const QSettings& fcmat, Material* finalModel); + static void addThermal(const QSettings& fcmat, Material* finalModel); + static void addElectromagnetic(const QSettings& fcmat, Material* finalModel); + static void addArchitectural(const QSettings& fcmat, Material* finalModel); + static void addCosts(const QSettings& fcmat, Material* finalModel); + static void addRendering(const QSettings& fcmat, Material* finalModel); + static void addVectorRendering(const QSettings& fcmat, Material* finalModel); +}; + +} // namespace Materials + +#endif // MATERIAL_MATERIALCONFIGLOADER_H diff --git a/src/Mod/Material/App/MaterialLibrary.cpp b/src/Mod/Material/App/MaterialLibrary.cpp new file mode 100644 index 0000000000..8e7803d2cb --- /dev/null +++ b/src/Mod/Material/App/MaterialLibrary.cpp @@ -0,0 +1,162 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include + +#include "MaterialLibrary.h" +#include "Materials.h" +#include "ModelManager.h" + + +using namespace Materials; + +/* TRANSLATOR Material::Materials */ + +std::unique_ptr> MaterialLibrary::_materialPathMap = + std::make_unique>(); + +TYPESYSTEM_SOURCE(Materials::MaterialLibrary, LibraryBase) + +MaterialLibrary::MaterialLibrary() +{} + +MaterialLibrary::MaterialLibrary(const QString& libraryName, + const QString& dir, + const QString& icon, + bool readOnly) + : LibraryBase(libraryName, dir, icon) + , _readOnly(readOnly) +{} + +void MaterialLibrary::createPath(const QString& path) +{ + Q_UNUSED(path) +} + +Material* MaterialLibrary::saveMaterial(Material& material, const QString& path, bool saveAsCopy) +{ + QString filePath = getLocalPath(path); + Base::Console().Log("\tfilePath = '%s'\n", filePath.toStdString().c_str()); + QFile file(filePath); + + // Update UUID if required + // if name changed true + if (material.getName() != file.fileName()) { + material.newUuid(); + } + // if overwrite false having warned the user + // if old format true, but already set + + + QFileInfo info(file); + QDir fileDir(info.path()); + if (!fileDir.exists()) { + if (!fileDir.mkpath(info.path())) { + Base::Console().Error("Unable to create directory path '%s'\n", + info.path().toStdString().c_str()); + } + } + + if (file.open(QIODevice::WriteOnly | QIODevice::Text)) { + QTextStream stream(&file); +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + stream.setCodec("UTF-8"); +#endif + stream.setGenerateByteOrderMark(true); + + // Write the contents + material.setLibrary(*this); + material.setDirectory(getRelativePath(path)); + material.save(stream, saveAsCopy); + } + + return addMaterial(material, path); +} + +Material* MaterialLibrary::addMaterial(const Material& material, const QString& path) +{ + QString filePath = getRelativePath(path); + Material* newMaterial = new Material(material); + newMaterial->setLibrary(*this); + newMaterial->setDirectory(filePath); + + try { + // If there's already a material at that path we'll replace it + Material* old = _materialPathMap->at(filePath); + delete old; + } + catch (const std::out_of_range&) { + } + + (*_materialPathMap)[filePath] = newMaterial; + + return newMaterial; +} + +const Material& MaterialLibrary::getMaterialByPath(const QString& path) const +{ + // Base::Console().Log("MaterialLibrary::getMaterialByPath(%s)\n", path.toStdString().c_str()); + // for (auto itp = _materialPathMap->begin(); itp != _materialPathMap->end(); itp++) { + // Base::Console().Log("\tpath = '%s'\n", itp->first.toStdString().c_str()); + // } + + QString filePath = getRelativePath(path); + try { + Material* material = _materialPathMap->at(filePath); + return *material; + } + catch (std::out_of_range& e) { + throw MaterialNotFound(); + } +} + +const QString MaterialLibrary::getUUIDFromPath(const QString& path) const +{ + QString filePath = getRelativePath(path); + try { + Material* material = _materialPathMap->at(filePath); + return material->getUUID(); + } + catch (std::out_of_range& e) { + throw MaterialNotFound(); + } +} + +TYPESYSTEM_SOURCE(Materials::MaterialExternalLibrary, MaterialLibrary::MaterialLibrary) + +MaterialExternalLibrary::MaterialExternalLibrary() +{} + +MaterialExternalLibrary::MaterialExternalLibrary(const QString& libraryName, + const QString& dir, + const QString& icon, + bool readOnly) + : MaterialLibrary(libraryName, dir, icon, readOnly) +{} + +MaterialExternalLibrary::~MaterialExternalLibrary() +{ + // delete directory; +} diff --git a/src/Mod/Material/App/MaterialLibrary.h b/src/Mod/Material/App/MaterialLibrary.h new file mode 100644 index 0000000000..8bb16f34f8 --- /dev/null +++ b/src/Mod/Material/App/MaterialLibrary.h @@ -0,0 +1,97 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MATERIALLIBRARY_H +#define MATERIAL_MATERIALLIBRARY_H + +#include + +#include +#include +#include +#include +#include + +#include "Model.h" +#include "ModelLibrary.h" + +namespace Materials +{ + +class Material; + +class MaterialsExport MaterialLibrary: public LibraryBase +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + MaterialLibrary(); + explicit MaterialLibrary(const QString& libraryName, + const QString& dir, + const QString& icon, + bool readOnly = true); + ~MaterialLibrary() override = default; + + bool operator==(const MaterialLibrary& library) const + { + return LibraryBase::operator==(library); + } + bool operator!=(const MaterialLibrary& library) const + { + return !operator==(library); + } + const Material& getMaterialByPath(const QString& path) const; + + void createPath(const QString& path); + Material* saveMaterial(Material& material, const QString& path, bool saveAsCopy); + Material* addMaterial(const Material& material, const QString& path); + + bool isReadOnly() const + { + return _readOnly; + } + +protected: + const QString getUUIDFromPath(const QString& path) const; + + bool _readOnly; + static std::unique_ptr> _materialPathMap; +}; + +class MaterialsExport MaterialExternalLibrary: public MaterialLibrary +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + MaterialExternalLibrary(); + explicit MaterialExternalLibrary(const QString& libraryName, + const QString& dir, + const QString& icon, + bool readOnly = true); + ~MaterialExternalLibrary() override; +}; + +} // namespace Materials + +Q_DECLARE_METATYPE(Materials::MaterialLibrary) +Q_DECLARE_METATYPE(Materials::MaterialExternalLibrary) + +#endif // MATERIAL_MATERIALLIBRARY_H diff --git a/src/Mod/Material/App/MaterialLoader.cpp b/src/Mod/Material/App/MaterialLoader.cpp new file mode 100644 index 0000000000..0756753de0 --- /dev/null +++ b/src/Mod/Material/App/MaterialLoader.cpp @@ -0,0 +1,445 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#endif + +#include +#include + +#include +#include + +#include "MaterialConfigLoader.h" +#include "MaterialLoader.h" +#include "Model.h" +#include "ModelManager.h" + + +using namespace Materials; + +MaterialEntry::MaterialEntry() +{} + +MaterialEntry::MaterialEntry(const MaterialLibrary& library, + const QString& modelName, + const QString& dir, + const QString& modelUuid) + : _library(library) + , _name(modelName) + , _directory(dir) + , _uuid(modelUuid) +{} + +MaterialYamlEntry::MaterialYamlEntry(const MaterialLibrary& library, + const QString& modelName, + const QString& dir, + const QString& modelUuid, + const YAML::Node& modelData) + : MaterialEntry(library, modelName, dir, modelUuid) + , _model(modelData) +{} + +// MaterialYamlEntry::~MaterialYamlEntry() +// {} + +QString MaterialYamlEntry::yamlValue(const YAML::Node& node, + const std::string& key, + const std::string& defaultValue) +{ + if (node[key]) { + return QString::fromStdString(node[key].as()); + } + return QString::fromStdString(defaultValue); +} + +void MaterialYamlEntry::addToTree(std::shared_ptr> materialMap) +{ + std::set exclude; + exclude.insert(QString::fromStdString("General")); + exclude.insert(QString::fromStdString("Inherits")); + + auto yamlModel = getModel(); + auto library = getLibrary(); + auto name = getName(); + auto directory = getDirectory(); + QString uuid = getUUID(); + + QString authorAndLicense = yamlValue(yamlModel["General"], "AuthorAndLicense", ""); + QString description = yamlValue(yamlModel["General"], "Description", ""); + + Material* finalModel = new Material(library, directory, uuid, name); + finalModel->setAuthorAndLicense(authorAndLicense); + finalModel->setDescription(description); + + // Add inheritance list + if (yamlModel["Inherits"]) { + auto inherits = yamlModel["Inherits"]; + for (auto it = inherits.begin(); it != inherits.end(); it++) { + std::string nodeName = it->second["UUID"].as(); + + finalModel->setParentUUID( + QString::fromStdString(nodeName)); // Should only be one. Need to check + } + } + + // Add material models + if (yamlModel["Models"]) { + auto models = yamlModel["Models"]; + for (auto it = models.begin(); it != models.end(); it++) { + std::string modelName = (it->first).as(); + + // Add the model uuid + auto modelNode = models[modelName]; + std::string modelUUID = modelNode["UUID"].as(); + finalModel->addPhysical(QString::fromStdString(modelUUID)); + + // Add the property values + auto properties = yamlModel["Models"][modelName]; + for (auto itp = properties.begin(); itp != properties.end(); itp++) { + std::string propertyName = (itp->first).as(); + std::string propertyValue = (itp->second).as(); + + if (finalModel->hasPhysicalProperty(QString::fromStdString(propertyName))) { + finalModel->setPhysicalValue(QString::fromStdString(propertyName), + QString::fromStdString(propertyValue)); + } + else if (propertyName != "UUID") { + Base::Console().Log("\tProperty '%s' is not described by any model. Ignored\n", + propertyName.c_str()); + } + } + } + } + + // Add appearance models + if (yamlModel["AppearanceModels"]) { + auto models = yamlModel["AppearanceModels"]; + for (auto it = models.begin(); it != models.end(); it++) { + std::string modelName = (it->first).as(); + + // Add the model uuid + auto modelNode = models[modelName]; + std::string modelUUID = modelNode["UUID"].as(); + finalModel->addAppearance(QString::fromStdString(modelUUID)); + + // Add the property values + auto properties = yamlModel["AppearanceModels"][modelName]; + for (auto itp = properties.begin(); itp != properties.end(); itp++) { + std::string propertyName = (itp->first).as(); + std::string propertyValue = (itp->second).as(); + + if (finalModel->hasAppearanceProperty(QString::fromStdString(propertyName))) { + finalModel->setAppearanceValue(QString::fromStdString(propertyName), + QString::fromStdString(propertyValue)); + } + else if (propertyName != "UUID") { + Base::Console().Log("\tProperty '%s' is not described by any model. Ignored\n", + propertyName.c_str()); + } + } + } + } + + QString path = QDir(directory).absolutePath(); + // Base::Console().Log("\tPath '%s'\n", path.toStdString().c_str()); + (*materialMap)[uuid] = library.addMaterial(*finalModel, path); +} + +std::unique_ptr> MaterialLoader::_materialEntryMap = nullptr; + +MaterialLoader::MaterialLoader(std::shared_ptr> materialMap, + std::shared_ptr> libraryList) + : _materialMap(materialMap) + , _libraryList(libraryList) +{ + loadLibraries(); +} + +/* + * Destroys the object and frees any allocated resources + */ +MaterialLoader::~MaterialLoader() +{} + +void MaterialLoader::addLibrary(MaterialLibrary* model) +{ + _libraryList->push_back(model); +} + +MaterialEntry* MaterialLoader::getMaterialFromPath(MaterialLibrary& library, + const QString& path) const +{ + MaterialEntry* model = nullptr; + + // Used for debugging + std::string uuid; + std::string pathName = path.toStdString(); + + if (MaterialConfigLoader::isConfigStyle(path)) { + Base::Console().Log("Old format .FCMat file: '%s'\n", pathName.c_str()); + Material* material = MaterialConfigLoader::getMaterialFromPath(library, path); + if (material) { + (*_materialMap)[material->getUUID()] = library.addMaterial(*material, path); + } + + // Return the nullptr as there are no intermediate steps to take, such + // as checking inheritance + return model; + } + + YAML::Node yamlroot; + try { + yamlroot = YAML::LoadFile(pathName); + + const std::string uuid = yamlroot["General"]["UUID"].as(); + // Always get the name from the filename + // QString name = QString::fromStdString(yamlroot["General"]["Name"].as()); + QFileInfo filepath(path); + QString name = + filepath.fileName().remove(QString::fromStdString(".FCMat"), Qt::CaseInsensitive); + + model = new MaterialYamlEntry(library, name, path, QString::fromStdString(uuid), yamlroot); + // showYaml(yamlroot); + } + catch (YAML::Exception const& e) { + Base::Console().Error("YAML parsing error: '%s'\n", pathName.c_str()); + Base::Console().Error("\t'%s'\n", e.what()); + showYaml(yamlroot); + } + + + return model; +} + +void MaterialLoader::showYaml(const YAML::Node& yaml) +{ + std::stringstream out; + + out << yaml; + std::string logData = out.str(); + Base::Console().Log("%s\n", logData.c_str()); +} + + +void MaterialLoader::dereference(Material* material) +{ + // Avoid recursion + if (material->getDereferenced()) { + return; + } + + // Base::Console().Log("Dereferencing material '%s'.\n", + // material->getName().toStdString().c_str()); + + auto parentUUID = material->getParentUUID(); + if (parentUUID.size() > 0) { + Material* parent; + try { + parent = (*_materialMap)[parentUUID]; + } + catch (std::out_of_range& e) { + Base::Console().Log( + "Unable to apply inheritance for material '%s', parent '%s' not found.\n", + material->getName().toStdString().c_str(), + parentUUID.toStdString().c_str()); + } + + // Ensure the parent has been dereferenced + dereference(parent); + + // Add physical models + auto modelVector = parent->getPhysicalModels(); + for (auto model = modelVector->begin(); model != modelVector->end(); model++) { + if (!material->hasPhysicalModel(*model)) { + material->addPhysical(*model); + } + } + + // Add appearance models + modelVector = parent->getAppearanceModels(); + for (auto model = modelVector->begin(); model != modelVector->end(); model++) { + if (!material->hasAppearanceModel(*model)) { + material->addAppearance(*model); + } + } + + // Add values + auto properties = parent->getPhysicalProperties(); + for (auto itp = properties.begin(); itp != properties.end(); itp++) { + auto name = itp->first; + auto property = static_cast(itp->second); + + if (material->getPhysicalProperty(name).isNull()) { + material->getPhysicalProperty(name).setValue(property.getValue()); + } + } + + properties = parent->getAppearanceProperties(); + for (auto itp = properties.begin(); itp != properties.end(); itp++) { + auto name = itp->first; + auto property = static_cast(itp->second); + + if (material->getAppearanceProperty(name).isNull()) { + material->getAppearanceProperty(name).setValue(property.getValue()); + } + } + } + + material->markDereferenced(); +} + +void MaterialLoader::loadLibrary(MaterialLibrary& library) +{ + if (_materialEntryMap == nullptr) { + _materialEntryMap = std::make_unique>(); + } + + QDirIterator it(library.getDirectory(), QDirIterator::Subdirectories); + while (it.hasNext()) { + auto pathname = it.next(); + QFileInfo file(pathname); + if (file.isFile()) { + if (file.suffix().toStdString() == "FCMat") { + QString libraryName = file.baseName(); + + auto model = getMaterialFromPath(library, file.canonicalFilePath()); + if (model) { + (*_materialEntryMap)[model->getUUID()] = model; + } + } + } + } + + for (auto it = _materialEntryMap->begin(); it != _materialEntryMap->end(); it++) { + it->second->addToTree(_materialMap); + } +} + +void MaterialLoader::loadLibraries() +{ + auto _libraryList = getMaterialLibraries(); + if (_libraryList) { + for (auto it = _libraryList->begin(); it != _libraryList->end(); it++) { + loadLibrary(**it); + } + } + + for (auto it = _materialMap->begin(); it != _materialMap->end(); it++) { + dereference(it->second); + } +} + +std::shared_ptr> MaterialLoader::getMaterialLibraries() +{ + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Resources"); + bool useBuiltInMaterials = param->GetBool("UseBuiltInMaterials", true); + bool useMatFromModules = param->GetBool("UseMaterialsFromWorkbenches", true); + bool useMatFromConfigDir = param->GetBool("UseMaterialsFromConfigDir", true); + bool useMatFromCustomDir = param->GetBool("UseMaterialsFromCustomDir", true); + + if (useBuiltInMaterials) { + QString resourceDir = QString::fromStdString(App::Application::getResourceDir() + + "/Mod/Material/Resources/Materials"); + auto libData = new MaterialLibrary(QString::fromStdString("System"), + resourceDir, + QString::fromStdString(":/icons/freecad.svg"), + true); + _libraryList->push_back(libData); + } + + if (useMatFromModules) { + auto moduleParam = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Resources/Modules"); + for (auto& group : moduleParam->GetGroups()) { + // auto module = moduleParam->GetGroup(group->GetGroupName()); + auto moduleName = QString::fromStdString(group->GetGroupName()); + auto materialDir = QString::fromStdString(group->GetASCII("ModuleDir", "")); + auto materialIcon = QString::fromStdString(group->GetASCII("ModuleIcon", "")); + auto materialReadOnly = group->GetBool("ModuleReadOnly", true); + + if (materialDir.length() > 0) { + QDir dir(materialDir); + if (dir.exists()) { + auto libData = new MaterialLibrary(moduleName, + materialDir, + materialIcon, + materialReadOnly); + _libraryList->push_back(libData); + } + } + } + } + + if (useMatFromConfigDir) { + QString resourceDir = + QString::fromStdString(App::Application::getUserAppDataDir() + "/Material"); + if (!resourceDir.isEmpty()) { + QDir materialDir(resourceDir); + if (materialDir.exists()) { + auto libData = + new MaterialLibrary(QString::fromStdString("User"), + resourceDir, + QString::fromStdString(":/icons/preferences-general.svg"), + false); + _libraryList->push_back(libData); + } + } + } + + if (useMatFromCustomDir) { + QString resourceDir = QString::fromStdString(param->GetASCII("CustomMaterialsDir", "")); + if (!resourceDir.isEmpty()) { + QDir materialDir(resourceDir); + if (materialDir.exists()) { + auto libData = new MaterialLibrary(QString::fromStdString("Custom"), + resourceDir, + QString::fromStdString(":/icons/user.svg"), + false); + _libraryList->push_back(libData); + } + } + } + + return _libraryList; +} + +std::shared_ptr> +MaterialLoader::getMaterialFolders(const MaterialLibrary& library) +{ + std::shared_ptr> pathList = std::make_shared>(); + QDirIterator it(library.getDirectory(), QDirIterator::Subdirectories); + while (it.hasNext()) { + auto pathname = it.next(); + QFileInfo file(pathname); + if (file.isDir()) { + QString path = QDir(library.getDirectory()).relativeFilePath(file.absoluteFilePath()); + if (!path.startsWith(QString::fromStdString("."))) { + pathList->push_back(path); + } + } + } + + return pathList; +} diff --git a/src/Mod/Material/App/MaterialLoader.h b/src/Mod/Material/App/MaterialLoader.h new file mode 100644 index 0000000000..f4bac08939 --- /dev/null +++ b/src/Mod/Material/App/MaterialLoader.h @@ -0,0 +1,128 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MATERIALLOADER_H +#define MATERIAL_MATERIALLOADER_H + +#include +#include +#include + +#include "Materials.h" +#include "trim.h" + +namespace Materials +{ + +class MaterialEntry +{ +public: + MaterialEntry(); + explicit MaterialEntry(const MaterialLibrary& library, + const QString& modelName, + const QString& dir, + const QString& modelUuid); + virtual ~MaterialEntry() = default; + + virtual void addToTree(std::shared_ptr> materialMap) = 0; + + const MaterialLibrary& getLibrary() const + { + return _library; + } + const QString getName() const + { + return _name; + } + const QString getDirectory() const + { + return _directory; + } + const QString getUUID() const + { + return _uuid; + } + +protected: + MaterialLibrary _library; + QString _name; + QString _directory; + QString _uuid; +}; + +class MaterialYamlEntry: public MaterialEntry +{ +public: + explicit MaterialYamlEntry(const MaterialLibrary& library, + const QString& modelName, + const QString& dir, + const QString& modelUuid, + const YAML::Node& modelData); + ~MaterialYamlEntry() override = default; + + void addToTree(std::shared_ptr> materialMap) override; + + const YAML::Node& getModel() const + { + return _model; + } + YAML::Node* getModelPtr() + { + return &_model; + } + +private: + MaterialYamlEntry(); + + QString + yamlValue(const YAML::Node& node, const std::string& key, const std::string& defaultValue); + + YAML::Node _model; +}; + +class MaterialLoader +{ +public: + explicit MaterialLoader(std::shared_ptr> materialMap, + std::shared_ptr> libraryList); + virtual ~MaterialLoader(); + + std::shared_ptr> getMaterialLibraries(); + static std::shared_ptr> getMaterialFolders(const MaterialLibrary& library); + static void showYaml(const YAML::Node& yaml); + +private: + MaterialLoader(); + + void addToTree(MaterialEntry* model); + void dereference(Material* material); + MaterialEntry* getMaterialFromPath(MaterialLibrary& library, const QString& path) const; + void addLibrary(MaterialLibrary* model); + void loadLibrary(MaterialLibrary& library); + void loadLibraries(); + static std::unique_ptr> _materialEntryMap; + std::shared_ptr> _materialMap; + std::shared_ptr> _libraryList; +}; + +} // namespace Materials + +#endif // MATERIAL_MATERIALLOADER_H diff --git a/src/Mod/Material/App/MaterialManager.cpp b/src/Mod/Material/App/MaterialManager.cpp new file mode 100644 index 0000000000..717a273cff --- /dev/null +++ b/src/Mod/Material/App/MaterialManager.cpp @@ -0,0 +1,276 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include + +#include + +#include "Exceptions.h" +#include "MaterialLoader.h" +#include "MaterialManager.h" +#include "ModelManager.h" + + +using namespace Materials; + +/* TRANSLATOR Material::Materials */ + +std::shared_ptr> MaterialManager::_libraryList = nullptr; +std::shared_ptr> MaterialManager::_materialMap = nullptr; +QMutex MaterialManager::_mutex; + +TYPESYSTEM_SOURCE(Materials::MaterialManager, Base::BaseClass) + +MaterialManager::MaterialManager() +{ + // TODO: Add a mutex or similar + initLibraries(); +} + +void MaterialManager::initLibraries() +{ + QMutexLocker locker(&_mutex); + + if (_materialMap == nullptr) { + // Load the models first + ModelManager* manager = new ModelManager(); + Q_UNUSED(manager) + + delete manager; + + _materialMap = std::make_shared>(); + + if (_libraryList == nullptr) { + _libraryList = std::make_shared>(); + } + + // Load the libraries + MaterialLoader loader(_materialMap, _libraryList); + } +} + +void MaterialManager::saveMaterial(MaterialLibrary* library, + Material& material, + const QString& path, + bool saveAsCopy) +{ + Material* newMaterial = library->saveMaterial(material, path, saveAsCopy); + + try { + Material* old = _materialMap->at(newMaterial->getUUID()); + if (old) { + delete old; + } + } + catch (const std::out_of_range&) { + } + + (*_materialMap)[material.getUUID()] = newMaterial; +} + +bool MaterialManager::isMaterial(const fs::path& p) +{ + if (!fs::is_regular_file(p)) { + return false; + } + // check file extension + if (p.extension() == ".FCMat") { + return true; + } + return false; +} + +const Material& MaterialManager::getMaterial(const QString& uuid) const +{ + try { + return *(_materialMap->at(uuid)); + } + catch (std::out_of_range& e) { + throw MaterialNotFound(); + } +} + +const Material& MaterialManager::getMaterialByPath(const QString& path) const +{ + QString cleanPath = QDir::cleanPath(path); + + for (auto library : *_libraryList) { + Base::Console().Log("MaterialManager::getMaterialByPath() Checking library '%s'->'%s'\n", + library->getName().toStdString().c_str(), + library->getDirectory().toStdString().c_str()); + + + if (cleanPath.startsWith(library->getDirectory())) { + Base::Console().Log("MaterialManager::getMaterialByPath() Library '%s'\n", + library->getDirectory().toStdString().c_str()); + Base::Console().Log("MaterialManager::getMaterialByPath() Path '%s'\n", + cleanPath.toStdString().c_str()); + return library->getMaterialByPath(cleanPath); + } + } + Base::Console().Log("MaterialManager::getMaterialByPath() Library not found for path '%s'\n", + cleanPath.toStdString().c_str()); + + throw MaterialNotFound(); +} + +const Material& MaterialManager::getMaterialByPath(const QString& path, const QString& lib) const +{ + auto library = getLibrary(lib); // May throw LibraryNotFound + return library->getMaterialByPath(path); // May throw MaterialNotFound +} + +MaterialLibrary* MaterialManager::getLibrary(const QString& name) const +{ + for (auto library : *_libraryList) { + if (library->getName() == name) { + return library; + } + } + + throw LibraryNotFound(); +} + +std::shared_ptr> MaterialManager::getMaterialLibraries() +{ + if (_libraryList == nullptr) { + if (_materialMap == nullptr) { + _materialMap = std::make_shared>(); + } + _libraryList = std::make_shared>(); + + // Load the libraries + MaterialLoader loader(_materialMap, _libraryList); + } + return _libraryList; +} + +std::shared_ptr> +MaterialManager::getMaterialTree(const MaterialLibrary& library) const +{ + std::shared_ptr> materialTree = + std::make_shared>(); + + for (auto it = _materialMap->begin(); it != _materialMap->end(); it++) { + auto filename = it->first; + auto material = it->second; + + if (material->getLibrary() == library) { + fs::path path = material->getDirectory().toStdString(); + + // Start at the root + auto node = materialTree; + for (auto itp = path.begin(); itp != path.end(); itp++) { + if (QString::fromStdString(itp->string()) + .endsWith(QString::fromStdString(".FCMat"))) { + MaterialTreeNode* child = new MaterialTreeNode(); + child->setData(material); + (*node)[QString::fromStdString(itp->string())] = child; + } + else { + // Add the folder only if it's not already there + QString folderName = QString::fromStdString(itp->string()); + std::shared_ptr> mapPtr; + if (node->count(folderName) == 0) { + mapPtr = std::make_shared>(); + MaterialTreeNode* child = new MaterialTreeNode(); + child->setFolder(mapPtr); + (*node)[folderName] = child; + node = mapPtr; + } + else { + node = (*node)[folderName]->getFolder(); + } + } + } + } + } + + auto folderList = getMaterialFolders(library); + for (auto folder : *folderList) { + fs::path path = folder.toStdString(); + + // Start at the root + auto node = materialTree; + for (auto itp = path.begin(); itp != path.end(); itp++) { + // Add the folder only if it's not already there + QString folderName = QString::fromStdString(itp->string()); + if (node->count(folderName) == 0) { + std::shared_ptr> mapPtr = + std::make_shared>(); + MaterialTreeNode* child = new MaterialTreeNode(); + child->setFolder(mapPtr); + (*node)[folderName] = child; + node = mapPtr; + } + else { + node = (*node)[folderName]->getFolder(); + } + } + } + + return materialTree; +} + +std::shared_ptr> +MaterialManager::getMaterialFolders(const MaterialLibrary& library) const +{ + return MaterialLoader::getMaterialFolders(library); +} + +std::shared_ptr> MaterialManager::materialsWithModel(QString uuid) +{ + std::shared_ptr> dict = + std::make_shared>(); + + for (auto it = _materialMap->begin(); it != _materialMap->end(); it++) { + QString key = it->first; + Material* material = it->second; + + if (material->hasModel(uuid)) { + (*dict)[key] = material; + } + } + + return dict; +} + +std::shared_ptr> +MaterialManager::materialsWithModelComplete(QString uuid) +{ + std::shared_ptr> dict = + std::make_shared>(); + + for (auto it = _materialMap->begin(); it != _materialMap->end(); it++) { + QString key = it->first; + Material* material = it->second; + + if (material->isModelComplete(uuid)) { + (*dict)[key] = material; + } + } + + return dict; +} diff --git a/src/Mod/Material/App/MaterialManager.h b/src/Mod/Material/App/MaterialManager.h new file mode 100644 index 0000000000..03c423326d --- /dev/null +++ b/src/Mod/Material/App/MaterialManager.h @@ -0,0 +1,87 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MATERIALMANAGER_H +#define MATERIAL_MATERIALMANAGER_H + +#include + +#include + +#include + +#include "FolderTree.h" +#include "Materials.h" + +namespace fs = boost::filesystem; + +namespace Materials +{ + +typedef FolderTreeNode MaterialTreeNode; + +class MaterialsExport MaterialManager: public Base::BaseClass +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + MaterialManager(); + ~MaterialManager() override = default; + + std::shared_ptr> getMaterials() + { + return _materialMap; + } + const Material& getMaterial(const QString& uuid) const; + const Material& getMaterialByPath(const QString& path) const; + const Material& getMaterialByPath(const QString& path, const QString& library) const; + MaterialLibrary* getLibrary(const QString& name) const; + + // Library management + static std::shared_ptr> getMaterialLibraries(); + std::shared_ptr> + getMaterialTree(const MaterialLibrary& library) const; + std::shared_ptr> getMaterialFolders(const MaterialLibrary& library) const; + void createPath(MaterialLibrary* library, const QString& path) + { + library->createPath(path); + } + void saveMaterial(MaterialLibrary* library, + Material& material, + const QString& path, + bool saveAsCopy = true); + + static bool isMaterial(const fs::path& p); + + std::shared_ptr> materialsWithModel(QString uuid); + std::shared_ptr> materialsWithModelComplete(QString uuid); + +private: + static std::shared_ptr> _libraryList; + static std::shared_ptr> _materialMap; + static QMutex _mutex; + + static void initLibraries(); +}; + +} // namespace Materials + +#endif // MATERIAL_MATERIALMANAGER_H diff --git a/src/Mod/Material/App/MaterialManagerPy.xml b/src/Mod/Material/App/MaterialManagerPy.xml new file mode 100644 index 0000000000..af9579ee75 --- /dev/null +++ b/src/Mod/Material/App/MaterialManagerPy.xml @@ -0,0 +1,51 @@ + + + + + + Material descriptions. + + + + Get a material object by specifying its UUID + + + + + Get a material object by specifying its path and library name + + + + + List of Material libraries. + + + + + + List of Materials. + + + + + + Get a list of materials implementing the specified model + + + + + Get a list of materials implementing the specified model, with values for all properties + + + + diff --git a/src/Mod/Material/App/MaterialManagerPyImpl.cpp b/src/Mod/Material/App/MaterialManagerPyImpl.cpp new file mode 100644 index 0000000000..733b2cba2c --- /dev/null +++ b/src/Mod/Material/App/MaterialManagerPyImpl.cpp @@ -0,0 +1,200 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" + +#ifndef _PreComp_ +#include +#endif + +#include "Exceptions.h" +#include "MaterialManager.h" +#include "MaterialManagerPy.h" +#include "MaterialPy.h" +#include "Materials.h" + +#include "MaterialManagerPy.cpp" + +using namespace Materials; + +// returns a string which represents the object e.g. when printed in python +std::string MaterialManagerPy::representation() const +{ + std::stringstream str; + str << ""; + + return str.str(); +} + +PyObject* MaterialManagerPy::PyMake(struct _typeobject*, PyObject*, PyObject*) // Python wrapper +{ + // never create such objects with the constructor + return new MaterialManagerPy(new MaterialManager()); +} + +// constructor method +int MaterialManagerPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) +{ + return 0; +} + +PyObject* MaterialManagerPy::getMaterial(PyObject* args) +{ + char* uuid; + if (!PyArg_ParseTuple(args, "s", &uuid)) { + return nullptr; + } + + try { + const Material& material = + getMaterialManagerPtr()->getMaterial(QString::fromStdString(uuid)); + return new MaterialPy(new Material(material)); + } + catch (const MaterialNotFound&) { + PyErr_SetString(PyExc_LookupError, "Material not found"); + return nullptr; + } +} + +PyObject* MaterialManagerPy::getMaterialByPath(PyObject* args) +{ + char* path; + char* lib = ""; + if (!PyArg_ParseTuple(args, "s|s", &path, &lib)) { + return nullptr; + } + + QString libPath(QString::fromStdString(lib)); + if (!libPath.isEmpty()) { + try { + const Material& material = + getMaterialManagerPtr()->getMaterialByPath(QString::fromStdString(path), libPath); + return new MaterialPy(new Material(material)); + } + catch (const MaterialNotFound&) { + PyErr_SetString(PyExc_LookupError, "Material not found"); + return nullptr; + } + catch (const LibraryNotFound&) { + PyErr_SetString(PyExc_LookupError, "Library not found"); + return nullptr; + } + } + + try { + const Material& material = + getMaterialManagerPtr()->getMaterialByPath(QString::fromStdString(path)); + return new MaterialPy(new Material(material)); + } + catch (const MaterialNotFound&) { + PyErr_SetString(PyExc_LookupError, "Material not found"); + return nullptr; + } +} + +Py::List MaterialManagerPy::getMaterialLibraries() const +{ + auto libraries = getMaterialManagerPtr()->getMaterialLibraries(); + Py::List list; + + for (auto it = libraries->begin(); it != libraries->end(); it++) { + MaterialLibrary* lib = *it; + Py::Tuple libTuple(3); + libTuple.setItem(0, Py::String(lib->getName().toStdString())); + libTuple.setItem(1, Py::String(lib->getDirectoryPath().toStdString())); + libTuple.setItem(2, Py::String(lib->getIconPath().toStdString())); + + list.append(libTuple); + } + + return list; +} + +Py::Dict MaterialManagerPy::getMaterials() const +{ + Py::Dict dict; + + auto materials = getMaterialManagerPtr()->getMaterials(); + + for (auto it = materials->begin(); it != materials->end(); it++) { + QString key = it->first; + Material* material = it->second; + + PyObject* materialPy = new MaterialPy(new Material(*material)); + dict.setItem(Py::String(key.toStdString()), Py::Object(materialPy, true)); + } + + // return Py::new_reference_to(dict); + return dict; +} + +PyObject* MaterialManagerPy::getCustomAttributes(const char* /*attr*/) const +{ + return nullptr; +} + +int MaterialManagerPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) +{ + return 0; +} + +PyObject* MaterialManagerPy::materialsWithModel(PyObject* args) +{ + char* uuid; + if (!PyArg_ParseTuple(args, "s", &uuid)) { + return nullptr; + } + + auto materials = getMaterialManagerPtr()->materialsWithModel(QString::fromStdString(uuid)); + PyObject* dict = PyDict_New(); + + for (auto it = materials->begin(); it != materials->end(); it++) { + QString key = it->first; + Material* material = it->second; + + PyObject* materialPy = new MaterialPy(new Material(*material)); + PyDict_SetItem(dict, PyUnicode_FromString(key.toStdString().c_str()), materialPy); + } + + return dict; +} + +PyObject* MaterialManagerPy::materialsWithModelComplete(PyObject* args) +{ + char* uuid; + if (!PyArg_ParseTuple(args, "s", &uuid)) { + return nullptr; + } + + auto materials = + getMaterialManagerPtr()->materialsWithModelComplete(QString::fromStdString(uuid)); + PyObject* dict = PyDict_New(); + + for (auto it = materials->begin(); it != materials->end(); it++) { + QString key = it->first; + Material* material = it->second; + + PyObject* materialPy = new MaterialPy(new Material(*material)); + PyDict_SetItem(dict, PyUnicode_FromString(key.toStdString().c_str()), materialPy); + } + + return dict; +} diff --git a/src/Mod/Material/App/MaterialPy.xml b/src/Mod/Material/App/MaterialPy.xml new file mode 100644 index 0000000000..d2ffb43da2 --- /dev/null +++ b/src/Mod/Material/App/MaterialPy.xml @@ -0,0 +1,161 @@ + + + + + + Material descriptions. + + + + Model library name. + + + + + + Model library path. + + + + + + Model icon path. + + + + + + Model name. + + + + + + Model directory relative to the library root. + + + + + + Unique model identifier. + + + + + + Description of the material. + + + + + + URL to a material reference. + + + + + + Reference for material data. + + + + + + Parent material UUID. + + + + + + Author and license information. + + + + + + List of implemented models. + + + + + + List of implemented models. + + + + + + List of searchable tags. + + + + + + Check if the material implements the physical model with the given UUID + + + + + Check if the material implements the appearance model with the given UUID + + + + + Check if the material implements the physical model with the given UUID, and has values defined for each property + + + + + Check if the material implements the appearance model with the given UUID, and has values defined for each property + + + + + Check if the material implements the physical property with the given name + + + + + Check if the material implements the appearance property with the given name + + + + + deprecated -- Dictionary of all material properties. + + + + + + deprecated -- Dictionary of material physical properties. + + + + + + deprecated -- Dictionary of material appearance properties. + + + + + + Get the value associated with the property + + + + + Get the value associated with the property + + + + diff --git a/src/Mod/Material/App/MaterialPyImpl.cpp b/src/Mod/Material/App/MaterialPyImpl.cpp new file mode 100644 index 0000000000..8248f2951f --- /dev/null +++ b/src/Mod/Material/App/MaterialPyImpl.cpp @@ -0,0 +1,394 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" + +#ifndef _PreComp_ +#include +#endif + +#include + +#include +#include +#include + +#include "Exceptions.h" +#include "MaterialPy.h" +#include "Materials.h" + +#include "MaterialPy.cpp" + +using namespace Materials; + +// returns a string which represents the object e.g. when printed in python +std::string MaterialPy::representation() const +{ + MaterialPy::PointerType ptr = getMaterialPtr(); + std::stringstream str; + str << "Property [Name=("; + str << ptr->getName().toStdString(); + str << "), UUID=("; + str << ptr->getUUID().toStdString(); + str << "), Library Name=("; + str << ptr->getLibrary().getName().toStdString(); + str << "), Library Root=("; + str << ptr->getLibrary().getDirectoryPath().toStdString(); + str << "), Library Icon=("; + str << ptr->getLibrary().getIconPath().toStdString(); + str << "), Directory=("; + str << ptr->getDirectory().toStdString(); + // str << "), URL=("; + // str << ptr->getURL(); + // str << "), DOI=("; + // str << ptr->getDOI(); + // str << "), Description=("; + // str << ptr->getDescription(); + // str << "), Inherits=["; + // const std::vector &inherited = getMaterialPtr()->getInheritance(); + // for (auto it = inherited.begin(); it != inherited.end(); it++) + // { + // std::string uuid = *it; + // if (it != inherited.begin()) + // str << "), UUID=("; + // else + // str << "UUID=("; + // str << uuid << ")"; + // } + // str << "]]"; + str << ")]"; + + return str.str(); +} + +PyObject* MaterialPy::PyMake(struct _typeobject*, PyObject*, PyObject*) // Python wrapper +{ + // never create such objects with the constructor + return new MaterialPy(new Material()); +} + +// constructor method +int MaterialPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) +{ + return 0; +} + +Py::String MaterialPy::getLibraryName() const +{ + return Py::String(getMaterialPtr()->getLibrary().getName().toStdString()); +} + +Py::String MaterialPy::getLibraryRoot() const +{ + return Py::String(getMaterialPtr()->getLibrary().getDirectoryPath().toStdString()); +} + +Py::String MaterialPy::getLibraryIcon() const +{ + return Py::String(getMaterialPtr()->getLibrary().getIconPath().toStdString()); +} + +Py::String MaterialPy::getName() const +{ + return Py::String(getMaterialPtr()->getName().toStdString()); +} + +Py::String MaterialPy::getDirectory() const +{ + return Py::String(getMaterialPtr()->getDirectory().toStdString()); +} + +Py::String MaterialPy::getUUID() const +{ + return Py::String(getMaterialPtr()->getUUID().toStdString()); +} + +Py::String MaterialPy::getDescription() const +{ + return Py::String(getMaterialPtr()->getDescription().toStdString()); +} + +Py::String MaterialPy::getURL() const +{ + return Py::String(getMaterialPtr()->getURL().toStdString()); +} + +Py::String MaterialPy::getReference() const +{ + return Py::String(getMaterialPtr()->getReference().toStdString()); +} + +Py::String MaterialPy::getParent() const +{ + return Py::String(getMaterialPtr()->getParentUUID().toStdString()); +} + +Py::String MaterialPy::getAuthorAndLicense() const +{ + return Py::String(getMaterialPtr()->getAuthorAndLicense().toStdString()); +} + +Py::List MaterialPy::getPhysicalModels() const +{ + const std::vector* models = getMaterialPtr()->getPhysicalModels(); + Py::List list; + + for (auto it = models->begin(); it != models->end(); it++) { + QString uuid = *it; + + list.append(Py::String(uuid.toStdString())); + } + + return list; +} + +Py::List MaterialPy::getAppearanceModels() const +{ + const std::vector* models = getMaterialPtr()->getAppearanceModels(); + Py::List list; + + for (auto it = models->begin(); it != models->end(); it++) { + QString uuid = *it; + + list.append(Py::String(uuid.toStdString())); + } + + return list; +} + +Py::List MaterialPy::getTags() const +{ + const std::list& tags = getMaterialPtr()->getTags(); + Py::List list; + + for (auto it = tags.begin(); it != tags.end(); it++) { + QString uuid = *it; + + list.append(Py::String(uuid.toStdString())); + } + + return list; +} + +PyObject* MaterialPy::getCustomAttributes(const char* /*attr*/) const +{ + return nullptr; +} + +int MaterialPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) +{ + return 0; +} + +PyObject* MaterialPy::hasPhysicalModel(PyObject* args) +{ + char* uuid; + if (!PyArg_ParseTuple(args, "s", &uuid)) { + return nullptr; + } + + bool hasProperty = getMaterialPtr()->hasPhysicalModel(QString::fromStdString(uuid)); + return hasProperty ? Py_True : Py_False; +} + +PyObject* MaterialPy::hasAppearanceModel(PyObject* args) +{ + char* uuid; + if (!PyArg_ParseTuple(args, "s", &uuid)) { + return nullptr; + } + + bool hasProperty = getMaterialPtr()->hasAppearanceModel(QString::fromStdString(uuid)); + return hasProperty ? Py_True : Py_False; +} + +PyObject* MaterialPy::isPhysicalModelComplete(PyObject* args) +{ + char* name; + if (!PyArg_ParseTuple(args, "s", &name)) { + return nullptr; + } + + bool isComplete = getMaterialPtr()->isPhysicalModelComplete(QString::fromStdString(name)); + return isComplete ? Py_True : Py_False; +} + +PyObject* MaterialPy::isAppearanceModelComplete(PyObject* args) +{ + char* name; + if (!PyArg_ParseTuple(args, "s", &name)) { + return nullptr; + } + + bool isComplete = getMaterialPtr()->isAppearanceModelComplete(QString::fromStdString(name)); + return isComplete ? Py_True : Py_False; +} + +PyObject* MaterialPy::hasPhysicalProperty(PyObject* args) +{ + char* name; + if (!PyArg_ParseTuple(args, "s", &name)) { + return nullptr; + } + + bool hasProperty = getMaterialPtr()->hasPhysicalProperty(QString::fromStdString(name)); + return hasProperty ? Py_True : Py_False; +} + +PyObject* MaterialPy::hasAppearanceProperty(PyObject* args) +{ + char* name; + if (!PyArg_ParseTuple(args, "s", &name)) { + return nullptr; + } + + bool hasProperty = getMaterialPtr()->hasAppearanceProperty(QString::fromStdString(name)); + return hasProperty ? Py_True : Py_False; +} + +Py::Dict MaterialPy::getProperties() const +{ + Py::Dict dict; + + // Maintain backwards compatibility + dict.setItem(Py::String("CardName"), Py::String(getMaterialPtr()->getName().toStdString())); + dict.setItem(Py::String("AuthorAndLicense"), + Py::String(getMaterialPtr()->getAuthorAndLicense().toStdString())); + dict.setItem(Py::String("Name"), Py::String(getMaterialPtr()->getName().toStdString())); + dict.setItem(Py::String("Description"), + Py::String(getMaterialPtr()->getDescription().toStdString())); + dict.setItem(Py::String("ReferenceSource"), + Py::String(getMaterialPtr()->getReference().toStdString())); + dict.setItem(Py::String("SourceURL"), Py::String(getMaterialPtr()->getURL().toStdString())); + + auto properties = getMaterialPtr()->getPhysicalProperties(); + for (auto it = properties.begin(); it != properties.end(); it++) { + QString key = it->first; + MaterialProperty& materialProperty = it->second; + + if (!materialProperty.isNull()) { + auto value = materialProperty.getString(); + dict.setItem(Py::String(key.toStdString()), Py::String(value.toStdString())); + } + } + + properties = getMaterialPtr()->getAppearanceProperties(); + for (auto it = properties.begin(); it != properties.end(); it++) { + QString key = it->first; + MaterialProperty& materialProperty = it->second; + + if (!materialProperty.isNull()) { + auto value = materialProperty.getString(); + dict.setItem(Py::String(key.toStdString()), Py::String(value.toStdString())); + } + } + + return dict; +} + +Py::Dict MaterialPy::getPhysicalProperties() const +{ + Py::Dict dict; + + auto properties = getMaterialPtr()->getPhysicalProperties(); + for (auto it = properties.begin(); it != properties.end(); it++) { + QString key = it->first; + MaterialProperty& materialProperty = it->second; + + if (!materialProperty.isNull()) { + auto value = materialProperty.getString(); + dict.setItem(Py::String(key.toStdString()), Py::String(value.toStdString())); + } + } + + return dict; +} + +Py::Dict MaterialPy::getAppearanceProperties() const +{ + Py::Dict dict; + + auto properties = getMaterialPtr()->getAppearanceProperties(); + for (auto it = properties.begin(); it != properties.end(); it++) { + QString key = it->first; + MaterialProperty& materialProperty = it->second; + + if (!materialProperty.isNull()) { + auto value = materialProperty.getString(); + dict.setItem(Py::String(key.toStdString()), Py::String(value.toStdString())); + } + } + + return dict; +} + +static PyObject* _pyObjectFromVariant(const QVariant& value) +{ + if (value.isNull()) { + return new PyObject(); + } + + if (value.userType() == qMetaTypeId()) { + return new Base::QuantityPy(new Base::Quantity(value.value())); + } + else if (value.userType() == QMetaType::Double) { + return PyFloat_FromDouble(value.toDouble()); + } + else if (value.userType() == QMetaType::Float) { + return PyFloat_FromDouble(value.toFloat()); + } + else if (value.userType() == QMetaType::Int) { + return PyLong_FromLong(value.toInt()); + } + else if (value.userType() == QMetaType::Long) { + return PyLong_FromLong(value.toInt()); + } + else if (value.userType() == QMetaType::Bool) { + return value.toBool() ? Py_True : Py_False; + } + else if (value.userType() == QMetaType::QString) { + return PyUnicode_FromString(value.toString().toStdString().c_str()); + } + + throw UnknownValueType(); +} + +PyObject* MaterialPy::getPhysicalValue(PyObject* args) +{ + char* name; + if (!PyArg_ParseTuple(args, "s", &name)) { + return nullptr; + } + + QVariant value = getMaterialPtr()->getPhysicalValue(QString::fromStdString(name)); + return _pyObjectFromVariant(value); +} + +PyObject* MaterialPy::getAppearanceValue(PyObject* args) +{ + char* name; + if (!PyArg_ParseTuple(args, "s", &name)) { + return nullptr; + } + + QVariant value = getMaterialPtr()->getAppearanceValue(QString::fromStdString(name)); + return _pyObjectFromVariant(value); +} diff --git a/src/Mod/Material/App/MaterialValue.cpp b/src/Mod/Material/App/MaterialValue.cpp new file mode 100644 index 0000000000..76805d369b --- /dev/null +++ b/src/Mod/Material/App/MaterialValue.cpp @@ -0,0 +1,242 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include + +#include "Exceptions.h" +#include "MaterialValue.h" + + +using namespace Materials; + +/* TRANSLATOR Material::MaterialValue */ + +MaterialValue::MaterialValue() + : _valueType(None) +{} + +MaterialValue::MaterialValue(ValueType type) + : _valueType(type) +{} + +//=== + +Material2DArray::Material2DArray() + : MaterialValue(Array2D) + , _defaultSet(false) +{} + +MaterialValue Material2DArray::getDefault() const +{ + MaterialValue ret(_valueType); + ret.setValue(_value); + return ret; +} + +const std::vector* Material2DArray::getRow(int row) const +{ + try { + return _rows.at(row); + } + catch (std::out_of_range const&) { + throw InvalidRow(); + } +} + +std::vector* Material2DArray::getRow(int row) +{ + try { + return _rows.at(row); + } + catch (std::out_of_range const&) { + throw InvalidRow(); + } +} + +void Material2DArray::addRow(std::vector* row) +{ + _rows.push_back(row); +} + +void Material2DArray::insertRow(int index, std::vector* row) +{ + _rows.insert(_rows.begin() + index, row); +} + +void Material2DArray::deleteRow(int row) +{ + if (static_cast(row) >= _rows.size() || row < 0) { + throw InvalidRow(); + } + _rows.erase(_rows.begin() + row); +} + +void Material2DArray::setValue(int row, int column, const QVariant& value) +{ + if (row >= rows()) { + throw InvalidIndex(); + } + + std::vector* val = getRow(row); + try { + val->at(column) = value; + } + catch (const std::out_of_range&) { + throw InvalidIndex(); + } +} + +const QVariant Material2DArray::getValue(int row, int column) const +{ + try { + auto val = getRow(row); + try { + return val->at(column); + } + catch (std::out_of_range const&) { + throw InvalidIndex(); + } + } + catch (const InvalidRow&) { + throw InvalidIndex(); + } +} + +void Material2DArray::dumpRow(const std::vector& row) const +{ + Base::Console().Log("row: "); + for (auto column : row) { + Base::Console().Log("'%s' ", column.toString().toStdString().c_str()); + } + Base::Console().Log("\n"); +} + +void Material2DArray::dump() const +{ + for (auto row : _rows) { + dumpRow(*row); + } +} + +//=== + +Material3DArray::Material3DArray() + : MaterialValue(Array3D) + , _defaultSet(false) +{} + +MaterialValue Material3DArray::getDefault() const +{ + MaterialValue ret(_valueType); + ret.setValue(_value); + return ret; +} + +const std::vector*>& Material3DArray::getTable(const QVariant& depth) const +{ + try { + return _rowMap.at(depth); + } + catch (std::out_of_range const&) { + throw InvalidRow(); + } +} + +const std::vector& Material3DArray::getRow(const QVariant& depth, int row) const +{ + try { + return *(_rowMap.at(depth).at(row)); + } + catch (std::out_of_range const&) { + throw InvalidRow(); + } +} + +const std::vector& Material3DArray::getRow(int row) const +{ + return getRow(getDefault().getValue().toString(), row); +} + +std::vector& Material3DArray::getRow(const QVariant& depth, int row) +{ + try { + return *(_rowMap.at(depth).at(row)); + } + catch (std::out_of_range const&) { + throw InvalidRow(); + } +} + +std::vector& Material3DArray::getRow(int row) +{ + return getRow(getDefault().getValue().toString(), row); +} + +void Material3DArray::addRow(const QVariant& depth, std::vector* row) +{ + _rowMap[depth].push_back(row); +} + +void Material3DArray::deleteRow(const QVariant& depth, int row) +{ + Q_UNUSED(depth) + Q_UNUSED(row) +} + +void Material3DArray::deleteRows(int depth) +{ + Q_UNUSED(depth) +} + +void Material3DArray::setValue(const QVariant& depth, int row, int column, const QVariant& value) +{ + Q_UNUSED(depth) + Q_UNUSED(row) + Q_UNUSED(column) + Q_UNUSED(value) +} + +void Material3DArray::setValue(int row, int column, const QVariant& value) +{ + Q_UNUSED(row) + Q_UNUSED(column) + Q_UNUSED(value) +} + +const QVariant Material3DArray::getValue(const QVariant& depth, int row, int column) +{ + auto val = getRow(depth, row); + try { + return val.at(column); + } + catch (std::out_of_range const&) { + throw InvalidColumn(); + } +} + +const QVariant Material3DArray::getValue(int row, int column) +{ + return getValue(getDefault().getValue().toString(), row, column); +} diff --git a/src/Mod/Material/App/MaterialValue.h b/src/Mod/Material/App/MaterialValue.h new file mode 100644 index 0000000000..409c137d30 --- /dev/null +++ b/src/Mod/Material/App/MaterialValue.h @@ -0,0 +1,201 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MATERIALVALUE_H +#define MATERIAL_MATERIALVALUE_H + +#include + +#include + +namespace Materials +{ + +class MaterialsExport MaterialValue +{ +public: + enum ValueType + { + None = 0, + String = 1, + Boolean = 2, + Integer = 3, + Float = 4, + Quantity = 5, + Distribution = 6, + List = 7, + Array2D = 8, + Array3D = 9, + Color = 10, + Image = 11, + File = 12, + URL = 13 + }; + MaterialValue(); + explicit MaterialValue(ValueType type); + virtual ~MaterialValue() = default; + + ValueType getType() const + { + return _valueType; + } + + const QVariant getValue() const + { + return _value; + } + bool isNull() const + { + return _value.isNull(); + } + virtual const QVariant getValueAt(const QVariant& value) const + { + Q_UNUSED(value); + return _value; + } + void setValue(const QVariant& value) + { + _value = value; + } + +protected: + ValueType _valueType; + QVariant _value; + + void setType(ValueType type) + { + _valueType = type; + } +}; + +class MaterialsExport Material2DArray: public MaterialValue +{ +public: + Material2DArray(); + ~Material2DArray() override = default; + + void setDefault(MaterialValue value) + { + _value = value.getValue(); + _defaultSet = true; + } + void setDefault(const QVariant& value) + { + _value = value; + _defaultSet = true; + } + MaterialValue getDefault() const; + bool defaultSet() const + { + return _defaultSet; + } + + const std::vector* getRow(int row) const; + std::vector* getRow(int row); + int rows() const + { + return _rows.size(); + } + void addRow(std::vector* row); + void insertRow(int index, std::vector* row); + void deleteRow(int row); + + void setValue(int row, int column, const QVariant& value); + const QVariant getValue(int row, int column) const; + +protected: + std::vector*> _rows; + bool _defaultSet; + +private: + void dumpRow(const std::vector& row) const; + void dump() const; +}; + +class MaterialsExport Material3DArray: public MaterialValue +{ +public: + Material3DArray(); + ~Material3DArray() override = default; + + void setDefault(MaterialValue value) + { + _value = value.getValue(); + _defaultSet = true; + } + void setDefault(const QVariant& value) + { + _value = value; + _defaultSet = true; + } + MaterialValue getDefault() const; + bool defaultSet() const + { + return _defaultSet; + } + + const std::vector*>& getTable(const QVariant& depth) const; + const std::vector& getRow(const QVariant& depth, int row) const; + const std::vector& getRow(int row) const; + std::vector& getRow(const QVariant& depth, int row); + std::vector& getRow(int row); + void addRow(const QVariant& depth, std::vector* row); + void deleteRow(const QVariant& depth, int row); + void deleteRows(int depth); + int depth() const + { + return _rowMap.size(); + } + int rows(const QVariant& depth) const + { + return getTable(depth).size(); + } + + void setValue(const QVariant& depth, int row, int column, const QVariant& value); + void setValue(int row, int column, const QVariant& value); + const QVariant getValue(const QVariant& depth, int row, int column); + const QVariant getValue(int row, int column); + +protected: +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + std::map*>> _rowMap; +#else + struct variant_comp + { + bool operator()(const QVariant& var1, + const QVariant& var2) const + { + return QVariant::compare(var1, var2) == QPartialOrdering::Less; + } + }; + std::map*>, variant_comp> _rowMap; +#endif + + bool _defaultSet; +}; + +} // namespace Materials + +Q_DECLARE_METATYPE(Materials::MaterialValue) +Q_DECLARE_METATYPE(Materials::Material2DArray) +Q_DECLARE_METATYPE(Materials::Material3DArray) + +#endif // MATERIAL_MATERIALVALUE_H diff --git a/src/Mod/Material/App/Materials.cpp b/src/Mod/Material/App/Materials.cpp new file mode 100644 index 0000000000..a2c3b23add --- /dev/null +++ b/src/Mod/Material/App/Materials.cpp @@ -0,0 +1,924 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include +#include + +#include +#include + +#include "MaterialManager.h" +#include "Materials.h" +#include "ModelManager.h" + + +using namespace Materials; + +/* TRANSLATOR Material::Materials */ + +TYPESYSTEM_SOURCE(Materials::MaterialProperty, Materials::ModelProperty) + +MaterialProperty::MaterialProperty() +{ + _valuePtr = std::make_shared(MaterialValue::None); +} + +MaterialProperty::MaterialProperty(const ModelProperty& property) + : ModelProperty(property) + , _valuePtr(nullptr) +{ + setType(getPropertyType()); + auto columns = property.getColumns(); + for (std::vector::const_iterator it = columns.begin(); it != columns.end(); + it++) { + MaterialProperty prop(*it); + addColumn(prop); + } + + if (_valuePtr->getType() == MaterialValue::Array2D) { + std::static_pointer_cast(_valuePtr)->setDefault(getColumnNull(0)); + } + else if (_valuePtr->getType() == MaterialValue::Array3D) { + std::static_pointer_cast(_valuePtr)->setDefault(getColumnNull(0)); + } +} + +MaterialProperty::MaterialProperty(const MaterialProperty& other) + : ModelProperty(other) +{ + _modelUUID = other._modelUUID; + if (other._valuePtr != nullptr) { + _valuePtr = std::make_shared(*(other._valuePtr)); + } + else { + _valuePtr = nullptr; + } + + for (auto it = other._columns.begin(); it != other._columns.end(); it++) { + _columns.push_back(*it); + } +} + +// MaterialProperty::~MaterialProperty() +// {} + +void MaterialProperty::setModelUUID(const QString& uuid) +{ + _modelUUID = uuid; +} + +const QVariant MaterialProperty::getValue() const +{ + return _valuePtr->getValue(); +} + +std::shared_ptr MaterialProperty::getMaterialValue() +{ + return _valuePtr; +} + +const std::shared_ptr MaterialProperty::getMaterialValue() const +{ + return _valuePtr; +} + +const QString MaterialProperty::getString() const +{ + if (getType() == MaterialValue::Quantity) { + Base::Quantity quantity = getValue().value(); + return quantity.getUserString(); + } + return getValue().toString(); +} + +void MaterialProperty::setPropertyType(const QString& type) +{ + ModelProperty::setPropertyType(type); + setType(type); +} + +void MaterialProperty::setType(const QString& type) +{ + if (type == QString::fromStdString("String")) { + _valuePtr = std::make_shared(MaterialValue::String); + } + else if (type == QString::fromStdString("Boolean")) { + _valuePtr = std::make_shared(MaterialValue::Boolean); + } + else if (type == QString::fromStdString("Integer")) { + _valuePtr = std::make_shared(MaterialValue::Integer); + } + else if (type == QString::fromStdString("Float")) { + _valuePtr = std::make_shared(MaterialValue::Float); + } + else if (type == QString::fromStdString("URL")) { + _valuePtr = std::make_shared(MaterialValue::URL); + } + else if (type == QString::fromStdString("Quantity")) { + _valuePtr = std::make_shared(MaterialValue::Quantity); + } + else if (type == QString::fromStdString("Color")) { + _valuePtr = std::make_shared(MaterialValue::Color); + } + else if (type == QString::fromStdString("File")) { + _valuePtr = std::make_shared(MaterialValue::File); + } + else if (type == QString::fromStdString("Image")) { + _valuePtr = std::make_shared(MaterialValue::Image); + } + else if (type == QString::fromStdString("List")) { + _valuePtr = std::make_shared(MaterialValue::List); + } + else if (type == QString::fromStdString("2DArray")) { + _valuePtr = std::make_shared(); + } + else if (type == QString::fromStdString("3DArray")) { + _valuePtr = std::make_shared(); + } + else { + // Error. Throw something + _valuePtr = std::make_shared(MaterialValue::None); + std::string stringType = type.toStdString(); + std::string name = getName().toStdString(); + throw UnknownValueType(); + } +} + +MaterialProperty& MaterialProperty::getColumn(int column) +{ + try { + return _columns.at(column); + } + catch (std::out_of_range const&) { + throw InvalidColumn(); + } +} + +const MaterialProperty& MaterialProperty::getColumn(int column) const +{ + try { + return _columns.at(column); + } + catch (std::out_of_range const&) { + throw InvalidColumn(); + } +} + +MaterialValue::ValueType MaterialProperty::getColumnType(int column) const +{ + try { + return _columns.at(column).getType(); + } + catch (std::out_of_range const&) { + throw InvalidColumn(); + } +} + +QString MaterialProperty::getColumnUnits(int column) const +{ + try { + return _columns.at(column).getUnits(); + } + catch (std::out_of_range const&) { + throw InvalidColumn(); + } +} + +QVariant MaterialProperty::getColumnNull(int column) const +{ + MaterialValue::ValueType valueType = getColumnType(column); + + switch (valueType) { + case MaterialValue::Quantity: { + Base::Quantity q = Base::Quantity(0, getColumnUnits(column)); + return QVariant::fromValue(q); + } + + case MaterialValue::Float: + case MaterialValue::Integer: + return QVariant(0); + + default: + break; + } + + return QVariant(QString()); +} + +void MaterialProperty::setValue(const QVariant& value) +{ + // _valueType = MaterialValue::String; + _valuePtr->setValue(value); +} + +void MaterialProperty::setValue(const QString& value) +{ + if (_valuePtr->getType() == MaterialValue::Boolean) { + setBoolean(value); + } + else if (_valuePtr->getType() == MaterialValue::Integer) { + setInt(value); + } + else if (_valuePtr->getType() == MaterialValue::Float) { + setFloat(value); + } + else if (_valuePtr->getType() == MaterialValue::URL) { + setURL(value); + } + else if (_valuePtr->getType() == MaterialValue::Quantity) { + // Base::Console().Log("\tParse quantity '%s'\n", value.toStdString().c_str()); + try { + setQuantity(Base::Quantity::parse(value)); + } + catch (const Base::ParserError& e) { + Base::Console().Log("Error '%s'\n", e.what()); + // Save as a string + setString(value); + } + } + else { + setString(value); + } +} + +void MaterialProperty::setString(const QString& value) +{ + // _valueType = MaterialValue::String; + _valuePtr->setValue(QVariant(value)); +} + +void MaterialProperty::setBoolean(bool value) +{ + // _valueType = MaterialValue::Boolean; + _valuePtr->setValue(QVariant(value)); +} + +void MaterialProperty::setBoolean(int value) +{ + // _valueType = MaterialValue::Boolean; + _valuePtr->setValue(QVariant(value != 0)); +} + +void MaterialProperty::setBoolean(const QString& value) +{ + // _valueType = MaterialValue::Boolean; + bool boolean; + std::string val = value.toStdString(); + if ((val == "true") || (val == "True")) { + boolean = true; + } + else if ((val == "false") || (val == "False")) { + boolean = false; + } + else { + boolean = (std::stoi(val) != 0); + } + + setBoolean(boolean); +} + +void MaterialProperty::setInt(int value) +{ + _valuePtr->setValue(QVariant(value)); +} + +void MaterialProperty::setInt(const QString& value) +{ + _valuePtr->setValue(value.toInt()); +} + +void MaterialProperty::setFloat(double value) +{ + _valuePtr->setValue(QVariant(value)); +} + +void MaterialProperty::setFloat(const QString& value) +{ + _valuePtr->setValue(QVariant(value.toFloat())); +} + +void MaterialProperty::setQuantity(const Base::Quantity& value) +{ + _valuePtr->setValue(QVariant(QVariant::fromValue(value))); +} + +void MaterialProperty::setQuantity(double value, const QString& units) +{ + setQuantity(Base::Quantity(value, units)); +} + +void MaterialProperty::setQuantity(const QString& value) +{ + setQuantity(Base::Quantity::parse(value)); +} + +void MaterialProperty::setURL(const QString& value) +{ + _valuePtr->setValue(QVariant(value)); +} + +MaterialProperty& MaterialProperty::operator=(const MaterialProperty& other) +{ + if (this == &other) { + return *this; + } + + ModelProperty::operator=(other); + _modelUUID = other._modelUUID; + + if (other._valuePtr != nullptr) { + _valuePtr = std::make_shared(*(other._valuePtr)); + } + else { + _valuePtr = nullptr; + } + + _columns.clear(); + for (auto it = other._columns.begin(); it != other._columns.end(); it++) { + _columns.push_back(*it); + } + + return *this; +} + +TYPESYSTEM_SOURCE(Materials::Material, Base::BaseClass) + +Material::Material() + : _dereferenced(false) +{} + +Material::Material(const MaterialLibrary& library, + const QString& directory, + const QString& uuid, + const QString& name) + : _library(library) + , _uuid(uuid) + , _name(name) + , _dereferenced(false) + , _editState(ModelEdit_None) +{ + setDirectory(directory); +} + +Material::Material(const Material& other) + : _library(other._library) + , _directory(other._directory) + , _uuid(other._uuid) + , _name(other._name) + , _authorAndLicense(other._authorAndLicense) + , _parentUuid(other._parentUuid) + , _description(other._description) + , _url(other._url) + , _reference(other._reference) + , _dereferenced(other._dereferenced) + , _editState(other._editState) +{ + for (auto it = other._tags.begin(); it != other._tags.end(); it++) { + _tags.push_back(*it); + } + for (auto it = other._physicalUuids.begin(); it != other._physicalUuids.end(); it++) { + _physicalUuids.push_back(*it); + } + for (auto it = other._appearanceUuids.begin(); it != other._appearanceUuids.end(); it++) { + _appearanceUuids.push_back(*it); + } + for (auto it = other._allUuids.begin(); it != other._allUuids.end(); it++) { + _allUuids.push_back(*it); + } + for (auto it = other._physical.begin(); it != other._physical.end(); it++) { + _physical[it->first] = MaterialProperty(it->second); + } + for (auto it = other._appearance.begin(); it != other._appearance.end(); it++) { + _appearance[it->first] = MaterialProperty(it->second); + } +} + +/* + * Destroys the object and frees any allocated resources + */ +Material::~Material() +{ + // no need to delete child widgets, Qt does it all for us +} + +void Material::addModel(const QString& uuid) +{ + for (QString modelUUID : _allUuids) { + if (modelUUID == uuid) { + return; + } + } + + _allUuids.push_back(uuid); + + ModelManager manager; + + try { + const Model& model = manager.getModel(uuid); + auto inheritance = model.getInheritance(); + for (auto inherits = inheritance.begin(); inherits != inheritance.end(); inherits++) { + addModel(*inherits); + } + } + catch (ModelNotFound const&) { + } +} + +void Material::setEditState(ModelEdit newState) +{ + if (newState == ModelEdit_Extend) { + if (_editState != ModelEdit_Alter) { + _editState = newState; + } + } + else if (newState == ModelEdit_Alter) { + _editState = newState; + } +} + +void Material::addPhysical(const QString& uuid) +{ + if (hasPhysicalModel(uuid)) { + return; + } + + ModelManager manager; + + try { + const Model& model = manager.getModel(uuid); + + _physicalUuids.push_back(uuid); + addModel(uuid); + setEditStateExtend(); + + for (auto it = model.begin(); it != model.end(); it++) { + QString propertyName = it->first; + ModelProperty property = static_cast(it->second); + + try { + _physical[propertyName] = MaterialProperty(property); + } + catch (const UnknownValueType&) { + Base::Console().Error("Property '%s' has unknown type '%s'. Ignoring\n", + property.getName().toStdString().c_str(), + property.getPropertyType().toStdString().c_str()); + } + } + } + catch (ModelNotFound const&) { + } +} + +void Material::addAppearance(const QString& uuid) +{ + if (hasAppearanceModel(uuid)) { + return; + } + + ModelManager manager; + + try { + const Model& model = manager.getModel(uuid); + + _appearanceUuids.push_back(uuid); + addModel(uuid); + setEditStateExtend(); + + for (auto it = model.begin(); it != model.end(); it++) { + QString propertyName = it->first; + ModelProperty property = static_cast(it->second); + + _appearance[propertyName] = MaterialProperty(property); + } + } + catch (ModelNotFound const&) { + } +} + +void Material::setPhysicalEditState(const QString& name) +{ + if (getPhysicalProperty(name).isNull()) { + setEditStateExtend(); + } + else { + setEditStateAlter(); + } +} + +void Material::setAppearanceEditState(const QString& name) +{ + if (getAppearanceProperty(name).isNull()) { + setEditStateExtend(); + } + else { + setEditStateAlter(); + } +} + +void Material::setPhysicalValue(const QString& name, const QString& value) +{ + setPhysicalEditState(name); + + _physical[name].setValue(value); // may not be a string type +} + +void Material::setPhysicalValue(const QString& name, int value) +{ + setPhysicalEditState(name); + + _physical[name].setInt(value); +} + +void Material::setPhysicalValue(const QString& name, double value) +{ + setPhysicalEditState(name); + + _physical[name].setFloat(value); +} + +void Material::setPhysicalValue(const QString& name, const Base::Quantity value) +{ + setPhysicalEditState(name); + + _physical[name].setQuantity(value); +} + +void Material::setAppearanceValue(const QString& name, const QString& value) +{ + setAppearanceEditState(name); + + _appearance[name].setValue(value); // may not be a string type +} + +MaterialProperty& Material::getPhysicalProperty(const QString& name) +{ + try { + return _physical.at(name); + } + catch (std::out_of_range const&) { + throw PropertyNotFound(); + } +} + +const MaterialProperty& Material::getPhysicalProperty(const QString& name) const +{ + try { + return _physical.at(name); + } + catch (std::out_of_range const&) { + throw PropertyNotFound(); + } +} + +MaterialProperty& Material::getAppearanceProperty(const QString& name) +{ + try { + return _appearance.at(name); + } + catch (std::out_of_range const&) { + throw PropertyNotFound(); + } +} + +const MaterialProperty& Material::getAppearanceProperty(const QString& name) const +{ + try { + return _appearance.at(name); + } + catch (std::out_of_range const&) { + throw PropertyNotFound(); + } +} + +const QVariant Material::getValue(const std::map& propertyList, + const QString& name) const +{ + try { + return propertyList.at(name).getValue(); + } + catch (std::out_of_range const&) { + throw PropertyNotFound(); + } +} + +const QString Material::getValueString(const std::map& propertyList, + const QString& name) const +{ + try { + if (propertyList.at(name).getType() == MaterialValue::Quantity) { + auto value = propertyList.at(name).getValue(); + if (value.isNull()) { + return QString(); + } + return value.value().getUserString(); + } + return propertyList.at(name).getValue().toString(); + } + catch (std::out_of_range const&) { + throw PropertyNotFound(); + } +} + +const QVariant Material::getPhysicalValue(const QString& name) const +{ + return getValue(_physical, name); +} + +const QString Material::getPhysicalValueString(const QString& name) const +{ + return getValueString(_physical, name); +} + +const QVariant Material::getAppearanceValue(const QString& name) const +{ + return getValue(_appearance, name); +} + +const QString Material::getAppearanceValueString(const QString& name) const +{ + return getValueString(_appearance, name); +} + +bool Material::hasPhysicalProperty(const QString& name) const +{ + try { + static_cast(_physical.at(name)); + } + catch (std::out_of_range const&) { + return false; + } + return true; +} + +bool Material::hasAppearanceProperty(const QString& name) const +{ + try { + static_cast(_appearance.at(name)); + } + catch (std::out_of_range const&) { + return false; + } + return true; +} + +bool Material::hasModel(const QString& uuid) const +{ + for (QString modelUUID : _allUuids) { + if (modelUUID == uuid) { + return true; + } + } + + return false; +} + +bool Material::hasPhysicalModel(const QString& uuid) const +{ + if (!hasModel(uuid)) { + return false; + } + + ModelManager manager; + + try { + const Model& model = manager.getModel(uuid); + if (model.getType() == Model::ModelType_Physical) { + return true; + } + } + catch (ModelNotFound const&) { + } + + return false; +} + +bool Material::hasAppearanceModel(const QString& uuid) const +{ + if (!hasModel(uuid)) { + return false; + } + + ModelManager manager; + + try { + const Model& model = manager.getModel(uuid); + if (model.getType() == Model::ModelType_Appearance) { + return true; + } + } + catch (ModelNotFound const&) { + } + + return false; +} + +bool Material::isPhysicalModelComplete(const QString& uuid) const +{ + if (!hasPhysicalModel(uuid)) { + return false; + } + + ModelManager manager; + + try { + const Model& model = manager.getModel(uuid); + for (auto it = model.begin(); it != model.end(); it++) { + QString propertyName = it->first; + const MaterialProperty& property = getPhysicalProperty(propertyName); + + if (property.isNull()) { + return false; + } + } + } + catch (ModelNotFound const&) { + return false; + } + + return true; +} + +bool Material::isAppearanceModelComplete(const QString& uuid) const +{ + if (!hasAppearanceModel(uuid)) { + return false; + } + + ModelManager manager; + + try { + const Model& model = manager.getModel(uuid); + for (auto it = model.begin(); it != model.end(); it++) { + QString propertyName = it->first; + const MaterialProperty& property = getAppearanceProperty(propertyName); + + if (property.isNull()) { + return false; + } + } + } + catch (ModelNotFound const&) { + return false; + } + + return true; +} + +void Material::saveGeneral(QTextStream& stream) const +{ + stream << "General:\n"; + stream << " UUID: \"" << _uuid << "\"\n"; + stream << " Name: \"" << _name << "\"\n"; + if (!_authorAndLicense.isEmpty()) { + stream << " AuthorAndLicense: \"" << _authorAndLicense << "\"\n"; + } + if (!_description.isEmpty()) { + stream << " Description: \"" << _description << "\"\n"; + } + if (!_url.isEmpty()) { + stream << " SourceURL: \"" << _url << "\"\n"; + } + if (!_reference.isEmpty()) { + stream << " ReferenceSource: \"" << _reference << "\"\n"; + } +} + +void Material::saveInherits(QTextStream& stream) const +{ + if (!_parentUuid.isEmpty()) { + MaterialManager manager; + + stream << "Inherits:\n"; + stream << " " << manager.getMaterial(_parentUuid).getName() << ":\n"; + stream << " UUID: \"" << _parentUuid << "\"\n"; + } +} + +void Material::saveModels(QTextStream& stream) const +{ + if (!_physical.empty()) { + ModelManager modelManager; + + stream << "Models:\n"; + for (auto itm = _physicalUuids.begin(); itm != _physicalUuids.end(); itm++) { + auto model = modelManager.getModel(*itm); + stream << " " << model.getName() << ":\n"; + stream << " UUID: \"" << model.getUUID() << "\"\n"; + for (auto itp = model.begin(); itp != model.end(); itp++) { + QString propertyName = itp->first; + const MaterialProperty& property = getPhysicalProperty(propertyName); + + if (!property.isNull()) { + stream << " " << propertyName << ": \"" + << getPhysicalValueString(propertyName) << "\"\n"; + } + } + } + } +} + +void Material::saveAppearanceModels(QTextStream& stream) const +{ + if (!_appearance.empty()) { + ModelManager modelManager; + + stream << "AppearanceModels:\n"; + for (auto itm = _appearanceUuids.begin(); itm != _appearanceUuids.end(); itm++) { + auto model = modelManager.getModel(*itm); + stream << " " << model.getName() << ":\n"; + stream << " UUID: \"" << model.getUUID() << "\"\n"; + for (auto itp = model.begin(); itp != model.end(); itp++) { + QString propertyName = itp->first; + const MaterialProperty& property = getAppearanceProperty(propertyName); + + if (!property.isNull()) { + stream << " " << propertyName << ": \"" + << getAppearanceValueString(propertyName) << "\"\n"; + } + } + } + } +} + +void Material::newUuid() +{ + _uuid = QUuid::createUuid().toString(QUuid::WithoutBraces); +} + +void Material::save(QTextStream& stream, bool saveAsCopy) +{ + Q_UNUSED(saveAsCopy) + + stream << "# File created by FreeCAD\n"; + saveGeneral(stream); + saveInherits(stream); + saveModels(stream); + saveAppearanceModels(stream); +} + +Material& Material::operator=(const Material& other) +{ + if (this == &other) { + return *this; + } + + _library = other._library; + _directory = other._directory; + _uuid = other._uuid; + _name = other._name; + _authorAndLicense = other._authorAndLicense; + _parentUuid = other._parentUuid; + _description = other._description; + _url = other._url; + _reference = other._reference; + _dereferenced = other._dereferenced; + + _tags.clear(); + for (auto it = other._tags.begin(); it != other._tags.end(); it++) { + _tags.push_back(*it); + } + _physicalUuids.clear(); + for (auto it = other._physicalUuids.begin(); it != other._physicalUuids.end(); it++) { + _physicalUuids.push_back(*it); + } + _appearanceUuids.clear(); + for (auto it = other._appearanceUuids.begin(); it != other._appearanceUuids.end(); it++) { + _appearanceUuids.push_back(*it); + } + _allUuids.clear(); + for (auto it = other._allUuids.begin(); it != other._allUuids.end(); it++) { + _allUuids.push_back(*it); + } + _physical.clear(); + for (auto it = other._physical.begin(); it != other._physical.end(); it++) { + _physical[it->first] = MaterialProperty(it->second); + } + _appearance.clear(); + for (auto it = other._appearance.begin(); it != other._appearance.end(); it++) { + _appearance[it->first] = MaterialProperty(it->second); + } + + return *this; +} diff --git a/src/Mod/Material/App/Materials.h b/src/Mod/Material/App/Materials.h new file mode 100644 index 0000000000..a4ff89cd44 --- /dev/null +++ b/src/Mod/Material/App/Materials.h @@ -0,0 +1,337 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MATERIALS_H +#define MATERIAL_MATERIALS_H + +#include + +#include +#include +#include +#include + +#include + +#include "MaterialLibrary.h" +#include "Model.h" + +namespace fs = boost::filesystem; + +namespace Materials +{ + +class MaterialsExport MaterialProperty: public ModelProperty +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + MaterialProperty(); + explicit MaterialProperty(const ModelProperty& property); + explicit MaterialProperty(const MaterialProperty& property); + ~MaterialProperty() override = default; + + MaterialValue::ValueType getType() const + { + return _valuePtr->getType(); + } + + const QString getModelUUID() const; + const QVariant getValue() const; + bool isNull() const + { + return _valuePtr->isNull(); + } + std::shared_ptr getMaterialValue(); + const std::shared_ptr getMaterialValue() const; + const QString getString() const; + bool getBoolean() const; + int getInt() const; + double getFloat() const; + const Base::Quantity& getQuantity() const; + const QString getURL() const; + + MaterialProperty& getColumn(int column); + const MaterialProperty& getColumn(int column) const; + MaterialValue::ValueType getColumnType(int column) const; + QString getColumnUnits(int column) const; + QVariant getColumnNull(int column) const; + + void setModelUUID(const QString& uuid); + void setPropertyType(const QString& type) override; + void setValue(const QVariant& value); + void setValue(const QString& value); + void setString(const QString& value); + void setBoolean(bool value); + void setBoolean(int value); + void setBoolean(const QString& value); + void setInt(int value); + void setInt(const QString& value); + void setFloat(double value); + void setFloat(const QString& value); + void setQuantity(const Base::Quantity& value); + void setQuantity(double value, const QString& units); + void setQuantity(const QString& value); + void setURL(const QString& value); + + MaterialProperty& operator=(const MaterialProperty& other); + +protected: + void setType(const QString& type); + // void setType(MaterialValue::ValueType type) { _valueType = type; } + + void addColumn(MaterialProperty& column) + { + _columns.push_back(column); + } + +private: + QString _modelUUID; + std::shared_ptr _valuePtr; + std::vector _columns; +}; + +class MaterialsExport Material: public Base::BaseClass +{ + TYPESYSTEM_HEADER(); + +public: + enum ModelEdit + { + ModelEdit_None, // No change + ModelEdit_Alter, // Existing values are changed + ModelEdit_Extend // New values added + }; + + Material(); + explicit Material(const MaterialLibrary& library, + const QString& directory, + const QString& uuid, + const QString& name); + explicit Material(const Material& other); + virtual ~Material(); + + const MaterialLibrary& getLibrary() const + { + return _library; + } + const QString getDirectory() const + { + return _directory; + } + const QString getUUID() const + { + return _uuid; + } + const QString getName() const + { + return _name; + } + const QString getAuthorAndLicense() const + { + return _authorAndLicense; + } + const QString getParentUUID() const + { + return _parentUuid; + } + const QString getDescription() const + { + return _description; + } + const QString getURL() const + { + return _url; + } + const QString getReference() const + { + return _reference; + } + ModelEdit getEditState() const + { + return _editState; + } + const std::list& getTags() const + { + return _tags; + } + const std::vector* getPhysicalModels() const + { + return &_physicalUuids; + } + const std::vector* getAppearanceModels() const + { + return &_appearanceUuids; + } + + void setLibrary(const MaterialLibrary& library) + { + _library = library; + } + void setDirectory(const QString& directory) + { + Base::Console().Log("Materials::setDirectory(%s)\n", directory.toStdString().c_str()); + _directory = directory; + } + void setUUID(const QString& uuid) + { + _uuid = uuid; + } + void setName(const QString& name) + { + _name = name; + } + void setAuthorAndLicense(const QString& authorAndLicense) + { + _authorAndLicense = authorAndLicense; + } + void setParentUUID(const QString& uuid) + { + _parentUuid = uuid; + } + void setDescription(const QString& description) + { + _description = description; + } + void setURL(const QString& url) + { + _url = url; + } + void setReference(const QString& reference) + { + _reference = reference; + } + void setEditState(ModelEdit newState); + void setEditStateAlter() + { + setEditState(ModelEdit_Alter); + } + void setEditStateExtend() + { + setEditState(ModelEdit_Extend); + } + void setPhysicalEditState(const QString& name); + void setAppearanceEditState(const QString& name); + void resetEditState() + { + _editState = ModelEdit_None; + } + void addTag(const QString& tag) + { + Q_UNUSED(tag); + } + void removeTag(const QString& tag) + { + Q_UNUSED(tag); + } + void addPhysical(const QString& uuid); + void addAppearance(const QString& uuid); + void newUuid(); + + void setPhysicalValue(const QString& name, const QString& value); + void setPhysicalValue(const QString& name, int value); + void setPhysicalValue(const QString& name, double value); + void setPhysicalValue(const QString& name, const Base::Quantity value); + + void setAppearanceValue(const QString& name, const QString& value); + + MaterialProperty& getPhysicalProperty(const QString& name); + const MaterialProperty& getPhysicalProperty(const QString& name) const; + MaterialProperty& getAppearanceProperty(const QString& name); + const MaterialProperty& getAppearanceProperty(const QString& name) const; + const QVariant getPhysicalValue(const QString& name) const; + const QString getPhysicalValueString(const QString& name) const; + const QVariant getAppearanceValue(const QString& name) const; + const QString getAppearanceValueString(const QString& name) const; + bool hasPhysicalProperty(const QString& name) const; + bool hasAppearanceProperty(const QString& name) const; + + // Test if the model is defined, and if values are provided for all properties + bool hasModel(const QString& uuid) const; + bool hasPhysicalModel(const QString& uuid) const; + bool hasAppearanceModel(const QString& uuid) const; + bool isModelComplete(const QString& uuid) const + { + return isPhysicalModelComplete(uuid) || isAppearanceModelComplete(uuid); + } + bool isPhysicalModelComplete(const QString& uuid) const; + bool isAppearanceModelComplete(const QString& uuid) const; + + const std::map& getPhysicalProperties() const + { + return _physical; + } + const std::map& getAppearanceProperties() const + { + return _appearance; + } + + bool getDereferenced() const + { + return _dereferenced; + } + void markDereferenced() + { + _dereferenced = true; + } + + void save(QTextStream& stream, bool saveAsCopy); + + Material& operator=(const Material& other); + +protected: + void addModel(const QString& uuid); + + const QVariant getValue(const std::map& propertyList, + const QString& name) const; + const QString getValueString(const std::map& propertyList, + const QString& name) const; + + void saveGeneral(QTextStream& stream) const; + void saveInherits(QTextStream& stream) const; + void saveModels(QTextStream& stream) const; + void saveAppearanceModels(QTextStream& stream) const; + +private: + MaterialLibrary _library; + QString _directory; + QString _uuid; + QString _name; + QString _authorAndLicense; + QString _parentUuid; + QString _description; + QString _url; + QString _reference; + std::list _tags; + std::vector _physicalUuids; + std::vector _appearanceUuids; + std::vector _allUuids; // Includes inherited models + std::map _physical; + std::map _appearance; + bool _dereferenced; + ModelEdit _editState; +}; + +} // namespace Materials + +Q_DECLARE_METATYPE(Materials::Material*) + +#endif // MATERIAL_MATERIALS_H diff --git a/src/Mod/Material/App/Model.cpp b/src/Mod/Material/App/Model.cpp new file mode 100644 index 0000000000..87020a96fa --- /dev/null +++ b/src/Mod/Material/App/Model.cpp @@ -0,0 +1,115 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include "Exceptions.h" +#include "Model.h" +#include "ModelLibrary.h" +#include + + +using namespace Materials; + +TYPESYSTEM_SOURCE(Materials::ModelProperty, Base::BaseClass) + +ModelProperty::ModelProperty() +{} + +ModelProperty::ModelProperty(const QString& name, + const QString& type, + const QString& units, + const QString& url, + const QString& description) + : _name(name) + , _propertyType(type) + , _units(units) + , _url(url) + , _description(description) +{} + +ModelProperty::ModelProperty(const ModelProperty& other) + : _name(other._name) + , _propertyType(other._propertyType) + , _units(other._units) + , _url(other._url) + , _description(other._description) + , _inheritance(other._inheritance) +{ + for (auto it = other._columns.begin(); it != other._columns.end(); it++) { + _columns.push_back(*it); + } +} + +ModelProperty& ModelProperty::operator=(const ModelProperty& other) +{ + if (this == &other) { + return *this; + } + + _name = other._name; + _propertyType = other._propertyType; + _units = other._units; + _url = other._url; + _description = other._description; + _inheritance = other._inheritance; + _columns.clear(); + for (auto it = other._columns.begin(); it != other._columns.end(); it++) { + _columns.push_back(*it); + } + + return *this; +} + +TYPESYSTEM_SOURCE(Materials::Model, Base::BaseClass) + +Model::Model() +{} + +Model::Model(const ModelLibrary& library, + ModelType type, + const QString& name, + const QString& directory, + const QString& uuid, + const QString& description, + const QString& url, + const QString& doi) + : _library(library) + , _type(type) + , _name(name) + , _directory(directory) + , _uuid(uuid) + , _description(description) + , _url(url) + , _doi(doi) +{} + +ModelProperty& Model::operator[](const QString& key) +{ + try { + return _properties.at(key); + } + catch (std::out_of_range const&) { + throw PropertyNotFound(); + } +} diff --git a/src/Mod/Material/App/Model.h b/src/Mod/Material/App/Model.h new file mode 100644 index 0000000000..c286ffeb0c --- /dev/null +++ b/src/Mod/Material/App/Model.h @@ -0,0 +1,298 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MODEL_H +#define MATERIAL_MODEL_H + +#include + +#include +#include +#include +#include + +#include "MaterialValue.h" +#include "ModelLibrary.h" + +namespace Materials +{ + +class MaterialsExport ModelProperty: public Base::BaseClass +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + ModelProperty(); + explicit ModelProperty(const QString& name, + const QString& type, + const QString& units, + const QString& url, + const QString& description); + explicit ModelProperty(const ModelProperty& other); + ~ModelProperty() override = default; + + const QString getName() const + { + return _name; + } + const QString getPropertyType() const + { + return _propertyType; + } + const QString getUnits() const + { + return _units; + } + const QString getURL() const + { + return _url; + } + const QString getDescription() const + { + return _description; + } + const QString getInheritance() const + { + return _inheritance; + } + bool isInherited() const + { + return (_inheritance.length() > 0); + } + + void setName(const QString& name) + { + _name = name; + } + virtual void setPropertyType(const QString& type) + { + _propertyType = type; + } + void setUnits(const QString& units) + { + _units = units; + } + void setURL(const QString& url) + { + _url = url; + } + void setDescription(const QString& description) + { + _description = description; + } + void setInheritance(const QString& uuid) + { + _inheritance = uuid; + } + + void addColumn(ModelProperty& column) + { + _columns.push_back(column); + } + const std::vector& getColumns() const + { + return _columns; + } + int columns() const + { + return _columns.size(); + } + + ModelProperty& operator=(const ModelProperty& other); + +private: + QString _name; + QString _propertyType; + QString _units; + QString _url; + QString _description; + QString _inheritance; + std::vector _columns; +}; + +class MaterialsExport Model: public Base::BaseClass +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + enum ModelType + { + ModelType_Physical, + ModelType_Appearance + }; + + Model(); + explicit Model(const ModelLibrary& library, + ModelType type, + const QString& name, + const QString& directory, + const QString& uuid, + const QString& description, + const QString& url, + const QString& doi); + ~Model() override = default; + + const ModelLibrary& getLibrary() const + { + return _library; + } + const QString getBase() const + { + return (_type == ModelType_Physical) ? QString::fromStdString("Model") + : QString::fromStdString("AppearanceModel"); + } + const QString getName() const + { + return _name; + } + ModelType getType() const + { + return _type; + } + const QString getDirectory() const + { + return _directory; + } + const QString getDirectoryPath() const + { + return QDir(_directory).absolutePath(); + } + const QString getRelativePath() const + { + return QDir(_directory).relativeFilePath(QDir(_directory).absolutePath()); + } + const QString getUUID() const + { + return _uuid; + } + const QString getDescription() const + { + return _description; + } + const QString getURL() const + { + return _url; + } + const QString getDOI() const + { + return _doi; + } + + void setLibrary(const ModelLibrary& library) + { + _library = library; + } + void setType(ModelType type) + { + _type = type; + } + void setName(const QString& name) + { + _name = name; + } + void setDirectory(const QString& directory) + { + _directory = directory; + } + void setUUID(const QString& uuid) + { + _uuid = uuid; + } + void setDescription(const QString& description) + { + _description = description; + } + void setURL(const QString& url) + { + _url = url; + } + void setDOI(const QString& doi) + { + _doi = doi; + } + + void addInheritance(const QString& uuid) + { + _inheritedUuids.push_back(uuid); + } + const std::vector& getInheritance() const + { + return _inheritedUuids; + } + + bool operator==(const Model& m) const + { + return _uuid == m._uuid; + } + bool operator!=(const Model& m) const + { + return !operator==(m); + } + + ModelProperty& operator[](const QString& key); + void addProperty(ModelProperty& property) + { + _properties[property.getName()] = property; + } + + using iterator = typename std::map::iterator; + using const_iterator = typename std::map::const_iterator; + iterator begin() + { + return _properties.begin(); + } + const_iterator begin() const noexcept + { + return _properties.begin(); + } + iterator end() noexcept + { + return _properties.end(); + } + const_iterator end() const noexcept + { + return _properties.end(); + } + const_iterator cbegin() const noexcept + { + return _properties.cbegin(); + } + const_iterator cend() const noexcept + { + return _properties.cend(); + } + +private: + ModelLibrary _library; + ModelType _type; + QString _name; + QString _directory; + QString _uuid; + QString _description; + QString _url; + QString _doi; + std::vector _inheritedUuids; + std::map _properties; +}; + +} // namespace Materials + +#endif // MATERIAL_MODEL_H diff --git a/src/Mod/Material/App/ModelLibrary.cpp b/src/Mod/Material/App/ModelLibrary.cpp new file mode 100644 index 0000000000..901795bd30 --- /dev/null +++ b/src/Mod/Material/App/ModelLibrary.cpp @@ -0,0 +1,113 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include + +#include + +#include "Exceptions.h" +#include "Model.h" +#include "ModelLibrary.h" + + +using namespace Materials; + +TYPESYSTEM_SOURCE(Materials::LibraryBase, Base::BaseClass) + +LibraryBase::LibraryBase(const QString& libraryName, const QString& dir, const QString& icon) + : _name(libraryName) + , _directory(QDir::cleanPath(dir)) + , _iconPath(icon) +{} + +LibraryBase::LibraryBase() +{} + +bool LibraryBase::operator==(const LibraryBase& library) const +{ + return (_name == library._name) && (_directory == library._directory); +} + +QString LibraryBase::getLocalPath(const QString& path) const +{ + QString filePath = getDirectoryPath(); + QString cleanPath = QDir::cleanPath(path); + QString prefix = QString::fromStdString("/") + getName(); + if (cleanPath.startsWith(prefix)) { + // Remove the library name from the path + filePath += cleanPath.right(cleanPath.length() - prefix.length()); + } + else { + filePath += cleanPath; + } + + return filePath; +} + +QString LibraryBase::getRelativePath(const QString& path) const +{ + QString filePath; + QString cleanPath = QDir::cleanPath(path); + QString prefix = QString::fromStdString("/") + getName(); + if (cleanPath.startsWith(prefix)) { + // Remove the library name from the path + filePath = cleanPath.right(cleanPath.length() - prefix.length()); + } + else { + filePath = cleanPath; + } + + prefix = getDirectoryPath(); + if (filePath.startsWith(prefix)) { + // Remove the library root from the path + filePath = filePath.right(filePath.length() - prefix.length()); + } + + // Remove any leading '/' + if (filePath.startsWith(QString::fromStdString("/"))) { + filePath.remove(0, 1); + } + + return filePath; +} + +TYPESYSTEM_SOURCE(Materials::ModelLibrary, LibraryBase) + +ModelLibrary::ModelLibrary(const QString& libraryName, const QString& dir, const QString& icon) + : LibraryBase(libraryName, dir, icon) +{} + +ModelLibrary::ModelLibrary() +{} + +Model* ModelLibrary::addModel(const Model& model, const QString& path) +{ + QString filePath = getRelativePath(path); + Model* newModel = new Model(model); + newModel->setLibrary(*this); + newModel->setDirectory(filePath); + + return newModel; +} diff --git a/src/Mod/Material/App/ModelLibrary.h b/src/Mod/Material/App/ModelLibrary.h new file mode 100644 index 0000000000..ea42aa6d9a --- /dev/null +++ b/src/Mod/Material/App/ModelLibrary.h @@ -0,0 +1,101 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MODELLIBRARY_H +#define MATERIAL_MODELLIBRARY_H + +#include + +#include +#include +#include +#include + +#include "MaterialValue.h" + +namespace Materials +{ + +class Model; + +class MaterialsExport LibraryBase: public Base::BaseClass +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + LibraryBase(); + explicit LibraryBase(const QString& libraryName, const QString& dir, const QString& icon); + ~LibraryBase() override = default; + + const QString getName() const + { + return _name; + } + const QString getDirectory() const + { + return _directory; + } + const QString getDirectoryPath() const + { + return QDir(_directory).absolutePath(); + } + const QString getIconPath() const + { + return _iconPath; + } + bool operator==(const LibraryBase& library) const; + bool operator!=(const LibraryBase& library) const + { + return !operator==(library); + } + QString getLocalPath(const QString& path) const; + QString getRelativePath(const QString& path) const; + +private: + QString _name; + QString _directory; + QString _iconPath; +}; + +class MaterialsExport ModelLibrary: public LibraryBase +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + ModelLibrary(); + explicit ModelLibrary(const QString& libraryName, const QString& dir, const QString& icon); + ~ModelLibrary() override = default; + + bool operator==(const ModelLibrary& library) const + { + return LibraryBase::operator==(library); + } + bool operator!=(const ModelLibrary& library) const + { + return !operator==(library); + } + + Model* addModel(const Model& model, const QString& path); +}; + +} // namespace Materials + +#endif // MATERIAL_MODELLIBRARY_H diff --git a/src/Mod/Material/App/ModelLoader.cpp b/src/Mod/Material/App/ModelLoader.cpp new file mode 100644 index 0000000000..81c33c2253 --- /dev/null +++ b/src/Mod/Material/App/ModelLoader.cpp @@ -0,0 +1,417 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#endif + +#include +#include + +#include +#include + +#include "Model.h" +#include "ModelLoader.h" +#include "ModelManager.h" + + +using namespace Materials; + +ModelEntry::ModelEntry(const ModelLibrary& library, + const QString& baseName, + const QString& modelName, + const QString& dir, + const QString& modelUuid, + const YAML::Node& modelData) + : _library(library) + , _base(baseName) + , _name(modelName) + , _directory(dir) + , _uuid(modelUuid) + , _model(modelData) + , _dereferenced(false) +{} + +std::unique_ptr> ModelLoader::_modelEntryMap = nullptr; + +ModelLoader::ModelLoader(std::shared_ptr> modelMap, + std::shared_ptr> libraryList) + : _modelMap(modelMap) + , _libraryList(libraryList) +{ + loadLibraries(); +} + +void ModelLoader::addLibrary(ModelLibrary* model) +{ + _libraryList->push_back(model); +} + +const QString ModelLoader::getUUIDFromPath(const QString& path) +{ + QFile file(path); + if (!file.exists()) { + throw ModelNotFound(); + } + + try { + YAML::Node yamlroot = YAML::LoadFile(path.toStdString()); + std::string base = "Model"; + if (yamlroot["AppearanceModel"]) { + base = "AppearanceModel"; + } + + const QString uuid = QString::fromStdString(yamlroot[base]["UUID"].as()); + return uuid; + } + catch (YAML::Exception& ex) { + throw ModelNotFound(); + } +} + +ModelEntry* ModelLoader::getModelFromPath(const ModelLibrary& library, const QString& path) const +{ + QFile file(path); + if (!file.exists()) { + throw ModelNotFound(); + } + + YAML::Node yamlroot; + std::string base = "Model"; + std::string uuid; + std::string name; + try { + yamlroot = YAML::LoadFile(path.toStdString()); + if (yamlroot["AppearanceModel"]) { + base = "AppearanceModel"; + } + + uuid = yamlroot[base]["UUID"].as(); + name = yamlroot[base]["Name"].as(); + } + catch (YAML::Exception const&) { + throw InvalidModel(); + } + + ModelEntry* model = new ModelEntry(library, + QString::fromStdString(base), + QString::fromStdString(name), + path, + QString::fromStdString(uuid), + yamlroot); + + return model; +} + +void ModelLoader::showYaml(const YAML::Node& yaml) const +{ + std::stringstream out; + + out << yaml; + std::string logData = out.str(); + Base::Console().Log("%s\n", logData.c_str()); +} + +void ModelLoader::dereference(const QString& uuid, + ModelEntry* parent, + const ModelEntry* child, + std::map, QString>* inheritances) +{ + auto parentPtr = parent->getModelPtr(); + auto parentBase = parent->getBase().toStdString(); + auto childYaml = child->getModel(); + auto childBase = child->getBase().toStdString(); + + std::set exclude; + exclude.insert(QString::fromStdString("Name")); + exclude.insert(QString::fromStdString("UUID")); + exclude.insert(QString::fromStdString("URL")); + exclude.insert(QString::fromStdString("Description")); + exclude.insert(QString::fromStdString("DOI")); + exclude.insert(QString::fromStdString("Inherits")); + + auto parentProperties = (*parentPtr)[parentBase]; + auto childProperties = childYaml[childBase]; + for (auto it = childProperties.begin(); it != childProperties.end(); it++) { + std::string name = it->first.as(); + if (exclude.count(QString::fromStdString(name)) == 0) { + // showYaml(it->second); + if (!parentProperties[name]) { + parentProperties[name] = it->second; + // parentProperties[name]["Inherits"] = childYaml[childBase]["UUID"]; + (*inheritances)[std::pair(uuid, QString::fromStdString(name))] = + yamlValue(childYaml[childBase], "UUID", ""); + } + } + } + // showYaml(*parentPtr); +} + + +void ModelLoader::dereference(ModelEntry* model, + std::map, QString>* inheritances) +{ + // Avoid recursion + if (model->getDereferenced()) { + return; + } + + auto yamlModel = model->getModel(); + auto base = model->getBase().toStdString(); + if (yamlModel[base]["Inherits"]) { + auto inherits = yamlModel[base]["Inherits"]; + for (auto it = inherits.begin(); it != inherits.end(); it++) { + QString nodeName = QString::fromStdString((*it)["UUID"].as()); + + // This requires that all models have already been loaded undereferenced + try { + const ModelEntry* child = (*_modelEntryMap)[nodeName]; + dereference(model->getUUID(), model, child, inheritances); + } + catch (const std::out_of_range& oor) { + Base::Console().Log("Unable to find '%s' in model map\n", + nodeName.toStdString().c_str()); + } + } + } + + model->markDereferenced(); +} + +QString ModelLoader::yamlValue(const YAML::Node& node, + const std::string& key, + const std::string& defaultValue) +{ + if (node[key]) { + return QString::fromStdString(node[key].as()); + } + return QString::fromStdString(defaultValue); +} + +void ModelLoader::addToTree(ModelEntry* model, + std::map, QString>* inheritances) +{ + std::set exclude; + exclude.insert(QString::fromStdString("Name")); + exclude.insert(QString::fromStdString("UUID")); + exclude.insert(QString::fromStdString("URL")); + exclude.insert(QString::fromStdString("Description")); + exclude.insert(QString::fromStdString("DOI")); + exclude.insert(QString::fromStdString("Inherits")); + + auto yamlModel = model->getModel(); + auto library = model->getLibrary(); + auto base = model->getBase().toStdString(); + auto name = model->getName(); + auto directory = model->getDirectory(); + auto uuid = model->getUUID(); + + QString version = yamlValue(yamlModel["General"], "Version", ""); + + QString description = yamlValue(yamlModel[base], "Description", ""); + QString url = yamlValue(yamlModel[base], "URL", ""); + QString doi = yamlValue(yamlModel[base], "DOI", ""); + + Model::ModelType type = + (base == "Model") ? Model::ModelType_Physical : Model::ModelType_Appearance; + + Model* finalModel = new Model(library, type, name, directory, uuid, description, url, doi); + + // Add inheritance list + if (yamlModel[base]["Inherits"]) { + auto inherits = yamlModel[base]["Inherits"]; + for (auto it = inherits.begin(); it != inherits.end(); it++) { + QString nodeName = QString::fromStdString((*it)["UUID"].as()); + + finalModel->addInheritance(nodeName); + } + } + + // Add property list + auto yamlProperties = yamlModel[base]; + for (auto it = yamlProperties.begin(); it != yamlProperties.end(); it++) { + std::string propName = it->first.as(); + if (exclude.count(QString::fromStdString(propName)) == 0) { + // showYaml(it->second); + auto yamlProp = yamlProperties[propName]; + auto propType = yamlValue(yamlProp, "Type", ""); + auto propUnits = yamlValue(yamlProp, "Units", ""); + auto propURL = yamlValue(yamlProp, "URL", ""); + auto propDescription = yamlValue(yamlProp, "Description", ""); + // auto inherits = yamlValue(yamlProp, "Inherits", ""); + + ModelProperty property(QString::fromStdString(propName), + propType, + propUnits, + propURL, + propDescription); + + if (propType == QString::fromStdString("2DArray") + || propType == QString::fromStdString("3DArray")) { + Base::Console().Log("Reading columns\n"); + // Read the columns + auto cols = yamlProp["Columns"]; + for (auto col : cols) { + std::string colName = col.first.as(); + Base::Console().Log("\tColumns '%s'\n", colName.c_str()); + + auto colProp = cols[colName]; + auto colPropType = yamlValue(colProp, "Type", ""); + auto colPropUnits = yamlValue(colProp, "Units", ""); + auto colPropURL = yamlValue(colProp, "URL", ""); + auto colPropDescription = yamlValue(colProp, "Description", ""); + ModelProperty colProperty(QString::fromStdString(colName), + colPropType, + colPropUnits, + colPropURL, + colPropDescription); + + property.addColumn(colProperty); + } + } + + auto key = std::pair(uuid, QString::fromStdString(propName)); + if (inheritances->count(key) > 0) { + property.setInheritance((*inheritances)[key]); + } + + finalModel->addProperty(property); + } + } + + (*_modelMap)[uuid] = library.addModel(*finalModel, directory); +} + +void ModelLoader::loadLibrary(const ModelLibrary& library) +{ + if (_modelEntryMap == nullptr) { + _modelEntryMap = std::make_unique>(); + } + + QDirIterator it(library.getDirectory(), QDirIterator::Subdirectories); + while (it.hasNext()) { + auto pathname = it.next(); + QFileInfo file(pathname); + if (file.isFile()) { + if (file.suffix().toStdString() == "yml") { + QString libraryName = file.baseName(); + + try { + auto model = getModelFromPath(library, file.canonicalFilePath()); + (*_modelEntryMap)[model->getUUID()] = model; + // showYaml(model->getModel()); + } + catch (InvalidModel const&) { + Base::Console().Log("Invalid model '%s'\n", pathname.toStdString().c_str()); + } + } + } + } + + std::map, QString>* inheritances = + new std::map, QString>(); + for (auto it = _modelEntryMap->begin(); it != _modelEntryMap->end(); it++) { + dereference(it->second, inheritances); + } + + for (auto it = _modelEntryMap->begin(); it != _modelEntryMap->end(); it++) { + addToTree(it->second, inheritances); + } + // delete inheritances; +} + +void ModelLoader::loadLibraries() +{ + getModelLibraries(); + if (_libraryList) { + for (auto it = _libraryList->begin(); it != _libraryList->end(); it++) { + loadLibrary(**it); + } + } +} + +void ModelLoader::getModelLibraries() +{ + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Resources"); + bool useBuiltInMaterials = param->GetBool("UseBuiltInMaterials", true); + bool useMatFromModules = param->GetBool("UseMaterialsFromWorkbenches", true); + bool useMatFromConfigDir = param->GetBool("UseMaterialsFromConfigDir", true); + bool useMatFromCustomDir = param->GetBool("UseMaterialsFromCustomDir", true); + + if (useBuiltInMaterials) { + QString resourceDir = QString::fromStdString(App::Application::getResourceDir() + + "/Mod/Material/Resources/Models"); + auto libData = new ModelLibrary(QString::fromStdString("System"), + resourceDir, + QString::fromStdString(":/icons/freecad.svg")); + _libraryList->push_back(libData); + } + + if (useMatFromModules) { + auto moduleParam = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Resources/Modules"); + for (auto& group : moduleParam->GetGroups()) { + // auto module = moduleParam->GetGroup(group->GetGroupName()); + auto moduleName = QString::fromStdString(group->GetGroupName()); + auto modelDir = QString::fromStdString(group->GetASCII("ModuleModelDir", "")); + auto modelIcon = QString::fromStdString(group->GetASCII("ModuleIcon", "")); + + if (modelDir.length() > 0) { + QDir dir(modelDir); + if (dir.exists()) { + auto libData = new ModelLibrary(moduleName, modelDir, modelIcon); + _libraryList->push_back(libData); + } + } + } + } + + if (useMatFromConfigDir) { + QString resourceDir = + QString::fromStdString(App::Application::getUserAppDataDir() + "/Models"); + if (!resourceDir.isEmpty()) { + QDir materialDir(resourceDir); + if (materialDir.exists()) { + auto libData = + new ModelLibrary(QString::fromStdString("User"), + resourceDir, + QString::fromStdString(":/icons/preferences-general.svg")); + _libraryList->push_back(libData); + } + } + } + + if (useMatFromCustomDir) { + QString resourceDir = QString::fromStdString(param->GetASCII("CustomMaterialsDir", "")); + if (!resourceDir.isEmpty()) { + QDir materialDir(resourceDir); + if (materialDir.exists()) { + auto libData = new ModelLibrary(QString::fromStdString("Custom"), + resourceDir, + QString::fromStdString(":/icons/user.svg")); + _libraryList->push_back(libData); + } + } + } +} diff --git a/src/Mod/Material/App/ModelLoader.h b/src/Mod/Material/App/ModelLoader.h new file mode 100644 index 0000000000..b843b9e1fb --- /dev/null +++ b/src/Mod/Material/App/ModelLoader.h @@ -0,0 +1,129 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MODELLOADER_H +#define MATERIAL_MODELLOADER_H + +#include +#include +#include + +#include "Model.h" + +namespace Materials +{ + +class ModelEntry +{ +public: + explicit ModelEntry(const ModelLibrary& library, + const QString& baseName, + const QString& modelName, + const QString& dir, + const QString& modelUuid, + const YAML::Node& modelData); + virtual ~ModelEntry() = default; + + const ModelLibrary& getLibrary() const + { + return _library; + } + const QString getBase() const + { + return _base; + } + const QString getName() const + { + return _name; + } + const QString getDirectory() const + { + return _directory; + } + const QString getUUID() const + { + return _uuid; + } + const YAML::Node& getModel() const + { + return _model; + } + YAML::Node* getModelPtr() + { + return &_model; + } + bool getDereferenced() const + { + return _dereferenced; + } + + void markDereferenced() + { + _dereferenced = true; + } + +private: + ModelEntry(); + + ModelLibrary _library; + QString _base; + QString _name; + QString _directory; + QString _uuid; + YAML::Node _model; + bool _dereferenced; +}; + +class ModelLoader +{ +public: + explicit ModelLoader(std::shared_ptr> modelMap, + std::shared_ptr> libraryList); + virtual ~ModelLoader() = default; + + static const QString getUUIDFromPath(const QString& path); + +private: + ModelLoader(); + + void getModelLibraries(); + QString + yamlValue(const YAML::Node& node, const std::string& key, const std::string& defaultValue); + void addToTree(ModelEntry* model, std::map, QString>* inheritances); + void showYaml(const YAML::Node& yaml) const; + void dereference(const QString& uuid, + ModelEntry* parent, + const ModelEntry* child, + std::map, QString>* inheritances); + void dereference(ModelEntry* model, + std::map, QString>* inheritances); + ModelEntry* getModelFromPath(const ModelLibrary& library, const QString& path) const; + void addLibrary(ModelLibrary* model); + void loadLibrary(const ModelLibrary& library); + void loadLibraries(); + static std::unique_ptr> _modelEntryMap; + std::shared_ptr> _modelMap; + std::shared_ptr> _libraryList; +}; + +} // namespace Materials + +#endif // MATERIAL_MODELLOADER_H diff --git a/src/Mod/Material/App/ModelManager.cpp b/src/Mod/Material/App/ModelManager.cpp new file mode 100644 index 0000000000..2900fdde55 --- /dev/null +++ b/src/Mod/Material/App/ModelManager.cpp @@ -0,0 +1,172 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include + +#include + +#include "Model.h" +#include "ModelLoader.h" +#include "ModelManager.h" + + +using namespace Materials; + +std::shared_ptr> ModelManager::_libraryList = nullptr; +std::shared_ptr> ModelManager::_modelMap = nullptr; +QMutex ModelManager::_mutex; + +TYPESYSTEM_SOURCE(Materials::ModelManager, Base::BaseClass) + +ModelManager::ModelManager() +{ + initLibraries(); +} + +void ModelManager::initLibraries() +{ + QMutexLocker locker(&_mutex); + + if (_modelMap == nullptr) { + _modelMap = std::make_shared>(); + if (_libraryList == nullptr) { + _libraryList = std::make_shared>(); + } + + // Load the libraries + ModelLoader loader(_modelMap, _libraryList); + } +} + +bool ModelManager::isModel(const fs::path& p) +{ + // if (!fs::is_regular_file(p)) + // return false; + // check file extension + if (p.extension() == ".yml") { + return true; + } + return false; +} + +void ModelManager::refresh() +{ + _modelMap->clear(); + _libraryList->clear(); + + // Load the libraries + ModelLoader loader(_modelMap, _libraryList); +} + +const Model& ModelManager::getModel(const QString& uuid) const +{ + try { + if (_modelMap == nullptr) { + throw Uninitialized(); + } + + return *(_modelMap->at(uuid)); + } + catch (std::out_of_range const&) { + throw ModelNotFound(); + } +} + +const Model& ModelManager::getModelByPath(const QString& path) const +{ + const QString& uuid = ModelLoader::getUUIDFromPath(path); + const Model& model = getModel(uuid); + + return model; +} + +const Model& ModelManager::getModelByPath(const QString& path, const QString& libraryPath) const +{ + QDir modelDir(QDir::cleanPath(libraryPath + QString::fromStdString("/") + path)); + QString absPath = modelDir.absolutePath(); + return getModelByPath(absPath); +} + +bool ModelManager::passFilter(ModelFilter filter, Model::ModelType modelType) const +{ + switch (filter) { + case ModelFilter_None: + return true; + + case ModelFilter_Physical: + return (modelType == Model::ModelType_Physical); + + case ModelFilter_Appearance: + return (modelType == Model::ModelType_Appearance); + } + + return false; +} + +std::shared_ptr> +ModelManager::getModelTree(const ModelLibrary& library, ModelFilter filter) const +{ + std::shared_ptr> modelTree = + std::make_shared>(); + + for (auto it = _modelMap->begin(); it != _modelMap->end(); it++) { + auto filename = it->first; + auto model = it->second; + + if (model->getLibrary() == library && passFilter(filter, model->getType())) { + fs::path path = model->getDirectory().toStdString(); + Base::Console().Log("Relative path '%s'\n\t", path.string().c_str()); + + // Start at the root + std::shared_ptr> node = modelTree; + for (auto itp = path.begin(); itp != path.end(); itp++) { + if (isModel(itp->string())) { + ModelTreeNode* child = new ModelTreeNode(); + child->setData(model); + (*node)[QString::fromStdString(itp->string())] = child; + } + else { + // Add the folder only if it's not already there + QString folderName = QString::fromStdString(itp->string()); + std::shared_ptr> mapPtr; + if (node->count(QString::fromStdString(itp->string())) == 0) { + mapPtr = std::make_shared>(); + ModelTreeNode* child = new ModelTreeNode(); + child->setFolder(mapPtr); + (*node)[QString::fromStdString(itp->string())] = child; + node = mapPtr; + } + else { + node = (*node)[QString::fromStdString(itp->string())]->getFolder(); + } + } + Base::Console().Log("'%s' ", itp->string().c_str()); + } + Base::Console().Log("\n"); + } + } + + return modelTree; +} diff --git a/src/Mod/Material/App/ModelManager.h b/src/Mod/Material/App/ModelManager.h new file mode 100644 index 0000000000..5a5eed39ba --- /dev/null +++ b/src/Mod/Material/App/ModelManager.h @@ -0,0 +1,86 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MODELMANAGER_H +#define MATERIAL_MODELMANAGER_H + +#include + +#include + +#include + +#include "Exceptions.h" +#include "FolderTree.h" +#include "Model.h" + +namespace fs = boost::filesystem; + +namespace Materials +{ + +typedef FolderTreeNode ModelTreeNode; + +class MaterialsExport ModelManager: public Base::BaseClass +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + enum ModelFilter + { + ModelFilter_None, + ModelFilter_Physical, + ModelFilter_Appearance + }; + + ModelManager(); + ~ModelManager() override = default; + + void refresh(); + + std::shared_ptr> getModelLibraries() + { + return _libraryList; + } + std::shared_ptr> getModels() + { + return _modelMap; + } + std::shared_ptr> + getModelTree(const ModelLibrary& library, ModelFilter filter = ModelFilter_None) const; + const Model& getModel(const QString& uuid) const; + const Model& getModelByPath(const QString& path) const; + const Model& getModelByPath(const QString& path, const QString& libraryPath) const; + + static bool isModel(const fs::path& p); + bool passFilter(ModelFilter filter, Model::ModelType modelType) const; + +private: + static void initLibraries(); + + static std::shared_ptr> _libraryList; + static std::shared_ptr> _modelMap; + static QMutex _mutex; +}; + +} // namespace Materials + +#endif // MATERIAL_MODELMANAGER_H diff --git a/src/Mod/Material/App/ModelManagerPy.xml b/src/Mod/Material/App/ModelManagerPy.xml new file mode 100644 index 0000000000..b6e48da967 --- /dev/null +++ b/src/Mod/Material/App/ModelManagerPy.xml @@ -0,0 +1,41 @@ + + + + + + Material model descriptions. + + + + Get a model object by specifying its UUID + + + + + Get a model object by specifying its path + + + + + List of model libraries. + + + + + + List of model libraries. + + + + + diff --git a/src/Mod/Material/App/ModelManagerPyImpl.cpp b/src/Mod/Material/App/ModelManagerPyImpl.cpp new file mode 100644 index 0000000000..793a80a63b --- /dev/null +++ b/src/Mod/Material/App/ModelManagerPyImpl.cpp @@ -0,0 +1,162 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" + +#ifndef _PreComp_ +#include +#endif + +#include "ModelManager.h" +#include "ModelManagerPy.h" +#include "ModelPy.h" + +#include "ModelManagerPy.cpp" + +using namespace Materials; + +// returns a string which represents the object e.g. when printed in python +std::string ModelManagerPy::representation() const +{ + std::stringstream str; + str << ""; + + return str.str(); +} + +PyObject* ModelManagerPy::PyMake(struct _typeobject*, PyObject*, PyObject*) // Python wrapper +{ + // never create such objects with the constructor + return new ModelManagerPy(new ModelManager()); +} + +// constructor method +int ModelManagerPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) +{ + return 0; +} + +PyObject* ModelManagerPy::getModel(PyObject* args) +{ + char* uuid; + if (!PyArg_ParseTuple(args, "s", &uuid)) { + return nullptr; + } + + try { + const Model model = getModelManagerPtr()->getModel(QString::fromStdString(uuid)); + return new ModelPy(new Model(model)); + } + catch (ModelNotFound const&) { + QString error = QString::fromStdString("Model not found:\n"); + auto _modelMap = getModelManagerPtr()->getModels(); + error += QString::fromStdString("ModelMap:\n"); + for (auto itp = _modelMap->begin(); itp != _modelMap->end(); itp++) { + error += QString::fromStdString("\t_modelMap[") + itp->first + + QString::fromStdString("] = '") + itp->second->getName() + + QString::fromStdString("'\n"); + } + error += QString::fromStdString("\tuuid = '") + QString::fromStdString(uuid) + + QString::fromStdString("'\n"); + PyErr_SetString(PyExc_LookupError, error.toStdString().c_str()); + return nullptr; + } + catch (Uninitialized const&) { + PyErr_SetString(PyExc_LookupError, "Uninitialized model list"); + return nullptr; + } +} + +PyObject* ModelManagerPy::getModelByPath(PyObject* args) +{ + char* path; + char* lib = ""; + if (!PyArg_ParseTuple(args, "s|s", &path, &lib)) { + return nullptr; + } + + std::string libPath(lib); + if (libPath.length() > 0) { + try { + const Model& model = + getModelManagerPtr()->getModelByPath(QString::fromStdString(path), + QString::fromStdString(libPath)); + return new ModelPy(new Model(model)); + } + catch (ModelNotFound const&) { + PyErr_SetString(PyExc_LookupError, "Model not found"); + return nullptr; + } + } + + try { + const Model& model = getModelManagerPtr()->getModelByPath(QString::fromStdString(path)); + return new ModelPy(new Model(model)); + } + catch (ModelNotFound const&) { + PyErr_SetString(PyExc_LookupError, "Model not found"); + return nullptr; + } +} + +Py::List ModelManagerPy::getModelLibraries() const +{ + std::shared_ptr> libraries = getModelManagerPtr()->getModelLibraries(); + Py::List list; + + for (auto it = libraries->begin(); it != libraries->end(); it++) { + ModelLibrary* lib = *it; + Py::Tuple libTuple(3); + libTuple.setItem(0, Py::String(lib->getName().toStdString())); + libTuple.setItem(1, Py::String(lib->getDirectoryPath().toStdString())); + libTuple.setItem(2, Py::String(lib->getIconPath().toStdString())); + + list.append(libTuple); + } + + return list; +} + +Py::Dict ModelManagerPy::getModels() const +{ + auto models = getModelManagerPtr()->getModels(); + Py::Dict dict; + + for (auto it = models->begin(); it != models->end(); it++) { + QString key = it->first; + Model* model = it->second; + + PyObject* modelPy = new ModelPy(new Model(*model)); + dict.setItem(Py::String(key.toStdString()), Py::Object(modelPy, true)); + } + + return dict; +} + +PyObject* ModelManagerPy::getCustomAttributes(const char* /*attr*/) const +{ + return nullptr; +} + +int ModelManagerPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) +{ + return 0; +} diff --git a/src/Mod/Material/App/ModelPropertyPy.xml b/src/Mod/Material/App/ModelPropertyPy.xml new file mode 100644 index 0000000000..cffb548f8b --- /dev/null +++ b/src/Mod/Material/App/ModelPropertyPy.xml @@ -0,0 +1,54 @@ + + + + + + Material property descriptions. + + + + + Property name. + + + + + + Property type. + + + + + + Property units category. + + + + + + URL to a detailed description of the property. + + + + + + Property description. + + + + + diff --git a/src/Mod/Material/App/ModelPropertyPyImpl.cpp b/src/Mod/Material/App/ModelPropertyPyImpl.cpp new file mode 100644 index 0000000000..e87cb6f15f --- /dev/null +++ b/src/Mod/Material/App/ModelPropertyPyImpl.cpp @@ -0,0 +1,100 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" + +#ifndef _PreComp_ +#include +#endif + +#include "Model.h" +#include "ModelPropertyPy.h" + +#include "ModelPropertyPy.cpp" + +using namespace Materials; + +// returns a string which represents the object e.g. when printed in python +std::string ModelPropertyPy::representation() const +{ + ModelPropertyPy::PointerType ptr = getModelPropertyPtr(); + std::stringstream str; + str << "Property [Name=("; + str << ptr->getName().toStdString(); + str << "), Type=("; + str << ptr->getPropertyType().toStdString(); + str << "), Units=("; + str << ptr->getUnits().toStdString(); + str << "), URL=("; + str << ptr->getURL().toStdString(); + str << "), Description=("; + str << ptr->getDescription().toStdString(); + str << ")]"; + + return str.str(); +} + +PyObject* ModelPropertyPy::PyMake(struct _typeobject*, PyObject*, PyObject*) // Python wrapper +{ + // never create such objects with the constructor + return new ModelPropertyPy(new ModelProperty()); +} + +// constructor method +int ModelPropertyPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) +{ + return 0; +} + +Py::String ModelPropertyPy::getName() const +{ + return Py::String(getModelPropertyPtr()->getName().toStdString()); +} + +Py::String ModelPropertyPy::getType() const +{ + return Py::String(getModelPropertyPtr()->getPropertyType().toStdString()); +} + +Py::String ModelPropertyPy::getUnits() const +{ + return Py::String(getModelPropertyPtr()->getUnits().toStdString()); +} + +Py::String ModelPropertyPy::getURL() const +{ + return Py::String(getModelPropertyPtr()->getURL().toStdString()); +} + +Py::String ModelPropertyPy::getDescription() const +{ + return Py::String(getModelPropertyPtr()->getDescription().toStdString()); +} + +PyObject* ModelPropertyPy::getCustomAttributes(const char* /*attr*/) const +{ + return nullptr; +} + +int ModelPropertyPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) +{ + return 0; +} diff --git a/src/Mod/Material/App/ModelPy.xml b/src/Mod/Material/App/ModelPy.xml new file mode 100644 index 0000000000..9202307244 --- /dev/null +++ b/src/Mod/Material/App/ModelPy.xml @@ -0,0 +1,85 @@ + + + + + + Material model descriptions. + + + + Model library name. + + + + + + Model library path. + + + + + + Model icon path. + + + + + + Model name. + + + + + + Model directory. + + + + + + Unique model identifier. + + + + + + Description of the model. + + + + + + URL to a detailed description of the model. + + + + + + Digital Object Identifier (see https://doi.org/) + + + + + + List of inherited models identified by UUID. + + + + + + Dictionary of model properties. + + + + + diff --git a/src/Mod/Material/App/ModelPyImpl.cpp b/src/Mod/Material/App/ModelPyImpl.cpp new file mode 100644 index 0000000000..1d83d99e65 --- /dev/null +++ b/src/Mod/Material/App/ModelPyImpl.cpp @@ -0,0 +1,171 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" + +#ifndef _PreComp_ +#include +#endif + +#include "Model.h" +#include "ModelPropertyPy.h" +#include "ModelPy.h" + +#include "ModelPy.cpp" + +using namespace Materials; + +// returns a string which represents the object e.g. when printed in python +std::string ModelPy::representation() const +{ + ModelPy::PointerType ptr = getModelPtr(); + std::stringstream str; + str << "Property [Name=("; + str << ptr->getName().toStdString(); + str << "), UUID=("; + str << ptr->getUUID().toStdString(); + str << "), Library Name=("; + str << ptr->getLibrary().getName().toStdString(); + str << "), Library Root=("; + str << ptr->getLibrary().getDirectoryPath().toStdString(); + str << "), Library Icon=("; + str << ptr->getLibrary().getIconPath().toStdString(); + str << "), Directory=("; + str << ptr->getDirectory().toStdString(); + str << "), URL=("; + str << ptr->getURL().toStdString(); + str << "), DOI=("; + str << ptr->getDOI().toStdString(); + str << "), Description=("; + str << ptr->getDescription().toStdString(); + str << "), Inherits=["; + const std::vector& inherited = getModelPtr()->getInheritance(); + for (auto it = inherited.begin(); it != inherited.end(); it++) { + QString uuid = *it; + if (it != inherited.begin()) { + str << "), UUID=("; + } + else { + str << "UUID=("; + } + str << uuid.toStdString() << ")"; + } + str << "]]"; + + return str.str(); +} + +PyObject* ModelPy::PyMake(struct _typeobject*, PyObject*, PyObject*) // Python wrapper +{ + // never create such objects with the constructor + return new ModelPy(new Model()); +} + +// constructor method +int ModelPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) +{ + return 0; +} + +Py::String ModelPy::getLibraryName() const +{ + return Py::String(getModelPtr()->getLibrary().getName().toStdString()); +} + +Py::String ModelPy::getLibraryRoot() const +{ + return Py::String(getModelPtr()->getLibrary().getDirectoryPath().toStdString()); +} + +Py::String ModelPy::getLibraryIcon() const +{ + return Py::String(getModelPtr()->getLibrary().getIconPath().toStdString()); +} + +Py::String ModelPy::getName() const +{ + return Py::String(getModelPtr()->getName().toStdString()); +} + +Py::String ModelPy::getDirectory() const +{ + return Py::String(getModelPtr()->getDirectoryPath().toStdString()); +} + +Py::String ModelPy::getUUID() const +{ + return Py::String(getModelPtr()->getUUID().toStdString()); +} + +Py::String ModelPy::getDescription() const +{ + return Py::String(getModelPtr()->getDescription().toStdString()); +} + +Py::String ModelPy::getURL() const +{ + return Py::String(getModelPtr()->getURL().toStdString()); +} + +Py::String ModelPy::getDOI() const +{ + return Py::String(getModelPtr()->getDOI().toStdString()); +} + +Py::List ModelPy::getInherited() const +{ + const std::vector& inherited = getModelPtr()->getInheritance(); + Py::List list; + + for (auto it = inherited.begin(); it != inherited.end(); it++) { + QString uuid = *it; + + list.append(Py::String(uuid.toStdString())); + } + + return list; +} + +Py::Dict ModelPy::getProperties() const +{ + // std::map *models = getModelPtr()->getModels(); + Py::Dict dict; + + for (auto it = getModelPtr()->begin(); it != getModelPtr()->end(); it++) { + QString key = it->first; + ModelProperty& modelProperty = it->second; + + PyObject* modelPropertyPy = new ModelPropertyPy(new ModelProperty(modelProperty)); + dict.setItem(Py::String(key.toStdString()), Py::Object(modelPropertyPy, true)); + } + + return dict; +} + +PyObject* ModelPy::getCustomAttributes(const char* /*attr*/) const +{ + return nullptr; +} + +int ModelPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) +{ + return 0; +} diff --git a/src/Mod/Material/App/ModelUuids.h b/src/Mod/Material/App/ModelUuids.h new file mode 100644 index 0000000000..d160f13ac4 --- /dev/null +++ b/src/Mod/Material/App/ModelUuids.h @@ -0,0 +1,74 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_MODELUUIDS_H +#define MATERIAL_MODELUUIDS_H + +#include + +namespace Materials +{ + +// UUIDs for predefined material models + +static const QString ModelUUID_Legacy_Father = + QString::fromStdString("9cdda8b6-b606-4778-8f13-3934d8668e67"); +static const QString ModelUUID_Legacy_MaterialStandard = + QString::fromStdString("1e2c0088-904a-4537-925f-64064c07d700"); + +static const QString ModelUUID_Mechanical_Density = + QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af"); +static const QString ModelUUID_Mechanical_IsotropicLinearElastic = + QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50"); +static const QString ModelUUID_Mechanical_LinearElastic = + QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"); +static const QString ModelUUID_Mechanical_OgdenYld2004p18 = + QString::fromStdString("3ef9e427-cc25-43f7-817f-79ff0d49625f"); +static const QString ModelUUID_Mechanical_OrthotropicLinearElastic = + QString::fromStdString("b19ccc6b-a431-418e-91c2-0ac8c649d146"); + +static const QString ModelUUID_Fluid_Default = + QString::fromStdString("1ae66d8c-1ba1-4211-ad12-b9917573b202"); + +static const QString ModelUUID_Thermal_Default = + QString::fromStdString("9959d007-a970-4ea7-bae4-3eb1b8b883c7"); + +static const QString ModelUUID_Electromagnetic_Default = + QString::fromStdString("b2eb5f48-74b3-4193-9fbb-948674f427f3"); + +static const QString ModelUUID_Architectural_Default = + QString::fromStdString("32439c3b-262f-4b7b-99a8-f7f44e5894c8"); + +static const QString ModelUUID_Costs_Default = + QString::fromStdString("881df808-8726-4c2e-be38-688bb6cce466"); + +static const QString ModelUUID_Rendering_Basic = + QString::fromStdString("f006c7e4-35b7-43d5-bbf9-c5d572309e6e"); +static const QString ModelUUID_Rendering_Texture = + QString::fromStdString("bbdcc65b-67ca-489c-bd5c-a36e33d1c160"); +static const QString ModelUUID_Rendering_Advanced = + QString::fromStdString("c880f092-cdae-43d6-a24b-55e884aacbbf"); +static const QString ModelUUID_Rendering_Vector = + QString::fromStdString("fdf5a80e-de50-4157-b2e5-b6e5f88b680e"); + +} // namespace Materials + +#endif // MATERIAL_MODELUUIDS_H diff --git a/src/Mod/Material/App/PreCompiled.cpp b/src/Mod/Material/App/PreCompiled.cpp new file mode 100644 index 0000000000..48eade6cc8 --- /dev/null +++ b/src/Mod/Material/App/PreCompiled.cpp @@ -0,0 +1,22 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" diff --git a/src/Mod/Material/App/PreCompiled.h b/src/Mod/Material/App/PreCompiled.h new file mode 100644 index 0000000000..c643eb4f42 --- /dev/null +++ b/src/Mod/Material/App/PreCompiled.h @@ -0,0 +1,64 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_PRECOMPILED_H +#define MATERIAL_PRECOMPILED_H + +#include + +// point at which warnings of overly long specifiers disabled (needed for VC6) +#ifdef _MSC_VER +#pragma warning(disable : 4251) +#pragma warning(disable : 4503) +#pragma warning(disable : 4786) // specifier longer then 255 chars +#pragma warning(disable : 4273) +#endif + +#ifdef FC_OS_WIN32 +#ifndef NOMINMAX +#define NOMINMAX +#endif +#include +#endif + +#ifdef _PreComp_ + +// standard +#include +#include + +// STL +#include +#include +#include +#include +#include + +// Qt +#include + +// Boost +#include +#include + +#endif //_PreComp_ + +#endif // MATERIAL_PRECOMPILED_H diff --git a/src/Mod/Material/App/trim.h b/src/Mod/Material/App/trim.h new file mode 100644 index 0000000000..a8b4a94d84 --- /dev/null +++ b/src/Mod/Material/App/trim.h @@ -0,0 +1,81 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATERIAL_TRIM_H +#define MATERIAL_TRIM_H + +#include +#include + +namespace Materials +{ + +// trim from start (in place) +static inline void ltrim(std::string& s) +{ + s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) { + return !std::isspace(ch); + })); +} + +// trim from end (in place) +static inline void rtrim(std::string& s) +{ + s.erase(std::find_if(s.rbegin(), + s.rend(), + [](unsigned char ch) { + return !std::isspace(ch); + }) + .base(), + s.end()); +} + +// trim from both ends (in place) +static inline void trim(std::string& s) +{ + rtrim(s); + ltrim(s); +} + +// trim from start (copying) +static inline std::string ltrim_copy(std::string s) +{ + ltrim(s); + return s; +} + +// trim from end (copying) +static inline std::string rtrim_copy(std::string s) +{ + rtrim(s); + return s; +} + +// trim from both ends (copying) +static inline std::string trim_copy(std::string s) +{ + trim(s); + return s; +} + +} // namespace Materials + +#endif // MATERIAL_TRIM_H diff --git a/src/Mod/Material/CMakeLists.txt b/src/Mod/Material/CMakeLists.txt index da9f68f39e..b9ae72647d 100644 --- a/src/Mod/Material/CMakeLists.txt +++ b/src/Mod/Material/CMakeLists.txt @@ -1,174 +1,221 @@ -IF (BUILD_GUI) - PYSIDE_WRAP_RC(Material_QRC_SRCS Resources/Material.qrc) -ENDIF (BUILD_GUI) +add_subdirectory(App) -SET(Material_SRCS +if(BUILD_GUI) + add_subdirectory(Gui) +endif(BUILD_GUI) + +IF(BUILD_GUI) + PYSIDE_WRAP_RC(Material_QRC_SRCS Resources/Material.qrc) +ENDIF(BUILD_GUI) + +SET(MaterialScripts_Files Init.py InitGui.py - Material.py importFCMat.py MaterialEditor.py - materials-editor.ui + TestMaterialsApp.py + Resources/ui/materials-editor.ui Templatematerial.yml ) -SOURCE_GROUP("Module" FILES ${Material_SRCS}) -SET (MaterialTools_Files +# SOURCE_GROUP("MaterialScripts" FILES ${MaterialScripts_Files}) +SET(MaterialTools_Files materialtools/__init__.py materialtools/cardutils.py + materialtools/MaterialModels.py ) -SET (Material_Icon_Files +SET(Material_Icon_Files Resources/icons/preview-rendered.svg Resources/icons/preview-vector.svg ) # collect all the material cards: -#FILE( GLOB MaterialLib_Files ./StandardMaterial/*.FCMat ./StandardMaterial/*.txt ) - -SET (MaterialLib_Files - StandardMaterial/None.FCMat - StandardMaterial/ABS-Generic.FCMat - StandardMaterial/Acrylic-Glass-Generic.FCMat - StandardMaterial/AlMg3F24.FCMat - StandardMaterial/AlMgSi1F31.FCMat - StandardMaterial/Aluminum-6061-T6.FCMat - StandardMaterial/Aluminum-Generic.FCMat - StandardMaterial/AlZn4-5Mg1F35.FCMat - StandardMaterial/CalculiX-Steel.FCMat - StandardMaterial/Concrete-Generic.FCMat - StandardMaterial/Copper-Generic.FCMat - StandardMaterial/Glass-E-GlassFibre.FCMat - StandardMaterial/Glass-Generic.FCMat - StandardMaterial/Glass-S2-GlassFibre.FCMat - StandardMaterial/Graphite.FCMat - StandardMaterial/Iron-Generic.FCMat - StandardMaterial/Invar-Generic.FCMat - StandardMaterial/PA6-Generic.FCMat - StandardMaterial/PET-Generic.FCMat - StandardMaterial/PLA-Generic.FCMat - StandardMaterial/PP-Generic.FCMat - StandardMaterial/PTFE-Generic.FCMat - StandardMaterial/PVC-Generic.FCMat - StandardMaterial/Reinforcement-FIB-B500.FCMat - StandardMaterial/Steel-15CrNi6.FCMat - StandardMaterial/Steel-17CrNiMo6.FCMat - StandardMaterial/Steel-1C22.FCMat - StandardMaterial/Steel-1C35.FCMat - StandardMaterial/Steel-1C45.FCMat - StandardMaterial/Steel-1C60.FCMat - StandardMaterial/Steel-20NiCrMo2.FCMat - StandardMaterial/Steel-28Mn6.FCMat - StandardMaterial/Steel-2C10.FCMat - StandardMaterial/Steel-30CrNiMo8.FCMat - StandardMaterial/Steel-34CrNiMo6.FCMat - StandardMaterial/Steel-36CrNiMo4.FCMat - StandardMaterial/Steel-36NiCrMo16.FCMat - StandardMaterial/Steel-3C15.FCMat - StandardMaterial/Steel-3C22.FCMat - StandardMaterial/Steel-3C35.FCMat - StandardMaterial/Steel-3V45.FCMat - StandardMaterial/Steel-C10.FCMat - StandardMaterial/Steel-C15.FCMat - StandardMaterial/Steel-C22E.FCMat - StandardMaterial/Steel-C25E.FCMat - StandardMaterial/Steel-C30E.FCMat - StandardMaterial/Steel-C40E.FCMat - StandardMaterial/Steel-C50E.FCMat - StandardMaterial/Steel-C55E.FCMat - StandardMaterial/Steel-C60E.FCMat - StandardMaterial/Steel-E295-GC.FCMat - StandardMaterial/Steel-E295.FCMat - StandardMaterial/Steel-E335-GC.FCMat - StandardMaterial/Steel-E335.FCMat - StandardMaterial/Steel-E360-GC.FCMat - StandardMaterial/Steel-E360.FCMat - StandardMaterial/Steel-EN-GJL-100.FCMat - StandardMaterial/Steel-EN-GJL-150.FCMat - StandardMaterial/Steel-EN-GJL-200.FCMat - StandardMaterial/Steel-EN-GJL-250.FCMat - StandardMaterial/Steel-EN-GJL-300.FCMat - StandardMaterial/Steel-EN-GJL-350.FCMat - StandardMaterial/Steel-EN-GJMB-350-10.FCMat - StandardMaterial/Steel-EN-GJMB-550-4.FCMat - StandardMaterial/Steel-EN-GJMB-650-2.FCMat - StandardMaterial/Steel-EN-GJMW-350-4.FCMat - StandardMaterial/Steel-EN-GJMW-360-12.FCMat - StandardMaterial/Steel-EN-GJMW-400-5.FCMat - StandardMaterial/Steel-EN-GJMW-450-7.FCMat - StandardMaterial/Steel-EN-GJS-400-15.FCMat - StandardMaterial/Steel-EN-GJS-500-7.FCMat - StandardMaterial/Steel-EN-GJS-600-3.FCMat - StandardMaterial/Steel-EN-GJS-700-2.FCMat - StandardMaterial/Steel-EN-GJS-800-1.FCMat - StandardMaterial/Steel-G16Mn5.FCMat - StandardMaterial/Steel-G200.FCMat - StandardMaterial/Steel-G20Mn5.FCMat - StandardMaterial/Steel-G230.FCMat - StandardMaterial/Steel-G260.FCMat - StandardMaterial/Steel-G300.FCMat - StandardMaterial/Steel-G30Mn5.FCMat - StandardMaterial/Steel-Generic.FCMat - StandardMaterial/Steel-S185.FCMat - StandardMaterial/Steel-S235JO.FCMat - StandardMaterial/Steel-S235JR.FCMat - StandardMaterial/Steel-S235JRG1.FCMat - StandardMaterial/Steel-S260NC.FCMat - StandardMaterial/Steel-S275JO.FCMat - StandardMaterial/Steel-S275JR.FCMat - StandardMaterial/Steel-S275N.FCMat - StandardMaterial/Steel-S335JO.FCMat - StandardMaterial/Steel-S335JR.FCMat - StandardMaterial/Steel-S335N.FCMat - StandardMaterial/Steel-S340MC.FCMat - StandardMaterial/Steel-S355J2G3.FCMat - StandardMaterial/Steel-S380MC.FCMat - StandardMaterial/Steel-S420MC.FCMat - StandardMaterial/Steel-S420N.FCMat - StandardMaterial/Steel-S460MC.FCMat - StandardMaterial/Steel-S460N.FCMat - StandardMaterial/Steel-S500MC.FCMat - StandardMaterial/Steel-S550MC.FCMat - StandardMaterial/Steel-S690MC.FCMat - StandardMaterial/Steel-St-37-2K.FCMat - StandardMaterial/Steel-St-E-255.FCMat - StandardMaterial/Steel-St-E-315.FCMat - StandardMaterial/Steel-St-E-380.FCMat - StandardMaterial/Steel-St-E-460.FCMat - StandardMaterial/Steel-St-E-500.FCMat - StandardMaterial/Steel-X2CrNiMoN17-13-3.FCMat - StandardMaterial/Steel-X2CrNiN24-4.FCMat - StandardMaterial/Steel-X39CrMo17-1.FCMat - StandardMaterial/Steel-X3CrNiMo13-14.FCMat - StandardMaterial/Steel-X5CrNi18-10.FCMat - StandardMaterial/Steel-X5CrNiMo17-12-2.FCMat - StandardMaterial/Steel-X6CrNiTi18-10.FCMat - StandardMaterial/TEMPLATE.FCMat - StandardMaterial/Ti-6Al-4V.FCMat - StandardMaterial/Wood-Generic.FCMat - StandardMaterial/Readme.txt -) -SOURCE_GROUP("MatLib" FILES ${MaterialLib_Files}) - -SET (FluidMaterial_Files - FluidMaterial/None.FCMat - FluidMaterial/Air.FCMat - FluidMaterial/Argon.FCMat - FluidMaterial/Carbon_dioxide.FCMat - FluidMaterial/Nitrogen.FCMat - FluidMaterial/Water.FCMat - FluidMaterial/Readme.md -) -SOURCE_GROUP("MatLib" FILES ${FluidMaterial_Files}) - -ADD_CUSTOM_TARGET(Material ALL - SOURCES ${Material_SRCS} ${Material_QRC_SRCS} +# FILE( GLOB MaterialLib_Files ./StandardMaterial/*.FCMat ./StandardMaterial/*.txt ) +SET(MaterialLib_Files + Resources/Materials/StandardMaterial/Aggregate/Concrete-EN-C35_45.FCMat + Resources/Materials/StandardMaterial/Aggregate/Concrete-Generic.FCMat + Resources/Materials/StandardMaterial/Aggregate/Reinforcement-FIB-B500.FCMat + Resources/Materials/StandardMaterial/Carbon/Graphite.FCMat + Resources/Materials/StandardMaterial/Glass/Glass-E-GlassFibre.FCMat + Resources/Materials/StandardMaterial/Glass/Glass-Generic.FCMat + Resources/Materials/StandardMaterial/Glass/Glass-S2-GlassFibre.FCMat + Resources/Materials/StandardMaterial/Metal/Alloys/Invar-Generic.FCMat + Resources/Materials/StandardMaterial/Metal/Aluminum/AlMg3F24.FCMat + Resources/Materials/StandardMaterial/Metal/Aluminum/AlMgSi1F31.FCMat + Resources/Materials/StandardMaterial/Metal/Aluminum/Aluminum-6061-T6.FCMat + Resources/Materials/StandardMaterial/Metal/Aluminum/Aluminum-Generic.FCMat + Resources/Materials/StandardMaterial/Metal/Aluminum/AlZn4-5Mg1F35.FCMat + Resources/Materials/StandardMaterial/Metal/Copper/Copper-Generic.FCMat + Resources/Materials/StandardMaterial/Metal/Iron/Iron-Generic.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-15CrNi6.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-17CrNiMo6.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C22.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C35.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C45.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C60.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-20NiCrMo2.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-28Mn6.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-2C10.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-30CrNiMo8.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-34CrNiMo6.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-36CrNiMo4.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-36NiCrMo16.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C15.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C22.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C35.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-3V45.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C10.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C15.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C22E.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C25E.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C30E.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C40E.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C50E.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C55E.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-C60E.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-E295-GC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-E295.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-E335-GC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-E335.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-E360-GC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-E360.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-100.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-150.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-200.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-250.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-300.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-350.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-350-10.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-550-4.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-650-2.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-350-4.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-360-12.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-400-5.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-450-7.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-400-15.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-500-7.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-600-3.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-700-2.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-800-1.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-G16Mn5.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-G200.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-G20Mn5.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-G230.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-G260.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-G300.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-G30Mn5.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-Generic.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S185.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JO.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JR.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JRG1.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S260NC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275JO.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275JR.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275N.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335JO.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335JR.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335N.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S340MC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S355J2G3.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S380MC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S420MC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S420N.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S460MC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S460N.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S500MC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S550MC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-S690MC.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-37-2K.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-255.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-315.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-380.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-460.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-500.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-X2CrNiMoN17-13-3.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-X2CrNiN24-4.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-X39CrMo17-1.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-X3CrNiMo13-14.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-X5CrNi18-10.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-X5CrNiMo17-12-2.FCMat + Resources/Materials/StandardMaterial/Metal/Steel/Steel-X6CrNiTi18-10.FCMat + Resources/Materials/StandardMaterial/Metal/Titanium/Ti-6Al-4V.FCMat + Resources/Materials/StandardMaterial/Thermoplast/ABS-Generic.FCMat + Resources/Materials/StandardMaterial/Thermoplast/Acrylic-Glass-Generic.FCMat + Resources/Materials/StandardMaterial/Thermoplast/PA6-Generic.FCMat + Resources/Materials/StandardMaterial/Thermoplast/PET-Generic.FCMat + Resources/Materials/StandardMaterial/Thermoplast/PLA-Generic.FCMat + Resources/Materials/StandardMaterial/Thermoplast/PP-Generic.FCMat + Resources/Materials/StandardMaterial/Thermoplast/PTFE-Generic.FCMat + Resources/Materials/StandardMaterial/Thermoplast/PVC-Generic.FCMat + Resources/Materials/StandardMaterial/Wood/Wood-Generic.FCMat ) -fc_target_copy_resource(Material +SET(FluidMaterial_Files + Resources/Materials/FluidMaterial/None.FCMat + Resources/Materials/FluidMaterial/Air.FCMat + Resources/Materials/FluidMaterial/Argon.FCMat + Resources/Materials/FluidMaterial/Carbon_dioxide.FCMat + Resources/Materials/FluidMaterial/Nitrogen.FCMat + Resources/Materials/FluidMaterial/Water.FCMat +) + +SET(AppearanceLib_Files + Resources/Materials/Appearance/Aluminum.FCMat + Resources/Materials/Appearance/Brass.FCMat + Resources/Materials/Appearance/Bronze.FCMat + Resources/Materials/Appearance/Chrome.FCMat + Resources/Materials/Appearance/Copper.FCMat + Resources/Materials/Appearance/DefaultAppearance.FCMat + Resources/Materials/Appearance/Emerald.FCMat + Resources/Materials/Appearance/Gold.FCMat + Resources/Materials/Appearance/Jade.FCMat + Resources/Materials/Appearance/Metalized.FCMat + Resources/Materials/Appearance/NeonGNC.FCMat + Resources/Materials/Appearance/NeonPHC.FCMat + Resources/Materials/Appearance/Obsidian.FCMat + Resources/Materials/Appearance/Pewter.FCMat + Resources/Materials/Appearance/Plaster.FCMat + Resources/Materials/Appearance/Plastic.FCMat + Resources/Materials/Appearance/Ruby.FCMat + Resources/Materials/Appearance/Satin.FCMat + Resources/Materials/Appearance/ShinyPlastic.FCMat + Resources/Materials/Appearance/Silver.FCMat + Resources/Materials/Appearance/Steel.FCMat + Resources/Materials/Appearance/Stone.FCMat +) + +SET(MaterialModel_Files + Resources/Models/Architectural/Architectural.yml + Resources/Models/Costs/Costs.yml + Resources/Models/Electromagnetic/Electromagnetic.yml + Resources/Models/Fluid/Fluid.yml + Resources/Models/Legacy/Father.yml + Resources/Models/Legacy/MaterialStandard.yml + Resources/Models/Mechanical/Density.yml + Resources/Models/Mechanical/HypotheticalExample.yml + Resources/Models/Mechanical/IsotropicLinearElastic.yml + Resources/Models/Mechanical/LinearElastic.yml + Resources/Models/Mechanical/OgdenYld2004p18.yml + Resources/Models/Mechanical/OrthotropicLinearElastic.yml + Resources/Models/Rendering/AdvancedRendering.yml + Resources/Models/Rendering/BasicRendering.yml + Resources/Models/Rendering/TextureRendering.yml + Resources/Models/Rendering/VectorRendering.yml + Resources/Models/Thermal/Thermal.yml +) + +ADD_CUSTOM_TARGET(MaterialScripts ALL + SOURCES ${MaterialScripts_Files} ${Material_QRC_SRCS} +) + +fc_target_copy_resource(MaterialScripts ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Material - ${Material_SRCS}) + ${MaterialScripts_Files}) +INSTALL(FILES ${MaterialScripts_Files} DESTINATION Mod/Material) ADD_CUSTOM_TARGET(MaterialToolsLib ALL SOURCES ${MaterialTools_Files} @@ -191,42 +238,47 @@ fc_target_copy_resource(MaterialIconsLib INSTALL(FILES ${MaterialTools_Files} DESTINATION Mod/Material/materialtools) INSTALL(FILES ${Material_Icon_Files} DESTINATION Mod/Material/Resources/icons) -IF (BUILD_GUI) - fc_target_copy_resource(Material - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/Mod/Material - Material_rc.py) -ENDIF (BUILD_GUI) - ADD_CUSTOM_TARGET(MaterialLib ALL SOURCES ${MaterialLib_Files} ) ADD_CUSTOM_TARGET(FluidMaterialLib ALL SOURCES ${FluidMaterial_Files} ) +ADD_CUSTOM_TARGET(AppearanceLib ALL + SOURCES ${AppearanceLib_Files} +) +ADD_CUSTOM_TARGET(MaterialModelLib ALL + SOURCES ${MaterialModel_Files} +) # When a target copies files to different output directories then apparently it always builds the project # which is very annoying. So, the trick is to split this into two targets to avoid this behaviour. fc_target_copy_resource(MaterialLib ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material/ ${MaterialLib_Files}) fc_target_copy_resource(FluidMaterialLib ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material/ ${FluidMaterial_Files}) +fc_target_copy_resource(AppearanceLib + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material/ + ${AppearanceLib_Files}) +fc_target_copy_resource(MaterialModelLib + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material/ + ${MaterialModel_Files}) INSTALL( FILES ${Material_SRCS} ${Material_QRC_SRCS} DESTINATION Mod/Material ) -INSTALL( - DIRECTORY - StandardMaterial - DIRECTORY - FluidMaterial - DESTINATION - ${CMAKE_INSTALL_DATADIR}/Mod/Material - FILES_MATCHING PATTERN "*.FCMat*" -) +foreach(file ${MaterialLib_Files} ${FluidMaterial_Files} ${AppearanceLib_Files} ${MaterialModel_Files}) + get_filename_component(filepath ${file} DIRECTORY) + INSTALL( + FILES ${file} + DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Material/${filepath} + ) +endforeach() diff --git a/src/Mod/Material/FluidMaterial/Air.FCMat b/src/Mod/Material/FluidMaterial/Air.FCMat deleted file mode 100644 index 19447e1eab..0000000000 --- a/src/Mod/Material/FluidMaterial/Air.FCMat +++ /dev/null @@ -1,24 +0,0 @@ -[General] -Name = Air -Description = Dry air properties at 20 Degrees Celsius and 1 atm -MolarMass = 28.965 -Father = Gas - -[Fluidic] -Density = 1.204 kg/m^3 -DynamicViscosity = 1.80e-5 kg/m/s -KinematicViscosity = 1.511e-5 m^2/s -; PrandtlNumber is a nondimension number for CFD simulation -PrandtlNumber = 0.7 - -[Thermal] -SpecificHeat = 1.01 kJ/kg/K -ThermalConductivity = 0.02587 W/m/K -; thermal expansion coefficient of ideal gas is 1/temperature -ThermalExpansionCoefficient = 3.43e-3 1/K - -[Electromagnetic] -RelativePermittivity = 1.00059 -; at 18°C and 50Hz -ElectricalConductivity = 1e-12 S/m -RelativePermeability = 1.0 diff --git a/src/Mod/Material/FluidMaterial/Argon.FCMat b/src/Mod/Material/FluidMaterial/Argon.FCMat deleted file mode 100644 index 59ef9a5ea4..0000000000 --- a/src/Mod/Material/FluidMaterial/Argon.FCMat +++ /dev/null @@ -1,24 +0,0 @@ -[General] -Name = Argon -Description = Argon properties at 20 Degrees Celsius and 1 atm -MolarMass = 39.95 -Father = Gas - -[Fluidic] -Density = 1.641 kg/m^3 -DynamicViscosity = 22.3e-6 kg/m/s -; Kinematic Viscosity = Dynamic Viscosity / Density -KinematicViscosity = 13.59-6 m^2/s -; PrandtlNumber is a nondimension number for CFD simulation -PrandtlNumber = 0.7 - -[Thermal] -SpecificHeat = 0.520 kJ/kg/K -ThermalConductivity = 0.018 W/m/K -; thermal expansion coefficient of ideal gas is 1/temperature -ThermalExpansionCoefficient = 3.43e-3 1/K - -[Electromagnetic] -RelativePermittivity = 1.000513 -ElectricalConductivity = 1e-15 S/m -RelativePermeability = 1.0 diff --git a/src/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat b/src/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat deleted file mode 100644 index ca4b9bf57f..0000000000 --- a/src/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat +++ /dev/null @@ -1,24 +0,0 @@ -[General] -Name = Carbon dioxide -Description = Carbon dioxide properties at 20 Degrees Celsius and 1 atm -MolarMass = 44.009 -Father = Gas - -[Fluidic] -Density = 1.8393 kg/m^3 -DynamicViscosity = 14.7e-6 kg/m/s -; Kinematic Viscosity = Dynamic Viscosity / Density -KinematicViscosity = 8.09e-6 m^2/s -; PrandtlNumber is a nondimension number for CFD simulation -PrandtlNumber = 0.7651 - -[Thermal] -SpecificHeat = 0.8460 kJ/kg/K -ThermalConductivity = 0.016242 W/m/K -; thermal expansion coefficient of ideal gas is 1/temperature -ThermalExpansionCoefficient = 3.43e-3 1/K - -[Electromagnetic] -RelativePermittivity = 1.0009217 -ElectricalConductivity = 1e-12 S/m -RelativePermeability = 1.0 diff --git a/src/Mod/Material/FluidMaterial/Nitrogen.FCMat b/src/Mod/Material/FluidMaterial/Nitrogen.FCMat deleted file mode 100644 index 4f957c8ae0..0000000000 --- a/src/Mod/Material/FluidMaterial/Nitrogen.FCMat +++ /dev/null @@ -1,24 +0,0 @@ -[General] -Name = Nitrogen -Description = Nitrogen properties at 20 Degrees Celsius and 1 atm -MolarMass = 14.007 -Father = Gas - -[Fluidic] -Density = 1.2506 kg/m^3 -DynamicViscosity = 17.58e-6 kg/m/s -; Kinematic Viscosity = Dynamic Viscosity / Density -KinematicViscosity = 14.06e-6 m^2/s -; PrandtlNumber is a nondimension number for CFD simulation -PrandtlNumber = 0.7 - -[Thermal] -SpecificHeat = 1.04 kJ/kg/K -ThermalConductivity = 25.83e-3 W/m/K -; thermal expansion coefficient of ideal gas is 1/temperature -ThermalExpansionCoefficient = 3.43e-3 1/K - -[Electromagnetic] -RelativePermittivity = 1.00058 -ElectricalConductivity = 1e-12 S/m -RelativePermeability = 1.0 diff --git a/src/Mod/Material/FluidMaterial/None.FCMat b/src/Mod/Material/FluidMaterial/None.FCMat deleted file mode 100644 index 9de08f0786..0000000000 --- a/src/Mod/Material/FluidMaterial/None.FCMat +++ /dev/null @@ -1,15 +0,0 @@ -; None means nothing, as the starting point of making a new fluid material - -[General] -Name = None -Description = "None" - -[Fluidic] -Density = 0 kg/m^3 -DynamicViscosity = 0 kg/m/s -KinematicViscosity = 0 m^2/s - -[Thermal] -SpecificHeat = 0 J/kg/K -ThermalConductivity = 0 W/m/K -ThermalExpansionCoefficient = 0 1/K diff --git a/src/Mod/Material/FluidMaterial/Readme.md b/src/Mod/Material/FluidMaterial/Readme.md deleted file mode 100644 index a50ee6139b..0000000000 --- a/src/Mod/Material/FluidMaterial/Readme.md +++ /dev/null @@ -1,31 +0,0 @@ -# FreeCAD fluid material library - - It's intended to gather the most common fluid properties, water, air, which are useful for other modules and workbenches. - -## User defined material - -To prevent the database from becoming inefficiently large it is only limited to commonly used variables at 20 degrees Celsius at 1 atm. - -Users can defined new material, either in Fem material card editor, or directly generate textual material file, * .FCMat, see example in this folder. - -To enable new material, go to FreeCAD menu "Edit->Preference..." Cfd preference page (select on the left panel) and switch to materiai tab on the right. - -Browse to your material folder, and save/apply this preference, new material will be Material with same name as FreeCAD material has higher priority, so user defined `Water` material will not appear in Fem material task panel's dropbox list, just give it a different name! - -### Edit material value - -Please verify the fluid material properties before use. It aims to serve as a quick reference and does not aim to be an extended look up table. - - -## Add new material to Material module - -1. follow examples in material folders to create new material file -2. stick to the meta data definition in `src/Mod/Material/Templatematerial.yml` for property name -3. add the file name into the `src/Mod/Material/CMakeLists.txt` , so the new files can be installed to the properly place during compiling and installation. - -## Changelog - -CfdOF module authored 5 material types, values are taken from FM White (2011) Fluid Mechanics. - -Currently, 3 (Water, Air, None) are merged into Fem module and maintained by Cfd module author, Qingfeng Xia - diff --git a/src/Mod/Material/FluidMaterial/Water.FCMat b/src/Mod/Material/FluidMaterial/Water.FCMat deleted file mode 100644 index ced22ef6f5..0000000000 --- a/src/Mod/Material/FluidMaterial/Water.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; see meta data definition in the file: src/Mod/Material/Templatematerial.yml -[General] -Name = Water -Description = Standard distilled water properties at 20 Degrees Celsius and 1 atm -MolarMass = 18 -Father = Gas -ReferenceSource = '' - -[Fluidic] -Density = 998 kg/m^3 -DynamicViscosity = 1.003e-3 kg/m/s -KinematicViscosity = 1.005e-6 m^2/s -; PrandtlNumber is a nondimension number for CFD simulation -PrandtlNumber = 7.56 - -[Thermal] -SpecificHeat = 4182 J/kg/K -ThermalConductivity = 0.591 W/m/K -; https://en.wikipedia.org/wiki/Water -ThermalExpansionCoefficient = 2.07e-4 m/m/K - -[Electromagnetic] -RelativePermittivity = 80.0 -; at 20°C and 50Hz -ElectricalConductivity = 5.5e-6 S/m -RelativePermeability = 0.999992 diff --git a/src/Mod/Material/Gui/AppMatGui.cpp b/src/Mod/Material/Gui/AppMatGui.cpp new file mode 100644 index 0000000000..f20967589b --- /dev/null +++ b/src/Mod/Material/Gui/AppMatGui.cpp @@ -0,0 +1,106 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +#endif + +#include +#include +#include +#include +#include +#include + +#include "DlgSettingsMaterial.h" +#include "Workbench.h" + +// use a different name to CreateCommand() +void CreateMaterialCommands(); + +void loadMaterialResource() +{ + // add resources and reloads the translators + Q_INIT_RESOURCE(Material); + Q_INIT_RESOURCE(Material_translation); + Gui::Translator::instance()->refresh(); +} + +namespace MatGui +{ +class Module: public Py::ExtensionModule +{ +public: + Module() + : Py::ExtensionModule("MatGui") + { + initialize("This module is the MatGui module."); // register with Python + } + + ~Module() override + {} + +private: +}; + +PyObject* initModule() +{ + return Base::Interpreter().addModule(new Module); +} + +} // namespace MatGui + +PyMOD_INIT_FUNC(MatGui) +{ + if (!Gui::Application::Instance) { + PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application."); + PyMOD_Return(nullptr); + } + + // load needed modules + try { + Base::Interpreter().runString("import Material"); + } + catch (const Base::Exception& e) { + PyErr_SetString(PyExc_ImportError, e.what()); + PyMOD_Return(nullptr); + } + + PyObject* matGuiModule = MatGui::initModule(); + + Base::Console().Log("Loading GUI of Material module... done\n"); + + MatGui::Workbench ::init(); + + // instantiating the commands + CreateMaterialCommands(); + + // register preferences pages on Material, the order here will be the order of the tabs in pref + // widget + new Gui::PrefPageProducer( + QT_TRANSLATE_NOOP("QObject", "Material")); + + // add resources and reloads the translators + loadMaterialResource(); + + PyMOD_Return(matGuiModule); +} diff --git a/src/Mod/Material/Gui/Array2D.cpp b/src/Mod/Material/Gui/Array2D.cpp new file mode 100644 index 0000000000..5e39884d82 --- /dev/null +++ b/src/Mod/Material/Gui/Array2D.cpp @@ -0,0 +1,158 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#endif + +#include + +#include +#include + +#include "Array2D.h" +#include "ArrayDelegate.h" +#include "ArrayModel.h" +#include "ui_Array2D.h" + + +using namespace MatGui; + +/* TRANSLATOR MatGui::Array2D */ + +Array2D::Array2D(const QString& propertyName, Materials::Material* material, QWidget* parent) + : QDialog(parent) + , ui(new Ui_Array2D) +{ + ui->setupUi(this); + + if (material->hasPhysicalProperty(propertyName)) { + _property = &(material->getPhysicalProperty(propertyName)); + } + else if (material->hasAppearanceProperty(propertyName)) { + _property = &(material->getAppearanceProperty(propertyName)); + } + else { + _property = nullptr; + } + if (_property) { + _value = + std::static_pointer_cast(_property->getMaterialValue()); + } + else { + _value = nullptr; + } + + setupDefault(); + setupArray(); + + connect(ui->standardButtons, &QDialogButtonBox::accepted, this, &Array2D::accept); + connect(ui->standardButtons, &QDialogButtonBox::rejected, this, &Array2D::reject); +} + +void Array2D::setupDefault() +{ + if (_property == nullptr) { + return; + } + + try { + const Materials::MaterialProperty& column1 = _property->getColumn(0); + QString label = QString::fromStdString("Default ") + column1.getName(); + ui->labelDefault->setText(label); + if (column1.getPropertyType() == QString::fromStdString("Quantity")) { + ui->editDefault->setMinimum(std::numeric_limits::min()); + ui->editDefault->setMaximum(std::numeric_limits::max()); + ui->editDefault->setUnitText(_property->getColumnUnits(0)); + ui->editDefault->setValue(_value->getDefault().getValue().value()); + + connect(ui->editDefault, + qOverload(&Gui::QuantitySpinBox::valueChanged), + this, + &Array2D::defaultValueChanged); + } + } + catch (const Materials::PropertyNotFound&) { + return; + } +} + +void Array2D::setHeaders(QStandardItemModel* model) +{ + QStringList headers; + auto columns = _property->getColumns(); + for (auto column = columns.begin(); column != columns.end(); column++) { + headers.append(column->getName()); + } + model->setHorizontalHeaderLabels(headers); +} + +void Array2D::setColumnWidths(QTableView* table) +{ + int length = _property->columns(); + for (int i = 0; i < length; i++) { + table->setColumnWidth(i, 100); + } +} + +void Array2D::setColumnDelegates(QTableView* table) +{ + int length = _property->columns(); + for (int i = 0; i < length; i++) { + const Materials::MaterialProperty& column = _property->getColumn(i); + table->setItemDelegateForColumn( + i, + new ArrayDelegate(column.getType(), column.getUnits(), this)); + } +} + +void Array2D::setupArray() +{ + if (_property == nullptr) { + return; + } + + auto table = ui->tableView; + auto model = new Array2DModel(_property, _value, this); + table->setModel(model); + table->setEditTriggers(QAbstractItemView::AllEditTriggers); + + setColumnWidths(table); + setColumnDelegates(table); +} + +void Array2D::defaultValueChanged(const Base::Quantity& value) +{ + _value->setDefault(QVariant::fromValue(value)); +} + +void Array2D::accept() +{ + QDialog::accept(); +} + +void Array2D::reject() +{ + QDialog::reject(); +} + +#include "moc_Array2D.cpp" diff --git a/src/Mod/Material/Gui/Array2D.h b/src/Mod/Material/Gui/Array2D.h new file mode 100644 index 0000000000..f32f97e93e --- /dev/null +++ b/src/Mod/Material/Gui/Array2D.h @@ -0,0 +1,67 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_ARRAY2D_H +#define MATGUI_ARRAY2D_H + +#include +#include +#include +#include + +#include "ArrayModel.h" +#include + +namespace MatGui +{ + +class Ui_Array2D; + +class Array2D: public QDialog +{ + Q_OBJECT + +public: + explicit Array2D(const QString& propertyName, + Materials::Material* material, + QWidget* parent = nullptr); + ~Array2D() override = default; + + void defaultValueChanged(const Base::Quantity& value); + + void accept() override; + void reject() override; + +private: + std::unique_ptr ui; + const Materials::MaterialProperty* _property; + std::shared_ptr _value; + + void setupDefault(); + void setHeaders(QStandardItemModel* model); + void setColumnWidths(QTableView* table); + void setColumnDelegates(QTableView* table); + void setupArray(); +}; + +} // namespace MatGui + +#endif // MATGUI_ARRAY2D_H diff --git a/src/Mod/Material/Gui/Array2D.ui b/src/Mod/Material/Gui/Array2D.ui new file mode 100644 index 0000000000..3911c2f6d3 --- /dev/null +++ b/src/Mod/Material/Gui/Array2D.ui @@ -0,0 +1,92 @@ + + + MatGui::Array2D + + + + 0 + 0 + 578 + 557 + + + + 2D Array + + + + + + + + Default Value + + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + Gui::QuantitySpinBox + QWidget +
Gui/QuantitySpinBox.h
+ + + + + + standardButtons + accepted() + MatGui::Array2D + accept() + + + 248 + 254 + + + 157 + 274 + + + + + standardButtons + rejected() + MatGui::Array2D + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/Mod/Material/Gui/Array3D.cpp b/src/Mod/Material/Gui/Array3D.cpp new file mode 100644 index 0000000000..956a033204 --- /dev/null +++ b/src/Mod/Material/Gui/Array3D.cpp @@ -0,0 +1,197 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#endif + +#include + +#include + +#include "Array3D.h" +#include "ArrayDelegate.h" +#include "ArrayModel.h" +#include "ui_Array3D.h" + + +using namespace MatGui; + +Array3D::Array3D(const QString& propertyName, Materials::Material* material, QWidget* parent) + : QDialog(parent) + , ui(new Ui_Array3D) +{ + ui->setupUi(this); + + if (material->hasPhysicalProperty(propertyName)) { + _property = &(material->getPhysicalProperty(propertyName)); + } + else if (material->hasAppearanceProperty(propertyName)) { + _property = &(material->getAppearanceProperty(propertyName)); + } + else { + _property = nullptr; + } + if (_property) { + _value = + std::static_pointer_cast(_property->getMaterialValue()); + } + else { + _value = nullptr; + } + + setupDefault(); + setupDepthArray(); + setupArray(); + + Base::Console().Log("Material '%s'\n", material->getName().toStdString().c_str()); + Base::Console().Log("\tproperty '%s'\n", propertyName.toStdString().c_str()); + + // connect(ui->splitter, &QSplitter::event, + // this, &Array3D::onSplitter); + + connect(ui->standardButtons->button(QDialogButtonBox::Ok), + &QPushButton::clicked, + this, + &Array3D::onOk); + connect(ui->standardButtons->button(QDialogButtonBox::Cancel), + &QPushButton::clicked, + this, + &Array3D::onCancel); +} + +bool Array3D::onSplitter(QEvent* e) +{ + Q_UNUSED(e) + + return false; +} + +void Array3D::setupDefault() +{ + if (_property == nullptr) { + return; + } + + try { + auto& column1 = _property->getColumn(0); + QString label = QString::fromStdString("Default ") + column1.getName(); + ui->labelDefault->setText(label); + if (column1.getPropertyType() == QString::fromStdString("Quantity")) { + ui->editDefault->setMinimum(std::numeric_limits::min()); + ui->editDefault->setMaximum(std::numeric_limits::max()); + ui->editDefault->setUnitText(_property->getColumnUnits(0)); + ui->editDefault->setValue(_value->getDefault().getValue().value()); + + connect(ui->editDefault, + qOverload(&Gui::QuantitySpinBox::valueChanged), + this, + &Array3D::defaultValueChanged); + } + } + catch (const Materials::PropertyNotFound&) { + return; + } +} + +void Array3D::defaultValueChanged(const Base::Quantity& value) +{ + _value->setDefault(QVariant::fromValue(value)); +} + +void Array3D::setDepthColumnDelegate(QTableView* table) +{ + auto& column = _property->getColumn(0); + table->setItemDelegateForColumn(0, + new ArrayDelegate(column.getType(), column.getUnits(), this)); +} + +void Array3D::setDepthColumnWidth(QTableView* table) +{ + table->setColumnWidth(0, 100); +} + +void Array3D::setupDepthArray() +{ + if (_property == nullptr) { + return; + } + + auto table = ui->table3D; + auto model = new Array3DDepthModel(_property, _value, this); + table->setModel(model); + table->setEditTriggers(QAbstractItemView::AllEditTriggers); + + setDepthColumnWidth(table); + setDepthColumnDelegate(table); +} + +void Array3D::setColumnWidths(QTableView* table) +{ + int length = _property->columns(); + for (int i = 0; i < length; i++) { + table->setColumnWidth(i, 100); + } +} + +void Array3D::setColumnDelegates(QTableView* table) +{ + int length = _property->columns(); + for (int i = 0; i < length; i++) { + auto& column = _property->getColumn(i); + table->setItemDelegateForColumn( + i, + new ArrayDelegate(column.getType(), column.getUnits(), this)); + } +} + +void Array3D::setupArray() +{ + if (_property == nullptr) { + return; + } + + auto table = ui->table2D; + auto model = new Array3DModel(_property, _value, this); + table->setModel(model); + table->setEditTriggers(QAbstractItemView::AllEditTriggers); + + setColumnWidths(table); + setColumnDelegates(table); +} + +void Array3D::onOk(bool checked) +{ + Q_UNUSED(checked) + + QDialog::accept(); +} + +void Array3D::onCancel(bool checked) +{ + Q_UNUSED(checked) + + QDialog::reject(); +} + +#include "moc_Array3D.cpp" diff --git a/src/Mod/Material/Gui/Array3D.h b/src/Mod/Material/Gui/Array3D.h new file mode 100644 index 0000000000..63cdb4cf46 --- /dev/null +++ b/src/Mod/Material/Gui/Array3D.h @@ -0,0 +1,67 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_ARRAY3D_H +#define MATGUI_ARRAY3D_H + +#include +#include +#include +#include + +namespace MatGui +{ + +class Ui_Array3D; + +class Array3D: public QDialog +{ + Q_OBJECT + +public: + explicit Array3D(const QString& propertyName, + Materials::Material* material, + QWidget* parent = nullptr); + ~Array3D() override = default; + + void defaultValueChanged(const Base::Quantity& value); + bool onSplitter(QEvent* e); + + void onOk(bool checked); + void onCancel(bool checked); + +private: + std::unique_ptr ui; + const Materials::MaterialProperty* _property; + std::shared_ptr _value; + + void setupDefault(); + void setDepthColumnWidth(QTableView* table); + void setDepthColumnDelegate(QTableView* table); + void setupDepthArray(); + void setColumnWidths(QTableView* table); + void setColumnDelegates(QTableView* table); + void setupArray(); +}; + +} // namespace MatGui + +#endif // MATGUI_ARRAY3D_H diff --git a/src/Mod/Material/Gui/Array3D.ui b/src/Mod/Material/Gui/Array3D.ui new file mode 100644 index 0000000000..7d2d6dd669 --- /dev/null +++ b/src/Mod/Material/Gui/Array3D.ui @@ -0,0 +1,104 @@ + + + MatGui::Array3D + + + + 0 + 0 + 915 + 709 + + + + 3D Array + + + + + + + + + 0 + 0 + + + + Default Value + + + + + + + + + + + + + + + + Qt::Horizontal + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + Gui::QuantitySpinBox + QWidget +
Gui/QuantitySpinBox.h
+ + + + + + standardButtons + accepted() + MatGui::Array3D + accept() + + + 248 + 254 + + + 157 + 274 + + + + + standardButtons + rejected() + MatGui::Array3D + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/Mod/Material/Gui/ArrayDelegate.cpp b/src/Mod/Material/Gui/ArrayDelegate.cpp new file mode 100644 index 0000000000..95c030a159 --- /dev/null +++ b/src/Mod/Material/Gui/ArrayDelegate.cpp @@ -0,0 +1,183 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +// #include + +#include +#include + +#include "Array2D.h" +#include "Array3D.h" +#include "ArrayDelegate.h" +#include "MaterialSave.h" + + +using namespace MatGui; + +ArrayDelegate::ArrayDelegate(Materials::MaterialValue::ValueType type, + QString units, + QObject* parent) + : QStyledItemDelegate(parent) + , _type(type) + , _units(units) +{} + +void ArrayDelegate::paint(QPainter* painter, + const QStyleOptionViewItem& option, + const QModelIndex& index) const +{ + + if (_type == Materials::MaterialValue::Quantity) { + const AbstractArrayModel* tableModel = + reinterpret_cast(index.model()); + painter->save(); + + if (tableModel->newRow(index)) { + painter->drawText(option.rect, 0, QString()); + } + else { + QVariant item = tableModel->data(index); + Base::Quantity quantity = item.value(); + QString text = quantity.getUserString(); + painter->drawText(option.rect, 0, text); + } + + painter->restore(); + } + else { + QStyledItemDelegate::paint(painter, option, index); + } +} + +void ArrayDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const +{ + Base::Console().Log("ArrayDelegate::setEditorData()\n"); + + if (_type == Materials::MaterialValue::Quantity) { + QAbstractItemModel* tableModel = const_cast(index.model()); + auto item = tableModel->data(index); + + // Gui::InputField* input = static_cast(editor); + // input->setText(item.toString()); + Gui::QuantitySpinBox* input = static_cast(editor); + input->setValue(item.value()); + } + else { + QStyledItemDelegate::setEditorData(editor, index); + } +} + +QWidget* ArrayDelegate::createEditor(QWidget* parent, + const QStyleOptionViewItem&, + const QModelIndex& index) const +{ + Base::Console().Log("ArrayDelegate::createEditor()\n"); + + const QAbstractTableModel* tableModel = static_cast(index.model()); + auto item = tableModel->data(index); + + QWidget* editor = createWidget(parent, item); + + return editor; +} + +QWidget* ArrayDelegate::createWidget(QWidget* parent, const QVariant& item) const +{ + QWidget* widget = nullptr; + + if (_type == Materials::MaterialValue::String || _type == Materials::MaterialValue::URL + || _type == Materials::MaterialValue::List) { + widget = new Gui::PrefLineEdit(parent); + } + else if (_type == Materials::MaterialValue::Integer) { + Gui::UIntSpinBox* spinner = new Gui::UIntSpinBox(parent); + spinner->setMinimum(0); + spinner->setMaximum(UINT_MAX); + spinner->setValue(item.toUInt()); + widget = spinner; + } + else if (_type == Materials::MaterialValue::Float) { + Gui::DoubleSpinBox* spinner = new Gui::DoubleSpinBox(parent); + + // the magnetic permeability is the parameter for which many decimals matter + // the most however, even for this, 6 digits are sufficient + spinner->setDecimals(6); + + // for almost all Float parameters of materials a step of 1 would be too large + spinner->setSingleStep(0.1); + + spinner->setMinimum(std::numeric_limits::min()); + spinner->setMaximum(std::numeric_limits::max()); + spinner->setValue(item.toDouble()); + widget = spinner; + } + else if (_type == Materials::MaterialValue::Boolean) { + Gui::PrefComboBox* combo = new Gui::PrefComboBox(parent); + combo->insertItem(0, QString::fromStdString("")); + combo->insertItem(1, QString::fromStdString("False")); + combo->insertItem(2, QString::fromStdString("True")); + combo->setCurrentText(item.toString()); + widget = combo; + } + else if (_type == Materials::MaterialValue::Quantity) { + Gui::QuantitySpinBox* input = new Gui::QuantitySpinBox(); + input->setMinimum(std::numeric_limits::min()); + input->setMaximum(std::numeric_limits::max()); + input->setUnitText(_units); + input->setValue(item.value()); + + widget = input; + } + else { + // Default editor + widget = new QLineEdit(parent); + } + + widget->setParent(parent); + + return widget; +} + +#include "moc_ArrayDelegate.cpp" diff --git a/src/Mod/Material/Gui/ArrayDelegate.h b/src/Mod/Material/Gui/ArrayDelegate.h new file mode 100644 index 0000000000..74e9c76c36 --- /dev/null +++ b/src/Mod/Material/Gui/ArrayDelegate.h @@ -0,0 +1,74 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_ArrayDelegate_H +#define MATGUI_ArrayDelegate_H + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace fs = boost::filesystem; + +namespace MatGui +{ + +class ArrayDelegate: public QStyledItemDelegate +{ + Q_OBJECT +public: + explicit ArrayDelegate( + Materials::MaterialValue::ValueType type = Materials::MaterialValue::None, + QString units = QString(), + QObject* parent = nullptr); + virtual ~ArrayDelegate() = default; + + void paint(QPainter* painter, + const QStyleOptionViewItem& option, + const QModelIndex& index) const override; + QWidget* createEditor(QWidget* parent, + const QStyleOptionViewItem&, + const QModelIndex& index) const override; + void setEditorData(QWidget* editor, const QModelIndex& index) const override; + + // Q_SIGNALS: + /** Emits this signal when a property has changed */ + // void propertyChange(const QString &property, const QString value); + +private: + Materials::MaterialValue::ValueType _type; + QString _units; + + QWidget* createWidget(QWidget* parent, const QVariant& item) const; +}; + +} // namespace MatGui + +#endif // MATGUI_ArrayDelegate_H diff --git a/src/Mod/Material/Gui/ArrayModel.cpp b/src/Mod/Material/Gui/ArrayModel.cpp new file mode 100644 index 0000000000..24c0ba8b42 --- /dev/null +++ b/src/Mod/Material/Gui/ArrayModel.cpp @@ -0,0 +1,465 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#endif + +#include + +#include +#include + +#include +#include + +#include "ArrayModel.h" + + +using namespace MatGui; + +/* TRANSLATOR MatGui::ArrayModel */ + +AbstractArrayModel::AbstractArrayModel(QObject* parent) + : QAbstractTableModel(parent) +{} + +//=== + + +Array2DModel::Array2DModel(const Materials::MaterialProperty* property, + std::shared_ptr value, + QObject* parent) + : AbstractArrayModel(parent) + , _property(property) + , _value(value) +{} + +int Array2DModel::rowCount(const QModelIndex& parent) const +{ + if (parent.isValid()) { + return 0; // No children + } + + return _value->rows() + 1; // Will always have 1 empty row +} + +bool Array2DModel::newRow(const QModelIndex& index) const +{ + return (index.row() == _value->rows()); +} + +int Array2DModel::columnCount(const QModelIndex& parent) const +{ + Q_UNUSED(parent); + + return _property->columns(); +} + +QVariant Array2DModel::data(const QModelIndex& index, int role) const +{ + if (role == Qt::DisplayRole) { + try { + return _value->getValue(index.row(), index.column()); + } + catch (const Materials::InvalidIndex&) { + } + + try { + auto column = _property->getColumnType(index.column()); + if (column == Materials::MaterialValue::Quantity) { + Base::Quantity q = Base::Quantity(0, _property->getColumnUnits(index.column())); + return QVariant::fromValue(q); + } + } + catch (const Materials::InvalidColumn&) { + } + + return QString(); + } + + return QVariant(); +} + +QVariant Array2DModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (role == Qt::DisplayRole) { + if (orientation == Qt::Horizontal) { + const Materials::MaterialProperty& column = _property->getColumn(section); + return QVariant(column.getName()); + } + else if (orientation == Qt::Vertical) { + // Vertical header + if (section == (rowCount() - 1)) { + return QVariant(QString::fromStdString("*")); + } + return QVariant(section + 1); + } + } + + return QAbstractTableModel::headerData(section, orientation, role); +} + +bool Array2DModel::setData(const QModelIndex& index, const QVariant& value, int role) +{ + Q_UNUSED(role); + + if (index.row() == _value->rows()) { + insertRows(index.row(), 1); + } + _value->setValue(index.row(), index.column(), value); + + Q_EMIT dataChanged(index, index); + return true; +} + +Qt::ItemFlags Array2DModel::flags(const QModelIndex& index) const +{ + return (QAbstractTableModel::flags(index) | Qt::ItemIsEditable); +} + + +// Resizing functions +bool Array2DModel::insertRows(int row, int count, const QModelIndex& parent) +{ + beginInsertRows(parent, row, row + count - 1); + + int columns = columnCount(); + for (int i = 0; i < count; i++) { + std::vector* rowPtr = new std::vector(); + for (int j = 0; j < columns; j++) { + rowPtr->push_back(_property->getColumnNull(j)); + } + + _value->insertRow(row, rowPtr); + } + + endInsertRows(); + + return false; +} + +bool Array2DModel::removeRows(int row, int count, const QModelIndex& parent) +{ + beginRemoveRows(parent, row, row + count - 1); + + endRemoveRows(); + + return false; +} + +bool Array2DModel::insertColumns(int column, int count, const QModelIndex& parent) +{ + Q_UNUSED(column); + Q_UNUSED(count); + Q_UNUSED(parent); + + return false; +} + +bool Array2DModel::removeColumns(int column, int count, const QModelIndex& parent) +{ + Q_UNUSED(column); + Q_UNUSED(count); + Q_UNUSED(parent); + + return false; +} + +//=== + +Array3DDepthModel::Array3DDepthModel(const Materials::MaterialProperty* property, + std::shared_ptr value, + QObject* parent) + : AbstractArrayModel(parent) + , _property(property) + , _value(value) +{} + +int Array3DDepthModel::rowCount(const QModelIndex& parent) const +{ + if (parent.isValid()) { + return 0; // No children + } + + return _value->depth() + 1; // Will always have 1 empty row +} + +bool Array3DDepthModel::newRow(const QModelIndex& index) const +{ + return (index.row() == _value->depth()); +} + +QVariant Array3DDepthModel::data(const QModelIndex& index, int role) const +{ + if (role == Qt::DisplayRole) { + try { + return _value->getValue(index.row(), index.column()); + } + catch (const Materials::InvalidIndex&) { + } + + try { + auto column = _property->getColumnType(index.column()); + if (column == Materials::MaterialValue::Quantity) { + Base::Quantity q = Base::Quantity(0, _property->getColumnUnits(index.column())); + return QVariant::fromValue(q); + } + } + catch (const Materials::InvalidColumn&) { + } + + return QString(); + } + + return QVariant(); +} + +QVariant Array3DDepthModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (role == Qt::DisplayRole) { + if (orientation == Qt::Horizontal) { + const Materials::MaterialProperty& column = _property->getColumn(section); + return QVariant(column.getName()); + } + else if (orientation == Qt::Vertical) { + // Vertical header + if (section == (rowCount() - 1)) { + return QVariant(QString::fromStdString("*")); + } + return QVariant(section + 1); + } + } + + return QAbstractTableModel::headerData(section, orientation, role); +} + +bool Array3DDepthModel::setData(const QModelIndex& index, const QVariant& value, int role) +{ + Q_UNUSED(role); + + if (index.row() == _value->depth()) { + insertRows(index.row(), 1); + } + _value->setValue(index.row(), index.column(), value); + + Q_EMIT dataChanged(index, index); + return true; +} + +Qt::ItemFlags Array3DDepthModel::flags(const QModelIndex& index) const +{ + return (QAbstractTableModel::flags(index) | Qt::ItemIsEditable); +} + + +// Resizing functions +bool Array3DDepthModel::insertRows(int row, int count, const QModelIndex& parent) +{ + beginInsertRows(parent, row, row + count - 1); + + int columns = columnCount(); + for (int i = 0; i < count; i++) { + std::vector* rowPtr = new std::vector(); + for (int j = 0; j < columns; j++) { + rowPtr->push_back(_property->getColumnNull(j)); + } + + // _value->insertRow(row, rowPtr); + } + + endInsertRows(); + + return false; +} + +bool Array3DDepthModel::removeRows(int row, int count, const QModelIndex& parent) +{ + beginRemoveRows(parent, row, row + count - 1); + + endRemoveRows(); + + return false; +} + +bool Array3DDepthModel::insertColumns(int column, int count, const QModelIndex& parent) +{ + Q_UNUSED(column); + Q_UNUSED(count); + Q_UNUSED(parent); + + return false; +} + +bool Array3DDepthModel::removeColumns(int column, int count, const QModelIndex& parent) +{ + Q_UNUSED(column); + Q_UNUSED(count); + Q_UNUSED(parent); + + return false; +} + +//=== + +Array3DModel::Array3DModel(const Materials::MaterialProperty* property, + std::shared_ptr value, + QObject* parent) + : AbstractArrayModel(parent) + , _property(property) + , _value(value) +{} + +int Array3DModel::rowCount(const QModelIndex& parent) const +{ + if (parent.isValid()) { + return 0; // No children + } + + return _value->depth() + 1; // Will always have 1 empty row +} + +int Array3DModel::columnCount(const QModelIndex& parent) const +{ + Q_UNUSED(parent); + + return _property->columns() - 1; +} + +bool Array3DModel::newRow(const QModelIndex& index) const +{ + return (index.row() == _value->depth()); +} + +QVariant Array3DModel::data(const QModelIndex& index, int role) const +{ + if (role == Qt::DisplayRole) { + Base::Console().Error("Row %d, column %d\n", index.row(), index.column()); + try { + return _value->getValue(index.row(), index.column() + 1); + } + catch (const Materials::InvalidIndex&) { + } + catch (const std::exception& e) { + Base::Console().Error("The error message is: %s\n", e.what()); + } + + try { + auto column = _property->getColumnType(index.column() + 1); + if (column == Materials::MaterialValue::Quantity) { + Base::Quantity q = Base::Quantity(0, _property->getColumnUnits(index.column() - 1)); + return QVariant::fromValue(q); + } + } + catch (const Materials::InvalidColumn&) { + } + + return QString(); + } + + return QVariant(); +} + +QVariant Array3DModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (role == Qt::DisplayRole) { + if (orientation == Qt::Horizontal) { + const Materials::MaterialProperty& column = _property->getColumn(section + 1); + return QVariant(column.getName()); + } + else if (orientation == Qt::Vertical) { + // Vertical header + if (section == (rowCount() - 1)) { + return QVariant(QString::fromStdString("*")); + } + return QVariant(section + 1); + } + } + + return QAbstractTableModel::headerData(section, orientation, role); +} + +bool Array3DModel::setData(const QModelIndex& index, const QVariant& value, int role) +{ + Q_UNUSED(role); + + if (index.row() == _value->depth()) { + insertRows(index.row(), 1); + } + _value->setValue(index.row(), index.column(), value); + + Q_EMIT dataChanged(index, index); + return true; +} + +Qt::ItemFlags Array3DModel::flags(const QModelIndex& index) const +{ + return (QAbstractTableModel::flags(index) | Qt::ItemIsEditable); +} + + +// Resizing functions +bool Array3DModel::insertRows(int row, int count, const QModelIndex& parent) +{ + beginInsertRows(parent, row, row + count - 1); + + int columns = columnCount(); + for (int i = 0; i < count; i++) { + std::vector* rowPtr = new std::vector(); + for (int j = 0; j < columns; j++) { + rowPtr->push_back(_property->getColumnNull(j)); + } + + // _value->insertRow(row, rowPtr); + } + + endInsertRows(); + + return false; +} + +bool Array3DModel::removeRows(int row, int count, const QModelIndex& parent) +{ + beginRemoveRows(parent, row, row + count - 1); + + endRemoveRows(); + + return false; +} + +bool Array3DModel::insertColumns(int column, int count, const QModelIndex& parent) +{ + Q_UNUSED(column); + Q_UNUSED(count); + Q_UNUSED(parent); + + return false; +} + +bool Array3DModel::removeColumns(int column, int count, const QModelIndex& parent) +{ + Q_UNUSED(column); + Q_UNUSED(count); + Q_UNUSED(parent); + + return false; +} diff --git a/src/Mod/Material/Gui/ArrayModel.h b/src/Mod/Material/Gui/ArrayModel.h new file mode 100644 index 0000000000..7bb4f6816d --- /dev/null +++ b/src/Mod/Material/Gui/ArrayModel.h @@ -0,0 +1,138 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_ARRAYMODEL_H +#define MATGUI_ARRAYMODEL_H + +#include +#include +#include +#include + +#include +#include + +namespace MatGui +{ + +class AbstractArrayModel: public QAbstractTableModel +{ +public: + explicit AbstractArrayModel(QObject* parent = nullptr); + ~AbstractArrayModel() override = default; + + virtual bool newRow(const QModelIndex& index) const = 0; +}; + +class Array2DModel: public AbstractArrayModel +{ +public: + explicit Array2DModel(const Materials::MaterialProperty* property = nullptr, + std::shared_ptr value = nullptr, + QObject* parent = nullptr); + ~Array2DModel() override = default; + + // Overridden virtual functions + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + bool newRow(const QModelIndex& index) const override; + int columnCount(const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + QVariant + headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex& index) const override; + + // Resizing functions + bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; + bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override; + bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override; + +private: + const Materials::MaterialProperty* _property; + std::shared_ptr _value; +}; + +class Array3DDepthModel: public AbstractArrayModel +{ +public: + explicit Array3DDepthModel(const Materials::MaterialProperty* property = nullptr, + std::shared_ptr value = nullptr, + QObject* parent = nullptr); + ~Array3DDepthModel() override = default; + + // Overridden virtual functions + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + bool newRow(const QModelIndex& index) const override; + int columnCount(const QModelIndex& parent = QModelIndex()) const override + { + Q_UNUSED(parent) + return 1; + } + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + QVariant + headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex& index) const override; + + // Resizing functions + bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; + bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override; + bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override; + +private: + const Materials::MaterialProperty* _property; + std::shared_ptr _value; +}; + +class Array3DModel: public AbstractArrayModel +{ +public: + explicit Array3DModel(const Materials::MaterialProperty* property = nullptr, + std::shared_ptr value = nullptr, + QObject* parent = nullptr); + ~Array3DModel() override = default; + + // Overridden virtual functions + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + bool newRow(const QModelIndex& index) const override; + int columnCount(const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + QVariant + headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex& index) const override; + + // Resizing functions + bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; + bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override; + bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override; + +private: + const Materials::MaterialProperty* _property; + std::shared_ptr _value; +}; + +} // namespace MatGui + +#endif // MATGUI_ARRAYMODEL_H diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt new file mode 100644 index 0000000000..78b6fa0638 --- /dev/null +++ b/src/Mod/Material/Gui/CMakeLists.txt @@ -0,0 +1,107 @@ +if(MSVC) + add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) +else(MSVC) + add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) +endif(MSVC) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_BINARY_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR} + ${Boost_INCLUDE_DIRS} + ${COIN3D_INCLUDE_DIRS} + ${OCC_INCLUDE_DIR} + ${PYTHON_INCLUDE_DIRS} + ${XercesC_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} +) +link_directories(${OCC_LIBRARY_DIR}) + +set(MatGui_LIBS + Material + FreeCADGui +) + +include_directories( + ${QtConcurrent_INCLUDE_DIRS} +) +list(APPEND MatGui_LIBS + ${QtConcurrent_LIBRARIES} +) + +set(Material_TR_QRC ${CMAKE_CURRENT_BINARY_DIR}/Resources/Material_translation.qrc) +qt_find_and_add_translation(QM_SRCS "Resources/translations/*_*.ts" + ${CMAKE_CURRENT_BINARY_DIR}/Resources/translations) +qt_create_resource_file(${Material_TR_QRC} ${QM_SRCS}) +qt_add_resources(MatGui_QRC_SRCS Resources/Material.qrc ${Material_TR_QRC}) + +set(MatGui_UIC_SRCS + Array2D.ui + Array3D.ui + DlgSettingsMaterial.ui + MaterialSave.ui + MaterialsEditor.ui + ModelSelect.ui +) + +SET(MatGui_SRCS + ${MatGui_QRC_SRCS} + ${MatGui_UIC_HDRS} + AppMatGui.cpp + Array2D.cpp + Array2D.h + Array2D.ui + Array3D.cpp + Array3D.h + Array3D.ui + ArrayDelegate.cpp + ArrayDelegate.h + ArrayModel.cpp + ArrayModel.h + Command.cpp + DlgSettingsMaterial.cpp + DlgSettingsMaterial.h + DlgSettingsMaterial.ui + MaterialDelegate.cpp + MaterialDelegate.h + MaterialSave.cpp + MaterialSave.h + MaterialSave.ui + MaterialsEditor.cpp + MaterialsEditor.h + MaterialsEditor.ui + ModelSelect.cpp + ModelSelect.h + ModelSelect.ui + PreCompiled.cpp + PreCompiled.h + Workbench.cpp + Workbench.h +) + +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${MatGui_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(MatGui PreCompiled.h PreCompiled.cpp PCH_SRCS) +endif(FREECAD_USE_PCH) + +SET(MatGuiIcon_SVG + Resources/icons/Materials_Edit.svg + Resources/icons/MaterialWorkbench.svg + Resources/icons/preferences-material.svg + Resources/icons/preview-rendered.svg + Resources/icons/preview-vector.svg + Resources/icons/table.svg +) + +add_library(MatGui SHARED ${MatGui_SRCS} ${MatGuiIcon_SVG}) +target_link_libraries(MatGui ${MatGui_LIBS}) + +SET_BIN_DIR(MatGui MatGui /Mod/Material) +SET_PYTHON_PREFIX_SUFFIX(MatGui) + +fc_copy_sources(MatGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material" ${MatGuiIcon_SVG}) + +INSTALL(TARGETS MatGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) +INSTALL(FILES ${MatGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Material/Resources/icons") diff --git a/src/Mod/Material/Gui/Command.cpp b/src/Mod/Material/Gui/Command.cpp new file mode 100644 index 0000000000..33e13c24db --- /dev/null +++ b/src/Mod/Material/Gui/Command.cpp @@ -0,0 +1,81 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#endif + +#include +#include + +#include "MaterialSave.h" +#include "MaterialsEditor.h" +#include "ModelSelect.h" + + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +//=========================================================================== +// Material_Edit +//=========================================================================== +DEF_STD_CMD_A(CmdMaterialsEdit) + +CmdMaterialsEdit::CmdMaterialsEdit() + : Command("Materials_Edit") +{ + sAppModule = "Material"; + sGroup = QT_TR_NOOP("Material"); + sMenuText = QT_TR_NOOP("Edit..."); + sToolTipText = QT_TR_NOOP("Edit material properties"); + sWhatsThis = "Materials_Edit"; + sStatusTip = sToolTipText; + sPixmap = "Materials_Edit"; +} + +void CmdMaterialsEdit::activated(int iMsg) +{ + Q_UNUSED(iMsg); + + Base::Console().Log("Materials_Edit\n"); + + static QPointer dlg = nullptr; + if (!dlg) { + dlg = new MatGui::MaterialsEditor(Gui::getMainWindow()); + } + dlg->setAttribute(Qt::WA_DeleteOnClose); + dlg->show(); +} + +bool CmdMaterialsEdit::isActive() +{ + // return (hasActiveDocument() && !Gui::Control().activeDialog()); + return true; +} + +//--------------------------------------------------------------- + +void CreateMaterialCommands() +{ + Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager(); + + rcCmdMgr.addCommand(new CmdMaterialsEdit()); +} diff --git a/src/Mod/Material/Gui/DlgSettingsMaterial.cpp b/src/Mod/Material/Gui/DlgSettingsMaterial.cpp new file mode 100644 index 0000000000..5c0436ae68 --- /dev/null +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.cpp @@ -0,0 +1,78 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" + +#include "DlgSettingsMaterial.h" +#include "ui_DlgSettingsMaterial.h" + + +using namespace MatGui; + +DlgSettingsMaterial::DlgSettingsMaterial(QWidget* parent) + : PreferencePage(parent) + , ui(new Ui_DlgSettingsMaterial) +{ + ui->setupUi(this); +} + +void DlgSettingsMaterial::saveSettings() +{ + ui->cb_use_built_in_materials->onSave(); + ui->cb_use_mat_from_workbenches->onSave(); + ui->cb_use_mat_from_config_dir->onSave(); + ui->cb_use_mat_from_custom_dir->onSave(); + ui->fc_custom_mat_dir->onSave(); + ui->cb_delete_duplicates->onSave(); + ui->cb_sort_by_resources->onSave(); + + // Temporary for testing + ui->cb_legacy_editor->onSave(); +} + +void DlgSettingsMaterial::loadSettings() +{ + ui->cb_use_built_in_materials->onRestore(); + ui->cb_use_mat_from_workbenches->onRestore(); + ui->cb_use_mat_from_config_dir->onRestore(); + ui->cb_use_mat_from_custom_dir->onRestore(); + ui->fc_custom_mat_dir->onRestore(); + ui->cb_delete_duplicates->onRestore(); + ui->cb_sort_by_resources->onRestore(); + + // Temporary for testing + ui->cb_legacy_editor->onRestore(); +} + +/** + * Sets the strings of the subwidgets using the current language. + */ +void DlgSettingsMaterial::changeEvent(QEvent* e) +{ + if (e->type() == QEvent::LanguageChange) { + ui->retranslateUi(this); + } + else { + QWidget::changeEvent(e); + } +} + +#include "moc_DlgSettingsMaterial.cpp" diff --git a/src/Mod/Material/Gui/DlgSettingsMaterial.h b/src/Mod/Material/Gui/DlgSettingsMaterial.h new file mode 100644 index 0000000000..4f62921794 --- /dev/null +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.h @@ -0,0 +1,52 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_DLGSETTINGSMATERIAL_H +#define MATGUI_DLGSETTINGSMATERIAL_H + +#include +#include + + +namespace MatGui +{ +class Ui_DlgSettingsMaterial; + +class DlgSettingsMaterial: public Gui::Dialog::PreferencePage +{ + Q_OBJECT + +public: + explicit DlgSettingsMaterial(QWidget* parent = nullptr); + ~DlgSettingsMaterial() override = default; + +protected: + void saveSettings() override; + void loadSettings() override; + void changeEvent(QEvent* e) override; + +private: + std::unique_ptr ui; +}; + +} // namespace MatGui + +#endif // MATGUI_DLGSETTINGSMATERIAL_H diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMaterial.ui b/src/Mod/Material/Gui/DlgSettingsMaterial.ui similarity index 82% rename from src/Mod/Fem/Gui/DlgSettingsFemMaterial.ui rename to src/Mod/Material/Gui/DlgSettingsMaterial.ui index f763a07e42..fa3afcd8d8 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemMaterial.ui +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.ui @@ -1,17 +1,17 @@ - FemGui::DlgSettingsFemMaterialImp - + MatGui::DlgSettingsMaterial + 0 0 434 - 229 + 341 - Material + General @@ -44,6 +44,25 @@ + + + + Use materials added by external workbenches. + + + Use materials from external workbenches + + + true + + + UseMaterialsFromWorkbenches + + + Mod/Material/Resources + + + @@ -124,9 +143,6 @@ will be listed as available. 0 - - Gui::FileChooser::Directory - CustomMaterialsDir @@ -190,6 +206,31 @@ If unchecked, they will be sorted by their name. + + + + Testing + + + + + + Use legacy editor + + + true + + + LegacyEditor + + + Mod/Material/Cards + + + + + + @@ -226,9 +267,7 @@ If unchecked, they will be sorted by their name.
Gui/PrefWidgets.h
- - - + cb_use_mat_from_custom_dir diff --git a/src/Mod/Material/Gui/MaterialDelegate.cpp b/src/Mod/Material/Gui/MaterialDelegate.cpp new file mode 100644 index 0000000000..92f96ab7dd --- /dev/null +++ b/src/Mod/Material/Gui/MaterialDelegate.cpp @@ -0,0 +1,465 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "Array2D.h" +#include "Array3D.h" +#include "MaterialDelegate.h" +#include "MaterialSave.h" + + +using namespace MatGui; + +MaterialDelegate::MaterialDelegate(QObject* parent) + : QStyledItemDelegate(parent) +{} + +bool MaterialDelegate::editorEvent(QEvent* event, + QAbstractItemModel* model, + const QStyleOptionViewItem& option, + const QModelIndex& index) +{ + if (index.column() == 1) { + if (event->type() == QEvent::MouseButtonDblClick) { + const QStandardItemModel* treeModel = + static_cast(index.model()); + + // Check we're not the material model root. This is also used to access the entry + // columns + auto item = treeModel->itemFromIndex(index); + auto group = item->parent(); + if (!group) { + return QStyledItemDelegate::editorEvent(event, model, option, index); + } + + int row = index.row(); + + QString propertyName = group->child(row, 0)->text(); + QString propertyType = QString::fromStdString("String"); + if (group->child(row, 2)) { + propertyType = group->child(row, 2)->text(); + } + + std::string type = propertyType.toStdString(); + if (type == "Color") { + Base::Console().Log("Edit color\n"); + showColorModal(item); + // Mark as handled + return true; + } + else if (type == "2DArray") { + Base::Console().Log("Edit 2DArray\n"); + showArray2DModal(propertyName, item); + // Mark as handled + return true; + } + else if (type == "3DArray") { + Base::Console().Log("Edit 3DArray\n"); + showArray3DModal(propertyName, item); + // Mark as handled + return true; + } + } + } + return QStyledItemDelegate::editorEvent(event, model, option, index); +} + +void MaterialDelegate::showColorModal(QStandardItem* item) +{ + QColor currentColor; // = d->col; + currentColor.setRgba(parseColor(item->text())); + QColorDialog* dlg = new QColorDialog(currentColor); + + dlg->setAttribute(Qt::WA_DeleteOnClose); + if (Gui::DialogOptions::dontUseNativeColorDialog()) { + dlg->setOptions(QColorDialog::DontUseNativeDialog); + } + dlg->setOption(QColorDialog::ColorDialogOption::ShowAlphaChannel, false); + + dlg->setCurrentColor(currentColor); + dlg->adjustSize(); + + connect(dlg, &QColorDialog::finished, this, [&](int result) { + if (result == QDialog::Accepted) { + QColor color = dlg->selectedColor(); + if (color.isValid()) { + QString colorText = QString(QString::fromStdString("(%1,%2,%3,%4)")) + .arg(color.red() / 255.0) + .arg(color.green() / 255.0) + .arg(color.blue() / 255.0) + .arg(color.alpha() / 255.0); + item->setText(colorText); + } + } + }); + + dlg->exec(); +} + +void MaterialDelegate::showArray2DModal(const QString& propertyName, QStandardItem* item) +{ + Materials::Material* material = item->data().value(); + Array2D* dlg = new Array2D(propertyName, material); + + dlg->setAttribute(Qt::WA_DeleteOnClose); + + dlg->adjustSize(); + + connect(dlg, &QDialog::finished, this, [&](int result) { + if (result == QDialog::Accepted) { + Base::Console().Log("Accepted\n"); + } + }); + + dlg->exec(); +} + +void MaterialDelegate::showArray3DModal(const QString& propertyName, QStandardItem* item) +{ + Materials::Material* material = item->data().value(); + Array3D* dlg = new Array3D(propertyName, material); + + dlg->setAttribute(Qt::WA_DeleteOnClose); + + dlg->adjustSize(); + + connect(dlg, &QDialog::finished, this, [&](int result) { + if (result == QDialog::Accepted) { + Base::Console().Log("Accepted\n"); + } + }); + + dlg->exec(); +} + +void MaterialDelegate::paint(QPainter* painter, + const QStyleOptionViewItem& option, + const QModelIndex& index) const +{ + // Base::Console().Log("MaterialsEditor::paint()\n"); + if (index.column() != 1) { + QStyledItemDelegate::paint(painter, option, index); + return; + } + + const QStandardItemModel* treeModel = static_cast(index.model()); + + // Check we're not the material model root. This is also used to access the entry columns + auto item = treeModel->itemFromIndex(index); + auto group = item->parent(); + if (!group) { + QStyledItemDelegate::paint(painter, option, index); + return; + } + + int row = index.row(); + + QString propertyName = group->child(row, 0)->text(); + QString propertyType = QString::fromStdString("String"); + if (group->child(row, 2)) { + propertyType = group->child(row, 2)->text(); + } + QString propertyValue = QString::fromStdString(""); + if (group->child(row, 1)) { + propertyValue = group->child(row, 1)->text(); + } + + std::string type = propertyType.toStdString(); + if (type == "Color") { + painter->save(); + + QColor color; + color.setRgba(parseColor(propertyValue)); + int left = option.rect.left() + 5; + int width = option.rect.width() - 10; + if (option.rect.width() > 75) { + left += (option.rect.width() - 75) / 2; + width = 65; + } + painter->fillRect(left, + option.rect.top() + 5, + width, + option.rect.height() - 10, + QBrush(color)); + + painter->restore(); + return; + } + else if (type == "2DArray" || type == "3DArray") { + // painter->save(); + + QImage table(QString::fromStdString(":/icons/table.svg")); + QRect target(option.rect); + if (target.width() > target.height()) { + target.setWidth(target.height()); + } + else { + target.setHeight(target.width()); + } + painter->drawImage(target, table, table.rect()); + + // painter->restore(); + return; + } + + QStyledItemDelegate::paint(painter, option, index); +} + +QSize MaterialDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const +{ + if (index.column() != 1) { + return QStyledItemDelegate::sizeHint(option, index); + } + + const QStandardItemModel* treeModel = static_cast(index.model()); + + // Check we're not the material model root. This is also used to access the entry columns + auto item = treeModel->itemFromIndex(index); + auto group = item->parent(); + if (!group) { + return QStyledItemDelegate::sizeHint(option, index); + } + + int row = index.row(); + + QString propertyType = QString::fromStdString("String"); + if (group->child(row, 2)) { + propertyType = group->child(row, 2)->text(); + } + + std::string type = propertyType.toStdString(); + if (type == "Color") { + return QSize(75, 23); // Standard QPushButton size + } + else if (type == "2DArray" || type == "3DArray") { + return QSize(23, 23); + } + + return QStyledItemDelegate::sizeHint(option, index); +} + +void MaterialDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const +{ + Base::Console().Log("MaterialsEditor::setEditorData()\n"); + QVariant propertyType = editor->property("Type"); + const QStandardItemModel* model = static_cast(index.model()); + QStandardItem* item = model->itemFromIndex(index); + auto group = item->parent(); + if (!group) { + return; + } + + int row = index.row(); + QString propertyName = group->child(row, 0)->text(); + + std::string type = propertyType.toString().toStdString(); + if (type == "File") { + Gui::FileChooser* chooser = static_cast(editor); + item->setText(chooser->fileName()); + } + else if (type == "Quantity") { + Gui::InputField* input = static_cast(editor); + item->setText(input->getQuantityString()); + } + else { + QStyledItemDelegate::setEditorData(editor, index); + } + + // Q_EMIT const_cast(this)->propertyChange(propertyName, item->text()); +} + +void MaterialDelegate::setModelData(QWidget* editor, + QAbstractItemModel* model, + const QModelIndex& index) const +{ + QStyledItemDelegate::setModelData(editor, model, index); + + QStandardItem* item = static_cast(model)->itemFromIndex(index); + auto group = item->parent(); + if (!group) { + return; + } + + int row = index.row(); + QString propertyName = group->child(row, 0)->text(); + Q_EMIT const_cast(this)->propertyChange(propertyName, item->text()); +} + +QWidget* MaterialDelegate::createEditor(QWidget* parent, + const QStyleOptionViewItem&, + const QModelIndex& index) const +{ + Base::Console().Log("MaterialsEditor::createEditor()\n"); + if (index.column() != 1) { + return nullptr; + } + + const QStandardItemModel* treeModel = static_cast(index.model()); + + // Check we're not the material model root. This is also used to access the entry columns + auto item = treeModel->itemFromIndex(index); + auto group = item->parent(); + if (!group) { + return nullptr; + } + + int row = index.row(); + + QString propertyName = group->child(row, 0)->text(); + QString propertyType = QString::fromStdString("String"); + if (group->child(row, 2)) { + propertyType = group->child(row, 2)->text(); + } + + QString propertyValue = QString::fromStdString(""); + if (group->child(row, 1)) { + propertyValue = group->child(row, 1)->text(); + } + + QString propertyUnits = QString::fromStdString(""); + if (group->child(row, 1)) { + propertyUnits = group->child(row, 3)->text(); + } + + QWidget* editor = + createWidget(parent, propertyName, propertyType, propertyValue, propertyUnits); + + return editor; +} + +QWidget* MaterialDelegate::createWidget(QWidget* parent, + const QString& propertyName, + const QString& propertyType, + const QString& propertyValue, + const QString& propertyUnits) const +{ + Q_UNUSED(propertyName); + + QWidget* widget = nullptr; + + std::string type = propertyType.toStdString(); + if (type == "String" || type == "URL" || type == "Vector") { + widget = new Gui::PrefLineEdit(parent); + } + else if ((type == "Integer") || (type == "Int")) { + Gui::UIntSpinBox* spinner = new Gui::UIntSpinBox(parent); + spinner->setMinimum(0); + spinner->setMaximum(UINT_MAX); + spinner->setValue(propertyValue.toUInt()); + widget = spinner; + } + else if (type == "Float") { + Gui::DoubleSpinBox* spinner = new Gui::DoubleSpinBox(parent); + + // the magnetic permeability is the parameter for which many decimals matter + // the most however, even for this, 6 digits are sufficient + spinner->setDecimals(6); + + // for almost all Float parameters of materials a step of 1 would be too large + spinner->setSingleStep(0.1); + + spinner->setMinimum(std::numeric_limits::min()); + spinner->setMaximum(std::numeric_limits::max()); + spinner->setValue(propertyValue.toDouble()); + widget = spinner; + } + else if (type == "Boolean") { + Gui::PrefComboBox* combo = new Gui::PrefComboBox(parent); + combo->insertItem(0, QString::fromStdString("")); + combo->insertItem(1, QString::fromStdString("False")); + combo->insertItem(2, QString::fromStdString("True")); + combo->setCurrentText(propertyValue); + widget = combo; + } + else if (type == "Quantity") { + Gui::InputField* input = new Gui::InputField(); + input->setMinimum(std::numeric_limits::min()); + input->setMaximum(std::numeric_limits::max()); + input->setUnitText(propertyUnits); // TODO: Ensure this exists + input->setPrecision(6); + input->setQuantityString(propertyValue); + + widget = input; + } + else if (type == "File") { + Gui::FileChooser* chooser = new Gui::FileChooser(); + if (propertyValue.length() > 0) { + chooser->setFileName(propertyValue); + } + + widget = chooser; + } + else { + // Default editor + widget = new QLineEdit(parent); + } + + widget->setProperty("Type", propertyType); + widget->setParent(parent); + + return widget; +} + +QRgb MaterialDelegate::parseColor(const QString& color) const +{ + QString trimmed = color; + trimmed.replace(QRegularExpression(QString::fromStdString("\\(([^<]*)\\)")), + QString::fromStdString("\\1")); + QStringList parts = trimmed.split(QString::fromStdString(",")); + if (parts.length() < 4) { + return qRgba(0, 0, 0, 1); + } + int red = parts.at(0).toDouble() * 255; + int green = parts.at(1).toDouble() * 255; + int blue = parts.at(2).toDouble() * 255; + int alpha = parts.at(3).toDouble() * 255; + + return qRgba(red, green, blue, alpha); +} + +#include "moc_MaterialDelegate.cpp" diff --git a/src/Mod/Material/Gui/MaterialDelegate.h b/src/Mod/Material/Gui/MaterialDelegate.h new file mode 100644 index 0000000000..1febeb11cf --- /dev/null +++ b/src/Mod/Material/Gui/MaterialDelegate.h @@ -0,0 +1,86 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_MATERIALDELEGATE_H +#define MATGUI_MATERIALDELEGATE_H + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace fs = boost::filesystem; + +namespace MatGui +{ + +class MaterialDelegate: public QStyledItemDelegate +{ + Q_OBJECT +public: + explicit MaterialDelegate(QObject* parent = nullptr); + ~MaterialDelegate() override = default; + + QWidget* createEditor(QWidget* parent, + const QStyleOptionViewItem&, + const QModelIndex& index) const override; + QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override; + void paint(QPainter* painter, + const QStyleOptionViewItem& option, + const QModelIndex& index) const override; + void setEditorData(QWidget* editor, const QModelIndex& index) const override; + void setModelData(QWidget* editor, + QAbstractItemModel* model, + const QModelIndex& index) const override; + +protected: + bool editorEvent(QEvent* event, + QAbstractItemModel* model, + const QStyleOptionViewItem& option, + const QModelIndex& index) override; + +Q_SIGNALS: + /** Emits this signal when a property has changed */ + void propertyChange(const QString& property, const QString value); + +private: + QWidget* createWidget(QWidget* parent, + const QString& propertyName, + const QString& propertyType, + const QString& propertyValue, + const QString& propertyUnits) const; + QRgb parseColor(const QString& color) const; + void showColorModal(QStandardItem* item); + void showArray2DModal(const QString& propertyName, QStandardItem* item); + void showArray3DModal(const QString& propertyName, QStandardItem* item); +}; + +} // namespace MatGui + +#endif // MATGUI_MATERIALDELEGATE_H diff --git a/src/Mod/Material/Gui/MaterialSave.cpp b/src/Mod/Material/Gui/MaterialSave.cpp new file mode 100644 index 0000000000..58d610e4e8 --- /dev/null +++ b/src/Mod/Material/Gui/MaterialSave.cpp @@ -0,0 +1,313 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#endif + +#include + +#include + +#include "MaterialSave.h" +#include "ui_MaterialSave.h" + +using namespace MatGui; + +/* TRANSLATOR MatGui::MaterialsEditor */ + +MaterialSave::MaterialSave(Materials::Material* material, QWidget* parent) + : QDialog(parent) + , ui(new Ui_MaterialSave) + , _material(material) + , _selectedPath(QString::fromStdString("/")) + , _selectedUUID(QString()) +{ + ui->setupUi(this); + + setLibraries(); + createModelTree(); + showSelectedTree(); + + if (_material->getName().length() > 0) { + ui->editFilename->setText(_material->getName() + QString::fromStdString(".FCMat")); + } + else { + ui->editFilename->setText(QString::fromStdString("NewMaterial.FCMat")); + } + _filename = QString(ui->editFilename->text()); // No filename by default + + connect(ui->standardButtons->button(QDialogButtonBox::Ok), + &QPushButton::clicked, + this, + &MaterialSave::onOk); + connect(ui->standardButtons->button(QDialogButtonBox::Cancel), + &QPushButton::clicked, + this, + &MaterialSave::onCancel); + + connect(ui->comboLibrary, + &QComboBox::currentTextChanged, + this, + &MaterialSave::currentTextChanged); + connect(ui->buttonNewFolder, &QPushButton::clicked, this, &MaterialSave::onNewFolder); + connect(ui->editFilename, &QLineEdit::textEdited, this, &MaterialSave::onFilename); + + QItemSelectionModel* selectionModel = ui->treeMaterials->selectionModel(); + connect(selectionModel, + &QItemSelectionModel::selectionChanged, + this, + &MaterialSave::onSelectModel); +} + +/* + * Destroys the object and frees any allocated resources + */ +MaterialSave::~MaterialSave() +{ + // no need to delete child widgets, Qt does it all for us +} + +void MaterialSave::onOk(bool checked) +{ + Q_UNUSED(checked) + + QString name = _filename.remove(QString::fromStdString(".FCMat"), Qt::CaseInsensitive); + Base::Console().Log("name '%s'\n", _filename.toStdString().c_str()); + if (name != _material->getName()) { + _material->setName(name); + _material->setEditStateAlter(); // ? Does a name change count? + } + + auto variant = ui->comboLibrary->currentData(); + auto library = variant.value(); + QFileInfo filepath(_selectedPath + QString::fromStdString("/") + name + + QString::fromStdString(".FCMat")); + Base::Console().Log("saveMaterial(library(%s), material(%s), path(%s))\n", + library.getName().toStdString().c_str(), + _material->getName().toStdString().c_str(), + filepath.filePath().toStdString().c_str()); + _manager.saveMaterial(&library, *_material, filepath.filePath()); + + accept(); +} + +void MaterialSave::onCancel(bool checked) +{ + Q_UNUSED(checked) + + reject(); +} + +void MaterialSave::accept() +{ + QDialog::accept(); +} + +void MaterialSave::reject() +{ + QDialog::reject(); +} + +void MaterialSave::setLibraries() +{ + auto libraries = _manager.getMaterialLibraries(); + for (auto library : *libraries) { + if (!library->isReadOnly()) { + QVariant libraryVariant; + libraryVariant.setValue(*library); + ui->comboLibrary->addItem(library->getName(), libraryVariant); + } + } +} + +void MaterialSave::createModelTree() +{ + auto tree = ui->treeMaterials; + auto model = new QStandardItemModel(); + tree->setModel(model); + tree->setHeaderHidden(true); +} + +void MaterialSave::addExpanded(QTreeView* tree, QStandardItem* parent, QStandardItem* child) +{ + parent->appendRow(child); + tree->setExpanded(child->index(), true); +} + +void MaterialSave::addExpanded(QTreeView* tree, QStandardItemModel* parent, QStandardItem* child) +{ + parent->appendRow(child); + tree->setExpanded(child->index(), true); +} + +void MaterialSave::addMaterials( + QStandardItem& parent, + const std::shared_ptr> modelTree, + const QIcon& folderIcon, + const QIcon& icon) +{ + auto tree = ui->treeMaterials; + for (auto& mat : *modelTree) { + Materials::MaterialTreeNode* nodePtr = mat.second; + if (nodePtr->getType() == Materials::MaterialTreeNode::DataNode) { + const Materials::Material* material = nodePtr->getData(); + QString uuid = material->getUUID(); + Base::Console().Log("Material path '%s'\n", + material->getDirectory().toStdString().c_str()); + + // auto card = new QStandardItem(icon, material->getName()); + auto card = new QStandardItem(icon, mat.first); + // card->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + // | Qt::ItemIsDropEnabled); + card->setData(QVariant(uuid), Qt::UserRole); + + addExpanded(tree, &parent, card); + } + else { + auto node = new QStandardItem(folderIcon, mat.first); + addExpanded(tree, &parent, node); + // node->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + auto treeMap = nodePtr->getFolder(); + addMaterials(*node, treeMap, folderIcon, icon); + } + } +} + +void MaterialSave::showSelectedTree() +{ + auto tree = ui->treeMaterials; + auto model = static_cast(tree->model()); + model->clear(); + + if (ui->comboLibrary->count() > 0) { + auto variant = ui->comboLibrary->currentData(); + auto library = variant.value(); + QIcon icon(library.getIconPath()); + QIcon folderIcon(QString::fromStdString(":/icons/folder.svg")); + _libraryName = library.getName(); + _selectedPath = QString::fromStdString("/") + _libraryName; + + auto lib = new QStandardItem(library.getName()); + lib->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + addExpanded(tree, model, lib); + + auto modelTree = _manager.getMaterialTree(library); + addMaterials(*lib, modelTree, folderIcon, icon); + } + else { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("No writeable library"), + QObject::tr("No writeable library")); + } +} + +QString MaterialSave::getPath(const QStandardItem* item) const +{ + QString path = QString::fromStdString("/"); + if (item) { + path = path + item->text(); + if (item->parent()) { + return getPath(item->parent()) + path; + } + } + + return path; +} + +void MaterialSave::onSelectModel(const QItemSelection& selected, const QItemSelection& deselected) +{ + // Q_UNUSED(selected); + Q_UNUSED(deselected); + + _filename = QString(ui->editFilename->text()); // No filename by default + QStandardItemModel* model = static_cast(ui->treeMaterials->model()); + QModelIndexList indexes = selected.indexes(); + if (indexes.count() == 0) { + Base::Console().Log("Nothing selected\n"); + _selectedPath = QString::fromStdString("/") + _libraryName; + _selectedUUID = QString(); + Base::Console().Log("\tSelected path '%s'\n", _selectedPath.toStdString().c_str()); + return; + } + for (auto it = indexes.begin(); it != indexes.end(); it++) { + QStandardItem* item = model->itemFromIndex(*it); + Base::Console().Log("%s\n", item->text().toStdString().c_str()); + if (item) { + auto _selected = item->data(Qt::UserRole); + if (_selected.isValid()) { + Base::Console().Log("\tuuid %s\n", _selected.toString().toStdString().c_str()); + _selectedPath = getPath(item->parent()); + _selectedUUID = _selected.toString(); + _filename = item->text(); + } + else { + _selectedPath = getPath(item); + _selectedUUID = QString(); + } + } + } + if (_filename.length() > 0) { + ui->editFilename->setText(_filename); + } + Base::Console().Log("\tSelected path '%s', filename = '%s'\n", + _selectedPath.toStdString().c_str(), + _filename.toStdString().c_str()); +} + +void MaterialSave::currentTextChanged(const QString& value) +{ + Q_UNUSED(value) + + showSelectedTree(); +} + +void MaterialSave::onNewFolder(bool checked) +{ + Q_UNUSED(checked) + + auto tree = ui->treeMaterials; + auto model = static_cast(tree->model()); + auto current = tree->currentIndex(); + if (!current.isValid()) { + current = model->index(0, 0); + } + auto item = model->itemFromIndex(current); + if (item->hasChildren()) { + Base::Console().Log("Add new folder to '%s'\n", item->text().toStdString().c_str()); + QIcon folderIcon(QString::fromStdString(":/icons/folder.svg")); + + auto node = new QStandardItem(folderIcon, QString::fromStdString("New Folder")); + addExpanded(tree, item, node); + // node->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + } +} + +void MaterialSave::onFilename(const QString& text) +{ + Base::Console().Log("MaterialSave::onFilename('%s')\n", text.toStdString().c_str()); + + _filename = text; +} + +#include "moc_MaterialSave.cpp" diff --git a/src/Mod/Material/Gui/MaterialSave.h b/src/Mod/Material/Gui/MaterialSave.h new file mode 100644 index 0000000000..56dc196cd1 --- /dev/null +++ b/src/Mod/Material/Gui/MaterialSave.h @@ -0,0 +1,81 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_MATERIALSAVE_H +#define MATGUI_MATERIALSAVE_H + +// #include + +#include +#include +#include +#include + +#include + +namespace MatGui +{ + +class Ui_MaterialSave; + +class MaterialSave: public QDialog +{ + Q_OBJECT + +public: + explicit MaterialSave(Materials::Material* material, QWidget* parent = nullptr); + ~MaterialSave() override; + + void setLibraries(); + void createModelTree(); + void addExpanded(QTreeView* tree, QStandardItem* parent, QStandardItem* child); + void addExpanded(QTreeView* tree, QStandardItemModel* parent, QStandardItem* child); + void + addMaterials(QStandardItem& parent, + const std::shared_ptr> modelTree, + const QIcon& folderIcon, + const QIcon& icon); + void showSelectedTree(); + + void onSelectModel(const QItemSelection& selected, const QItemSelection& deselected); + void currentTextChanged(const QString& value); + void onNewFolder(bool checked); + void onFilename(const QString& text); + void onOk(bool checked); + void onCancel(bool checked); + void accept() override; + void reject() override; + +private: + std::unique_ptr ui; + Materials::MaterialManager _manager; + Materials::Material* _material; + QString _selectedPath; + QString _selectedUUID; + QString _libraryName; + QString _filename; + + QString getPath(const QStandardItem* item) const; +}; + +} // namespace MatGui + +#endif // MATGUI_MATERIALSAVE_H diff --git a/src/Mod/Material/Gui/MaterialSave.ui b/src/Mod/Material/Gui/MaterialSave.ui new file mode 100644 index 0000000000..a6a719e5a6 --- /dev/null +++ b/src/Mod/Material/Gui/MaterialSave.ui @@ -0,0 +1,133 @@ + + + MatGui::MaterialSave + + + + 0 + 0 + 654 + 708 + + + + Save Material + + + + + + + + Library: + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + New Folder + + + + + + + + + + + Filename: + + + + + + + + 0 + 0 + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + standardButtons + accepted() + MatGui::MaterialSave + accept() + + + 248 + 254 + + + 157 + 274 + + + + + standardButtons + rejected() + MatGui::MaterialSave + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/Mod/Material/Gui/MaterialTreeView.h b/src/Mod/Material/Gui/MaterialTreeView.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp new file mode 100644 index 0000000000..7916805b0c --- /dev/null +++ b/src/Mod/Material/Gui/MaterialsEditor.cpp @@ -0,0 +1,904 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "MaterialDelegate.h" +#include "MaterialSave.h" +#include "MaterialsEditor.h" +#include "ModelSelect.h" +#include "ui_MaterialsEditor.h" + + +using namespace MatGui; + +/* TRANSLATOR MatGui::MaterialsEditor */ + +MaterialsEditor::MaterialsEditor(QWidget* parent) + : QDialog(parent) + , ui(new Ui_MaterialsEditor) + , _edited(false) +{ + ui->setupUi(this); + + getFavorites(); + getRecents(); + + createMaterialTree(); + createPhysicalTree(); + createAppearanceTree(); + createPreviews(); + + ui->buttonURL->setIcon(QIcon(QString::fromStdString(":/icons/internet-web-browser.svg"))); + + connect(ui->standardButtons->button(QDialogButtonBox::Ok), + &QPushButton::clicked, + this, + &MaterialsEditor::onOk); + connect(ui->standardButtons->button(QDialogButtonBox::Cancel), + &QPushButton::clicked, + this, + &MaterialsEditor::onCancel); + connect(ui->standardButtons->button(QDialogButtonBox::Save), + &QPushButton::clicked, + this, + &MaterialsEditor::onSave); + + connect(ui->buttonURL, &QPushButton::clicked, this, &MaterialsEditor::onURL); + connect(ui->buttonPhysicalAdd, &QPushButton::clicked, this, &MaterialsEditor::onPhysicalAdd); + connect(ui->buttonAppearanceAdd, + &QPushButton::clicked, + this, + &MaterialsEditor::onAppearanceAdd); + connect(ui->buttonFavorite, &QPushButton::clicked, this, &MaterialsEditor::onFavourite); + + QItemSelectionModel* selectionModel = ui->treeMaterials->selectionModel(); + connect(selectionModel, + &QItemSelectionModel::selectionChanged, + this, + &MaterialsEditor::onSelectMaterial); +} + +void MaterialsEditor::getFavorites() +{ + _favorites.clear(); + + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Favorites"); + int count = param->GetInt("Favorites", 0); + for (int i = 0; i < count; i++) { + QString key = QString::fromLatin1("FAV%1").arg(i); + QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), "")); + _favorites.push_back(uuid); + } +} + +void MaterialsEditor::saveFavorites() +{ + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Favorites"); + + // Clear out the existing favorites + int count = param->GetInt("Favorites", 0); + for (int i = 0; i < count; i++) { + QString key = QString::fromLatin1("FAV%1").arg(i); + param->RemoveASCII(key.toStdString().c_str()); + } + + // Add the current values + param->SetInt("Favorites", _favorites.size()); + int j = 0; + for (auto favorite : _favorites) { + QString key = QString::fromLatin1("FAV%1").arg(j); + param->SetASCII(key.toStdString().c_str(), favorite.toStdString()); + + j++; + } +} + +void MaterialsEditor::addFavorite(const QString& uuid) +{ + // Ensure it is a material. New, unsaved materials will not be + try { + const Materials::Material& material = _materialManager.getMaterial(uuid); + Q_UNUSED(material) + } + catch (const Materials::MaterialNotFound&) { + return; + } + + if (!isFavorite(uuid)) { + _favorites.push_back(uuid); + saveFavorites(); + refreshMaterialTree(); + } +} + +void MaterialsEditor::removeFavorite(const QString& uuid) +{ + if (isFavorite(uuid)) { + _favorites.remove(uuid); + saveFavorites(); + refreshMaterialTree(); + } +} + +bool MaterialsEditor::isFavorite(const QString& uuid) const +{ + for (auto it : _favorites) { + if (it == uuid) { + return true; + } + } + return false; +} + + +void MaterialsEditor::getRecents() +{ + _recents.clear(); + + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Recent"); + _recentMax = param->GetInt("RecentMax", 5); + int count = param->GetInt("Recent", 0); + for (int i = 0; i < count; i++) { + QString key = QString::fromLatin1("MRU%1").arg(i); + QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), "")); + _recents.push_back(uuid); + } +} + +void MaterialsEditor::saveRecents() +{ + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Recent"); + + // Clear out the existing favorites + int count = param->GetInt("Recent", 0); + for (int i = 0; i < count; i++) { + QString key = QString::fromLatin1("MRU%1").arg(i); + param->RemoveASCII(key.toStdString().c_str()); + } + + // Add the current values + int size = _recents.size(); + if (size > _recentMax) { + size = _recentMax; + } + param->SetInt("Recent", size); + int j = 0; + for (auto recent : _recents) { + QString key = QString::fromLatin1("MRU%1").arg(j); + param->SetASCII(key.toStdString().c_str(), recent.toStdString()); + + j++; + if (j >= size) { + break; + } + } +} + +void MaterialsEditor::addRecent(const QString& uuid) +{ + // Ensure it is a material. New, unsaved materials will not be + try { + const Materials::Material& material = _materialManager.getMaterial(uuid); + Q_UNUSED(material) + } + catch (const Materials::MaterialNotFound&) { + return; + } + + // Ensure no duplicates + if (isRecent(uuid)) { + _recents.remove(uuid); + } + + _recents.push_front(uuid); + while (_recents.size() > static_cast(_recentMax)) { + _recents.pop_back(); + } + + saveRecents(); +} + +bool MaterialsEditor::isRecent(const QString& uuid) const +{ + for (auto it : _recents) { + if (it == uuid) { + return true; + } + } + return false; +} + +void MaterialsEditor::propertyChange(const QString& property, const QString value) +{ + Base::Console().Log("MaterialsEditor::propertyChange(%s) = '%s'\n", + property.toStdString().c_str(), + value.toStdString().c_str()); + if (_material.hasPhysicalProperty(property)) { + _material.setPhysicalValue(property, value); + } + else if (_material.hasAppearanceProperty(property)) { + _material.setAppearanceValue(property, value); + updatePreview(); + } + _edited = true; +} + +void MaterialsEditor::onURL(bool checked) +{ + Q_UNUSED(checked) + + Base::Console().Log("URL\n"); + QString url = ui->editSourceURL->text(); + if (url.length() > 0) { + QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode)); + } +} + +void MaterialsEditor::onPhysicalAdd(bool checked) +{ + Q_UNUSED(checked) + + ModelSelect dialog(this, Materials::ModelManager::ModelFilter_Physical); + dialog.setModal(true); + if (dialog.exec() == QDialog::Accepted) { + QString selected = dialog.selectedModel(); + Base::Console().Log("Selected model '%s'\n", selected.toStdString().c_str()); + _material.addPhysical(selected); + updateMaterial(); + } + else { + Base::Console().Log("No model selected\n"); + } +} + +void MaterialsEditor::onAppearanceAdd(bool checked) +{ + Q_UNUSED(checked) + + ModelSelect dialog(this, Materials::ModelManager::ModelFilter_Appearance); + dialog.setModal(true); + if (dialog.exec() == QDialog::Accepted) { + QString selected = dialog.selectedModel(); + Base::Console().Log("Selected model '%s'\n", selected.toStdString().c_str()); + _material.addAppearance(selected); + updateMaterial(); + } + else { + Base::Console().Log("No model selected\n"); + } +} + +void MaterialsEditor::onFavourite(bool checked) +{ + Q_UNUSED(checked) + + Base::Console().Log("Favorite\n"); + auto selected = _material.getUUID(); + if (isFavorite(selected)) { + removeFavorite(selected); + } + else { + addFavorite(selected); + } +} + +void MaterialsEditor::onOk(bool checked) +{ + Q_UNUSED(checked) + + accept(); +} + +void MaterialsEditor::onCancel(bool checked) +{ + Q_UNUSED(checked) + + reject(); +} + +void MaterialsEditor::onSave(bool checked) +{ + Q_UNUSED(checked) + + saveMaterial(); +} + +void MaterialsEditor::saveMaterial() +{ + MaterialSave dialog(&_material, this); + dialog.setModal(true); + if (dialog.exec() == QDialog::Accepted) { + _material.resetEditState(); + refreshMaterialTree(); + } +} + +void MaterialsEditor::accept() +{ + addRecent(_material.getUUID()); + QDialog::accept(); +} + +void MaterialsEditor::reject() +{ + QDialog::reject(); +} + +// QIcon MaterialsEditor::errorIcon(const QIcon &icon) const { +// auto pixmap = icon.pixmap(); +// } + +void MaterialsEditor::addMaterials( + QStandardItem& parent, + const std::shared_ptr> modelTree, + const QIcon& folderIcon, + const QIcon& icon) +{ + auto tree = ui->treeMaterials; + for (auto& mat : *modelTree) { + Materials::MaterialTreeNode* nodePtr = mat.second; + if (nodePtr->getType() == Materials::MaterialTreeNode::DataNode) { + const Materials::Material* material = nodePtr->getData(); + QString uuid = material->getUUID(); + // Base::Console().Log("Material path '%s'\n", + // material->getDirectory().toStdString().c_str()); + + // auto card = new QStandardItem(icon, material->getName()); + auto card = new QStandardItem(icon, mat.first); + card->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled); + card->setData(QVariant(uuid), Qt::UserRole); + + addExpanded(tree, &parent, card); + } + else { + auto node = new QStandardItem(folderIcon, mat.first); + addExpanded(tree, &parent, node); + node->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + auto treeMap = nodePtr->getFolder(); + addMaterials(*node, treeMap, folderIcon, icon); + } + } +} + +void MaterialsEditor::addExpanded(QTreeView* tree, QStandardItem* parent, QStandardItem* child) +{ + parent->appendRow(child); + tree->setExpanded(child->index(), true); +} + +void MaterialsEditor::addExpanded(QTreeView* tree, QStandardItemModel* parent, QStandardItem* child) +{ + parent->appendRow(child); + tree->setExpanded(child->index(), true); +} + +void MaterialsEditor::createPhysicalTree() +{ + auto tree = ui->treePhysicalProperties; + auto model = new QStandardItemModel(); + tree->setModel(model); + + QStringList headers; + headers.append(QString::fromStdString("Property")); + headers.append(QString::fromStdString("Value")); + headers.append(QString::fromStdString("Type")); + model->setHorizontalHeaderLabels(headers); + + tree->setColumnWidth(0, 250); + tree->setColumnWidth(1, 250); + tree->setColumnHidden(2, true); + + tree->setHeaderHidden(false); + tree->setUniformRowHeights(true); + MaterialDelegate* delegate = new MaterialDelegate(this); + tree->setItemDelegateForColumn(1, delegate); + + connect(delegate, &MaterialDelegate::propertyChange, this, &MaterialsEditor::propertyChange); +} + +void MaterialsEditor::createPreviews() +{ + _rendered = new QSvgWidget(QString::fromStdString(":/icons/preview-rendered.svg")); + _rendered->setMaximumWidth(64); + _rendered->setMinimumHeight(64); + ui->layoutAppearance->addWidget(_rendered); + + _vectored = new QSvgWidget(QString::fromStdString(":/icons/preview-vector.svg")); + _vectored->setMaximumWidth(64); + _vectored->setMinimumHeight(64); + ui->layoutAppearance->addWidget(_vectored); + + updatePreview(); +} + +void MaterialsEditor::createAppearanceTree() +{ + auto tree = ui->treeAppearance; + auto model = new QStandardItemModel(); + tree->setModel(model); + + QStringList headers; + headers.append(QString::fromStdString("Property")); + headers.append(QString::fromStdString("Value")); + headers.append(QString::fromStdString("Type")); + model->setHorizontalHeaderLabels(headers); + + tree->setColumnWidth(0, 250); + tree->setColumnWidth(1, 250); + tree->setColumnHidden(2, true); + + tree->setHeaderHidden(false); + tree->setUniformRowHeights(false); + MaterialDelegate* delegate = new MaterialDelegate(this); + tree->setItemDelegateForColumn(1, delegate); + + connect(delegate, &MaterialDelegate::propertyChange, this, &MaterialsEditor::propertyChange); +} + +void MaterialsEditor::addRecents(QStandardItem* parent) +{ + auto tree = ui->treeMaterials; + for (auto& uuid : _recents) { + try { + const Materials::Material& material = getMaterialManager().getMaterial(uuid); + + QIcon icon = QIcon(material.getLibrary().getIconPath()); + auto card = new QStandardItem(icon, material.getName()); + card->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled); + card->setData(QVariant(uuid), Qt::UserRole); + + addExpanded(tree, parent, card); + } + catch (const Materials::MaterialNotFound&) { + } + } +} + +void MaterialsEditor::addFavorites(QStandardItem* parent) +{ + auto tree = ui->treeMaterials; + for (auto& uuid : _favorites) { + try { + const Materials::Material& material = getMaterialManager().getMaterial(uuid); + + QIcon icon = QIcon(material.getLibrary().getIconPath()); + auto card = new QStandardItem(icon, material.getName()); + card->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled); + card->setData(QVariant(uuid), Qt::UserRole); + + addExpanded(tree, parent, card); + } + catch (const Materials::MaterialNotFound&) { + } + } +} + +void MaterialsEditor::fillMaterialTree() +{ + auto tree = ui->treeMaterials; + auto model = static_cast(tree->model()); + + auto lib = new QStandardItem(QString::fromStdString("Favorites")); + lib->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + addExpanded(tree, model, lib); + addFavorites(lib); + + lib = new QStandardItem(QString::fromStdString("Recent")); + lib->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + addExpanded(tree, model, lib); + addRecents(lib); + + auto libraries = Materials::MaterialManager::getMaterialLibraries(); + for (const auto& library : *libraries) { + lib = new QStandardItem(library->getName()); + lib->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + addExpanded(tree, model, lib); + + QIcon icon(library->getIconPath()); + QIcon folderIcon(QString::fromStdString(":/icons/folder.svg")); + + auto modelTree = _materialManager.getMaterialTree(*library); + addMaterials(*lib, modelTree, folderIcon, icon); + } +} + +void MaterialsEditor::createMaterialTree() +{ + // Materials::ModelManager &modelManager = getModelManager(); + // Q_UNUSED(modelManager) + + auto tree = ui->treeMaterials; + auto model = new QStandardItemModel(); + tree->setModel(model); + + tree->setHeaderHidden(true); + fillMaterialTree(); +} + +void MaterialsEditor::refreshMaterialTree() +{ + auto tree = ui->treeMaterials; + auto model = static_cast(tree->model()); + model->clear(); + + fillMaterialTree(); +} + +void MaterialsEditor::updatePreview() const +{ + QString diffuseColor; + QString highlightColor; + QString sectionColor; + + if (_material.hasAppearanceProperty(QString::fromStdString("DiffuseColor"))) { + diffuseColor = _material.getAppearanceValueString(QString::fromStdString("DiffuseColor")); + } + else if (_material.hasAppearanceProperty(QString::fromStdString("ViewColor"))) { + diffuseColor = _material.getAppearanceValueString(QString::fromStdString("ViewColor")); + } + else if (_material.hasAppearanceProperty(QString::fromStdString("Color"))) { + diffuseColor = _material.getAppearanceValueString(QString::fromStdString("Color")); + } + + if (_material.hasAppearanceProperty(QString::fromStdString("SpecularColor"))) { + highlightColor = + _material.getAppearanceValueString(QString::fromStdString("SpecularColor")); + } + + if (_material.hasAppearanceProperty(QString::fromStdString("SectionColor"))) { + sectionColor = _material.getAppearanceValueString(QString::fromStdString("SectionColor")); + } + + if ((diffuseColor.length() + highlightColor.length()) > 0) { + auto file = QFile(QString::fromStdString(":/icons/preview-rendered.svg")); + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { + QString svg = QTextStream(&file).readAll(); + file.close(); + if (diffuseColor.length() > 0) { + svg = + svg.replace(QString::fromStdString("#d3d7cf"), getColorHash(diffuseColor, 255)); + svg = + svg.replace(QString::fromStdString("#555753"), getColorHash(diffuseColor, 125)); + } + if (highlightColor.length() > 0) { + svg = svg.replace(QString::fromStdString("#fffffe"), + getColorHash(highlightColor, 255)); + } + _rendered->load(svg.toUtf8()); + } + } + + if ((diffuseColor.length() + sectionColor.length()) > 0) { + auto file = QFile(QString::fromStdString(":/icons/preview-vector.svg")); + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { + QString svg = QTextStream(&file).readAll(); + file.close(); + if (diffuseColor.length() > 0) { + svg = + svg.replace(QString::fromStdString("#d3d7cf"), getColorHash(diffuseColor, 255)); + svg = + svg.replace(QString::fromStdString("#555753"), getColorHash(diffuseColor, 125)); + } + if (sectionColor.length() > 0) { + svg = + svg.replace(QString::fromStdString("#ffffff"), getColorHash(sectionColor, 255)); + } + _vectored->load(svg.toUtf8()); + } + } +} + +QString MaterialsEditor::getColorHash(const QString& colorString, int colorRange) const +{ + /* + returns a '#000000' string from a '(0.1,0.2,0.3)' string. Optionally the string + has a fourth value for alpha (transparency) + */ + std::stringstream stream(colorString.toStdString()); + + char c; + stream >> c; // read "(" + double red; + stream >> red; + stream >> c; // "," + double green; + stream >> green; + stream >> c; // "," + double blue; + stream >> blue; + stream >> c; // "," + double alpha = 1.0; + if (c == ',') { + stream >> alpha; + } + + QColor color(static_cast(red * colorRange), + static_cast(green * colorRange), + static_cast(blue * colorRange), + static_cast(alpha * colorRange)); + return color.name(); +} + +void MaterialsEditor::updateMaterialAppearance() +{ + QTreeView* tree = ui->treeAppearance; + QStandardItemModel* treeModel = static_cast(tree->model()); + treeModel->clear(); + + QStringList headers; + headers.append(QString::fromStdString("Property")); + headers.append(QString::fromStdString("Value")); + headers.append(QString::fromStdString("Type")); + treeModel->setHorizontalHeaderLabels(headers); + + tree->setColumnWidth(0, 250); + tree->setColumnWidth(1, 250); + tree->setColumnHidden(2, true); + + const std::vector* models = _material.getAppearanceModels(); + if (models) { + for (auto it = models->begin(); it != models->end(); it++) { + QString uuid = *it; + try { + const Materials::Model& model = getModelManager().getModel(uuid); + QString name = model.getName(); + + auto modelRoot = new QStandardItem(name); + modelRoot->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled); + addExpanded(tree, treeModel, modelRoot); + for (auto itp = model.begin(); itp != model.end(); itp++) { + QList items; + + QString key = itp->first; + auto propertyItem = new QStandardItem(key); + propertyItem->setToolTip(itp->second.getDescription()); + items.append(propertyItem); + + auto valueItem = new QStandardItem(_material.getAppearanceValueString(key)); + valueItem->setToolTip(itp->second.getDescription()); + QVariant variant; + variant.setValue(&_material); + valueItem->setData(variant); + items.append(valueItem); + + auto typeItem = new QStandardItem(itp->second.getPropertyType()); + items.append(typeItem); + + auto unitsItem = new QStandardItem(itp->second.getUnits()); + items.append(unitsItem); + + modelRoot->appendRow(items); + tree->setExpanded(modelRoot->index(), true); + } + } + catch (Materials::ModelNotFound const&) { + } + } + } +} + +void MaterialsEditor::updateMaterialProperties() +{ + QTreeView* tree = ui->treePhysicalProperties; + QStandardItemModel* treeModel = static_cast(tree->model()); + treeModel->clear(); + + QStringList headers; + headers.append(QString::fromStdString("Property")); + headers.append(QString::fromStdString("Value")); + headers.append(QString::fromStdString("Type")); + headers.append(QString::fromStdString("Units")); + treeModel->setHorizontalHeaderLabels(headers); + + tree->setColumnWidth(0, 250); + tree->setColumnWidth(1, 250); + tree->setColumnHidden(2, true); + tree->setColumnHidden(3, true); + + const std::vector* models = _material.getPhysicalModels(); + if (models) { + for (auto it = models->begin(); it != models->end(); it++) { + QString uuid = *it; + try { + const Materials::Model& model = getModelManager().getModel(uuid); + QString name = model.getName(); + + auto modelRoot = new QStandardItem(name); + modelRoot->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled); + addExpanded(tree, treeModel, modelRoot); + for (auto itp = model.begin(); itp != model.end(); itp++) { + QList items; + + QString key = itp->first; + Materials::ModelProperty modelProperty = + static_cast(itp->second); + auto propertyItem = new QStandardItem(key); + propertyItem->setToolTip(modelProperty.getDescription()); + items.append(propertyItem); + + auto valueItem = new QStandardItem(_material.getPhysicalValueString(key)); + valueItem->setToolTip(modelProperty.getDescription()); + QVariant variant; + variant.setValue(&_material); + valueItem->setData(variant); + items.append(valueItem); + + auto typeItem = new QStandardItem(modelProperty.getPropertyType()); + items.append(typeItem); + + auto unitsItem = new QStandardItem(modelProperty.getUnits()); + items.append(unitsItem); + + // addExpanded(tree, modelRoot, propertyItem); + modelRoot->appendRow(items); + tree->setExpanded(modelRoot->index(), true); + } + } + catch (Materials::ModelNotFound const&) { + } + } + } +} + +void MaterialsEditor::updateMaterial() +{ + // Update the general information + ui->editName->setText(_material.getName()); + ui->editAuthorLicense->setText(_material.getAuthorAndLicense()); + // ui->editParent->setText(_material.getName()); + ui->editSourceURL->setText(_material.getURL()); + ui->editSourceReference->setText(_material.getReference()); + // ui->editTags->setText(_material.getName()); + ui->editDescription->setText(_material.getDescription()); + + updateMaterialProperties(); + updateMaterialAppearance(); + + updatePreview(); +} + +void MaterialsEditor::onSelectMaterial(const QItemSelection& selected, + const QItemSelection& deselected) +{ + Q_UNUSED(deselected); + + // Get the UUID before changing the underlying data model + QString uuid; + QStandardItemModel* model = static_cast(ui->treeMaterials->model()); + QModelIndexList indexes = selected.indexes(); + for (auto it = indexes.begin(); it != indexes.end(); it++) { + QStandardItem* item = model->itemFromIndex(*it); + + Base::Console().Log("%s\n", item->text().toStdString().c_str()); + if (item) { + uuid = item->data(Qt::UserRole).toString(); + break; + } + } + + if (uuid.isEmpty() || uuid == _material.getUUID()) { + Base::Console().Log("*** Unchanged material '%s'\n", uuid.toStdString().c_str()); + return; + } + + // Ensure data is saved (or discarded) before changing materials + if (_material.getEditState() != Materials::Material::ModelEdit_None) { + // Prompt the user to save or discard changes + Base::Console().Log("*** Material edited!!!\n"); + int res = confirmSave(this); + if (res == QMessageBox::Cancel) { + return; + } + } + + // Get the selected material + try { + _material = getMaterialManager().getMaterial(uuid); + } + catch (Materials::ModelNotFound const&) { + Base::Console().Log("*** Unable to load material '%s'\n", uuid.toStdString().c_str()); + Materials::Material empty; + _material = empty; + } + + updateMaterial(); + _material.resetEditState(); +} + +int MaterialsEditor::confirmSave(QWidget* parent) +{ + QMessageBox box(parent ? parent : this); + box.setIcon(QMessageBox::Question); + box.setWindowTitle(QObject::tr("Unsaved Material")); + box.setText(QObject::tr("Do you want to save your changes to the material before closing?")); + + box.setInformativeText(QObject::tr("If you don't save, your changes will be lost.")); + box.setStandardButtons(QMessageBox::Discard | QMessageBox::Cancel | QMessageBox::Save); + box.setDefaultButton(QMessageBox::Save); + box.setEscapeButton(QMessageBox::Cancel); + + // add shortcuts + QAbstractButton* saveBtn = box.button(QMessageBox::Save); + if (saveBtn->shortcut().isEmpty()) { + QString text = saveBtn->text(); + text.prepend(QLatin1Char('&')); + saveBtn->setShortcut(QKeySequence::mnemonic(text)); + } + + QAbstractButton* discardBtn = box.button(QMessageBox::Discard); + if (discardBtn->shortcut().isEmpty()) { + QString text = discardBtn->text(); + text.prepend(QLatin1Char('&')); + discardBtn->setShortcut(QKeySequence::mnemonic(text)); + } + + int res = QMessageBox::Cancel; + box.adjustSize(); // Silence warnings from Qt on Windows + switch (box.exec()) { + case QMessageBox::Save: + saveMaterial(); + res = QMessageBox::Save; + break; + case QMessageBox::Discard: + res = QMessageBox::Discard; + break; + } + + return res; +} + +#include "moc_MaterialsEditor.cpp" diff --git a/src/Mod/Material/Gui/MaterialsEditor.h b/src/Mod/Material/Gui/MaterialsEditor.h new file mode 100644 index 0000000000..6a1169724b --- /dev/null +++ b/src/Mod/Material/Gui/MaterialsEditor.h @@ -0,0 +1,131 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_MATERIALSEDITOR_H +#define MATGUI_MATERIALSEDITOR_H + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace fs = boost::filesystem; + +namespace MatGui +{ + +class Ui_MaterialsEditor; + +class MaterialsEditor: public QDialog +{ + Q_OBJECT + +public: + explicit MaterialsEditor(QWidget* parent = nullptr); + ~MaterialsEditor() override = default; + + void propertyChange(const QString& property, const QString value); + void onFavourite(bool checked); + void onURL(bool checked); + void onPhysicalAdd(bool checked); + void onAppearanceAdd(bool checked); + void onOk(bool checked); + void onCancel(bool checked); + void onSave(bool checked); + void accept() override; + void reject() override; + + Materials::MaterialManager& getMaterialManager() + { + return _materialManager; + } + Materials::ModelManager& getModelManager() + { + return _modelManager; + } + + void updateMaterialAppearance(); + void updateMaterialProperties(); + void updateMaterial(); + void onSelectMaterial(const QItemSelection& selected, const QItemSelection& deselected); + +protected: + int confirmSave(QWidget* parent); + void saveMaterial(); + +private: + std::unique_ptr ui; + Materials::MaterialManager _materialManager; + Materials::ModelManager _modelManager; + Materials::Material _material; + QSvgWidget* _rendered; + QSvgWidget* _vectored; + bool _edited; + std::list _favorites; + std::list _recents; + int _recentMax; + + void getFavorites(); + void saveFavorites(); + void addFavorite(const QString& uuid); + void removeFavorite(const QString& uuid); + bool isFavorite(const QString& uuid) const; + + void getRecents(); + void saveRecents(); + void addRecent(const QString& uuid); + bool isRecent(const QString& uuid) const; + + void updatePreview() const; + QString getColorHash(const QString& colorString, int colorRange = 255) const; + + void addExpanded(QTreeView* tree, QStandardItem* parent, QStandardItem* child); + void addExpanded(QTreeView* tree, QStandardItemModel* parent, QStandardItem* child); + void addRecents(QStandardItem* parent); + void addFavorites(QStandardItem* parent); + void createPreviews(); + void createAppearanceTree(); + void createPhysicalTree(); + void createMaterialTree(); + void fillMaterialTree(); + void refreshMaterialTree(); + void + addMaterials(QStandardItem& parent, + const std::shared_ptr> modelTree, + const QIcon& folderIcon, + const QIcon& icon); + bool isMaterial(const fs::path& p) const + { + return Materials::MaterialManager::isMaterial(p); + } +}; + +} // namespace MatGui + +#endif // MATGUI_MATERIALSEDITOR_H diff --git a/src/Mod/Material/Gui/MaterialsEditor.ui b/src/Mod/Material/Gui/MaterialsEditor.ui new file mode 100644 index 0000000000..8533439e88 --- /dev/null +++ b/src/Mod/Material/Gui/MaterialsEditor.ui @@ -0,0 +1,288 @@ + + + MatGui::MaterialsEditor + + + + 0 + 0 + 835 + 542 + + + + + 0 + 0 + + + + Materials + + + false + + + + + + Qt::Horizontal + + + + QAbstractItemView::SelectItems + + + true + + + + + 0 + + + + + 0 + 0 + + + + General + + + + + + QLayout::SetMinAndMaxSize + + + 7 + + + 7 + + + 7 + + + 7 + + + + + + + + Description + + + + + + + + + + Name + + + + + + + Source Reference + + + + + + + Parent + + + + + + + + + + Author and License + + + + + + + + + + Tags + + + + + + + Source URL + + + + + + + + + + + + + + + + + + + 22 + 22 + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + * + + + + + + + + + + Properties + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + Appearance + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Save + + + + + + + + diff --git a/src/Mod/Material/Gui/ModelSelect.cpp b/src/Mod/Material/Gui/ModelSelect.cpp new file mode 100644 index 0000000000..9b2d19ab38 --- /dev/null +++ b/src/Mod/Material/Gui/ModelSelect.cpp @@ -0,0 +1,540 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#include +#include +#endif + +#include +#include +#include +#include +#include + +#include "ModelSelect.h" +#include "ui_ModelSelect.h" + + +using namespace MatGui; + +/* TRANSLATOR MatGui::ModelSelect */ + +ModelSelect::ModelSelect(QWidget* parent, Materials::ModelManager::ModelFilter filter) + : QDialog(parent) + , _filter(filter) + , ui(new Ui_ModelSelect) +{ + ui->setupUi(this); + + getFavorites(); + getRecents(); + + createModelTree(); + createModelProperties(); + + ui->buttonURL->setIcon(QIcon(QString::fromStdString(":/icons/internet-web-browser.svg"))); + ui->buttonDOI->setIcon(QIcon(QString::fromStdString(":/icons/internet-web-browser.svg"))); + + connect(ui->standardButtons, &QDialogButtonBox::accepted, this, &ModelSelect::accept); + connect(ui->standardButtons, &QDialogButtonBox::rejected, this, &ModelSelect::reject); + + QItemSelectionModel* selectionModel = ui->treeModels->selectionModel(); + connect(selectionModel, + &QItemSelectionModel::selectionChanged, + this, + &ModelSelect::onSelectModel); + + connect(ui->buttonURL, &QPushButton::clicked, this, &ModelSelect::onURL); + connect(ui->buttonDOI, &QPushButton::clicked, this, &ModelSelect::onDOI); + connect(ui->buttonFavorite, &QPushButton::clicked, this, &ModelSelect::onFavourite); + + ui->standardButtons->button(QDialogButtonBox::Ok)->setEnabled(false); + ui->buttonFavorite->setEnabled(false); +} + +void ModelSelect::getFavorites() +{ + _favorites.clear(); + + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Models/Favorites"); + int count = param->GetInt("Favorites", 0); + for (int i = 0; i < count; i++) { + QString key = QString::fromLatin1("FAV%1").arg(i); + QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), "")); + _favorites.push_back(uuid); + } +} + +void ModelSelect::saveFavorites() +{ + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Models/Favorites"); + + // Clear out the existing favorites + int count = param->GetInt("Favorites", 0); + for (int i = 0; i < count; i++) { + QString key = QString::fromLatin1("FAV%1").arg(i); + param->RemoveASCII(key.toStdString().c_str()); + } + + // Add the current values + param->SetInt("Favorites", _favorites.size()); + int j = 0; + for (auto favorite : _favorites) { + QString key = QString::fromLatin1("FAV%1").arg(j); + param->SetASCII(key.toStdString().c_str(), favorite.toStdString()); + + j++; + } +} + +void ModelSelect::addFavorite(const QString& uuid) +{ + if (!isFavorite(uuid)) { + _favorites.push_back(uuid); + saveFavorites(); + refreshModelTree(); + } +} + +void ModelSelect::removeFavorite(const QString& uuid) +{ + if (isFavorite(uuid)) { + _favorites.remove(uuid); + saveFavorites(); + refreshModelTree(); + } +} + +bool ModelSelect::isFavorite(const QString& uuid) const +{ + for (auto it : _favorites) { + if (it == uuid) { + return true; + } + } + return false; +} + + +void ModelSelect::getRecents() +{ + _recents.clear(); + + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Models/Recent"); + _recentMax = param->GetInt("RecentMax", 5); + int count = param->GetInt("Recent", 0); + for (int i = 0; i < count; i++) { + QString key = QString::fromLatin1("MRU%1").arg(i); + QString uuid = QString::fromStdString(param->GetASCII(key.toStdString().c_str(), "")); + _recents.push_back(uuid); + } +} + +void ModelSelect::saveRecents() +{ + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Models/Recent"); + + // Clear out the existing favorites + int count = param->GetInt("Recent", 0); + for (int i = 0; i < count; i++) { + QString key = QString::fromLatin1("MRU%1").arg(i); + param->RemoveASCII(key.toStdString().c_str()); + } + + // Add the current values + int size = _recents.size(); + if (size > _recentMax) { + size = _recentMax; + } + param->SetInt("Recent", size); + int j = 0; + for (auto recent : _recents) { + QString key = QString::fromLatin1("MRU%1").arg(j); + param->SetASCII(key.toStdString().c_str(), recent.toStdString()); + + j++; + if (j >= size) { + break; + } + } +} + +void ModelSelect::addRecent(const QString& uuid) +{ + // Ensure no duplicates + if (isRecent(uuid)) { + _recents.remove(uuid); + } + + _recents.push_front(uuid); + while (_recents.size() > static_cast(_recentMax)) { + _recents.pop_back(); + } + + saveRecents(); +} + +bool ModelSelect::isRecent(const QString& uuid) const +{ + for (auto it : _recents) { + if (it == uuid) { + return true; + } + } + return false; +} + +/* + * Destroys the object and frees any allocated resources + */ +ModelSelect::~ModelSelect() +{ + // no need to delete child widgets, Qt does it all for us +} + +void ModelSelect::addExpanded(QTreeView* tree, QStandardItem* parent, QStandardItem* child) +{ + parent->appendRow(child); + tree->setExpanded(child->index(), true); +} + +void ModelSelect::addExpanded(QTreeView* tree, QStandardItemModel* parent, QStandardItem* child) +{ + parent->appendRow(child); + tree->setExpanded(child->index(), true); +} + +void ModelSelect::addModels( + QStandardItem& parent, + const std::shared_ptr> modelTree, + const QIcon& icon) +{ + auto tree = ui->treeModels; + for (auto& mod : *modelTree) { + Materials::ModelTreeNode* nodePtr = mod.second; + if (nodePtr->getType() == Materials::ModelTreeNode::DataNode) { + const Materials::Model* model = nodePtr->getData(); + QString uuid = model->getUUID(); + + auto card = new QStandardItem(icon, model->getName()); + card->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled); + card->setData(QVariant(uuid), Qt::UserRole); + + addExpanded(tree, &parent, card); + } + else { + auto node = new QStandardItem(mod.first); + addExpanded(tree, &parent, node); + node->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + auto treeMap = nodePtr->getFolder(); + addModels(*node, treeMap, icon); + } + } +} + +void ModelSelect::addRecents(QStandardItem* parent) +{ + auto tree = ui->treeModels; + for (auto& uuid : _recents) { + try { + const Materials::Model& model = getModelManager().getModel(uuid); + + if (getModelManager().passFilter(_filter, model.getType())) { + QIcon icon = QIcon(model.getLibrary().getIconPath()); + auto card = new QStandardItem(icon, model.getName()); + card->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled); + card->setData(QVariant(uuid), Qt::UserRole); + + addExpanded(tree, parent, card); + } + } + catch (const Materials::ModelNotFound&) { + } + } +} + +void ModelSelect::addFavorites(QStandardItem* parent) +{ + auto tree = ui->treeModels; + for (auto& uuid : _favorites) { + try { + const Materials::Model& model = getModelManager().getModel(uuid); + + if (getModelManager().passFilter(_filter, model.getType())) { + QIcon icon = QIcon(model.getLibrary().getIconPath()); + auto card = new QStandardItem(icon, model.getName()); + card->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled + | Qt::ItemIsDropEnabled); + card->setData(QVariant(uuid), Qt::UserRole); + + addExpanded(tree, parent, card); + } + } + catch (const Materials::ModelNotFound&) { + } + } +} + +void ModelSelect::createModelTree() +{ + // Materials::ModelManager modelManager; + + auto tree = ui->treeModels; + auto model = new QStandardItemModel(); + tree->setModel(model); + tree->setHeaderHidden(true); + + fillTree(); +} + +void ModelSelect::refreshModelTree() +{ + auto tree = ui->treeModels; + auto model = static_cast(tree->model()); + model->clear(); + + fillTree(); +} + +void ModelSelect::fillTree() +{ + // Materials::ModelManager modelManager; + + auto tree = ui->treeModels; + auto model = static_cast(tree->model()); + + auto lib = new QStandardItem(QString::fromStdString("Favorites")); + lib->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + addExpanded(tree, model, lib); + addFavorites(lib); + + lib = new QStandardItem(QString::fromStdString("Recent")); + lib->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + addExpanded(tree, model, lib); + addRecents(lib); + + auto libraries = getModelManager().getModelLibraries(); + for (auto library : *libraries) { + lib = new QStandardItem(library->getName()); + lib->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); + addExpanded(tree, model, lib); + + auto modelTree = getModelManager().getModelTree(*library, _filter); + addModels(*lib, modelTree, QIcon(library->getIconPath())); + } +} + +void ModelSelect::setHeaders(QStandardItemModel* model) +{ + QStringList headers; + headers.append(QString::fromStdString("Inherited")); + headers.append(QString::fromStdString("Property")); + headers.append(QString::fromStdString("Units")); + headers.append(QString::fromStdString("Description")); + headers.append(QString::fromStdString("URL")); + + model->setHorizontalHeaderLabels(headers); +} + +void ModelSelect::setColumnWidths(QTableView* table) +{ + table->setColumnWidth(0, 75); + table->setColumnWidth(1, 200); + table->setColumnWidth(2, 200); + table->setColumnWidth(3, 200); + table->setColumnWidth(4, 200); +} + +void ModelSelect::createModelProperties() +{ + auto table = ui->tableProperties; + auto model = new QStandardItemModel(); + table->setModel(model); + table->setEditTriggers(QAbstractItemView::NoEditTriggers); + + setHeaders(model); + setColumnWidths(table); + + // table->setHeaderHidden(false); + // table->setUniformRowHeights(true); + // table->setItemDelegate(new MaterialDelegate(this)); +} + +void ModelSelect::updateModelProperties(const Materials::Model& model) +{ + QTableView* table = ui->tableProperties; + QStandardItemModel* tableModel = static_cast(table->model()); + tableModel->clear(); + + setHeaders(tableModel); + setColumnWidths(table); + + for (auto itp = model.begin(); itp != model.end(); itp++) { + QList items; + + QString key = itp->first; + const Materials::ModelProperty modelProperty = + static_cast(itp->second); + + auto inherited = + new QStandardItem(QString::fromStdString(modelProperty.isInherited() ? "*" : "")); + // inherited->setToolTip(QString::fromStdString(modelProperty.getDescription())); + items.append(inherited); + + auto propertyItem = new QStandardItem(key); + items.append(propertyItem); + + auto unitsItem = new QStandardItem(modelProperty.getUnits()); + items.append(unitsItem); + + auto descriptionItem = new QStandardItem(modelProperty.getDescription()); + items.append(descriptionItem); + + auto urlItem = new QStandardItem(modelProperty.getURL()); + items.append(urlItem); + + // addExpanded(tree, modelRoot, propertyItem); + tableModel->appendRow(items); + } +} + +void ModelSelect::updateMaterialModel(const QString& uuid) +{ + Materials::Model model = getModelManager().getModel(uuid); + + // Update the general information + ui->editName->setText(model.getName()); + ui->editURL->setText(model.getURL()); + ui->editDOI->setText(model.getDOI()); + ui->editDescription->setText(model.getDescription()); + + if (model.getType() == Materials::Model::ModelType_Physical) { + ui->tabWidget->setTabText(1, QString::fromStdString("Properties")); + } + else { + ui->tabWidget->setTabText(1, QString::fromStdString("Appearance")); + } + updateModelProperties(model); +} + +void ModelSelect::clearMaterialModel() +{ + // Update the general information + ui->editName->setText(QString::fromStdString("")); + ui->editURL->setText(QString::fromStdString("")); + ui->editDOI->setText(QString::fromStdString("")); + ui->editDescription->setText(QString::fromStdString("")); + + ui->tabWidget->setTabText(1, QString::fromStdString("Properties")); + + QTableView* table = ui->tableProperties; + QStandardItemModel* tableModel = static_cast(table->model()); + tableModel->clear(); + + setHeaders(tableModel); + setColumnWidths(table); +} + +void ModelSelect::onSelectModel(const QItemSelection& selected, const QItemSelection& deselected) +{ + Q_UNUSED(deselected); + + QStandardItemModel* model = static_cast(ui->treeModels->model()); + QModelIndexList indexes = selected.indexes(); + for (auto it = indexes.begin(); it != indexes.end(); it++) { + QStandardItem* item = model->itemFromIndex(*it); + Base::Console().Log("%s\n", item->text().toStdString().c_str()); + if (item) { + try { + _selected = item->data(Qt::UserRole).toString(); + Base::Console().Log("\t%s\n", _selected.toStdString().c_str()); + updateMaterialModel(_selected); + ui->standardButtons->button(QDialogButtonBox::Ok)->setEnabled(true); + ui->buttonFavorite->setEnabled(true); + } + catch (const std::exception& e) { + _selected = QString::fromStdString(""); + Base::Console().Log("Error %s\n", e.what()); + clearMaterialModel(); + ui->standardButtons->button(QDialogButtonBox::Ok)->setEnabled(false); + ui->buttonFavorite->setEnabled(false); + } + } + } +} + +void ModelSelect::onURL(bool checked) +{ + Q_UNUSED(checked) + + Base::Console().Log("URL\n"); + QString url = ui->editURL->text(); + if (url.length() > 0) { + QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode)); + } +} + +void ModelSelect::onDOI(bool checked) +{ + Q_UNUSED(checked) + + Base::Console().Log("DOI\n"); + QString url = QString::fromStdString("https://doi.org/") + ui->editDOI->text(); + if (url.length() > 0) { + QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode)); + } +} + +void ModelSelect::onFavourite(bool checked) +{ + Q_UNUSED(checked) + + Base::Console().Log("Favorite\n"); + if (isFavorite(_selected)) { + removeFavorite(_selected); + } + else { + addFavorite(_selected); + } +} + +void ModelSelect::accept() +{ + addRecent(_selected); + QDialog::accept(); +} + +void ModelSelect::reject() +{ + QDialog::reject(); +} + +#include "moc_ModelSelect.cpp" diff --git a/src/Mod/Material/Gui/ModelSelect.h b/src/Mod/Material/Gui/ModelSelect.h new file mode 100644 index 0000000000..a80e98fe65 --- /dev/null +++ b/src/Mod/Material/Gui/ModelSelect.h @@ -0,0 +1,109 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_MODELSELECT_H +#define MATGUI_MODELSELECT_H + +#include + +#include +#include +#include +#include +#include + +#include +#include + +namespace fs = boost::filesystem; + +namespace MatGui +{ + +class Ui_ModelSelect; + +class ModelSelect: public QDialog +{ + Q_OBJECT + +public: + explicit ModelSelect( + QWidget* parent = nullptr, + Materials::ModelManager::ModelFilter filter = Materials::ModelManager::ModelFilter_None); + ~ModelSelect() override; + + void onURL(bool checked); + void onDOI(bool checked); + void onFavourite(bool checked); + void onSelectModel(const QItemSelection& selected, const QItemSelection& deselected); + const QString& selectedModel() const + { + return _selected; + } + void accept() override; + void reject() override; + +private: + void getFavorites(); + void saveFavorites(); + void addFavorite(const QString& uuid); + void removeFavorite(const QString& uuid); + bool isFavorite(const QString& uuid) const; + + void getRecents(); + void saveRecents(); + void addRecent(const QString& uuid); + bool isRecent(const QString& uuid) const; + + void addExpanded(QTreeView* tree, QStandardItem* parent, QStandardItem* child); + void addExpanded(QTreeView* tree, QStandardItemModel* parent, QStandardItem* child); + void addRecents(QStandardItem* parent); + void addFavorites(QStandardItem* parent); + void addModels(QStandardItem& parent, + const std::shared_ptr> modelTree, + const QIcon& icon); + void updateMaterialModel(const QString& uuid); + void clearMaterialModel(); + void createModelTree(); + void refreshModelTree(); + void fillTree(); + + void setHeaders(QStandardItemModel* model); + void setColumnWidths(QTableView* table); + void updateModelProperties(const Materials::Model& model); + void createModelProperties(); + Materials::ModelManager& getModelManager() + { + return _modelManager; + } + + Materials::ModelManager::ModelFilter _filter; + std::unique_ptr ui; + Materials::ModelManager _modelManager; + QString _selected; + std::list _favorites; + std::list _recents; + int _recentMax; +}; + +} // namespace MatGui + +#endif // MATGUI_MODELSELECT_H diff --git a/src/Mod/Material/Gui/ModelSelect.ui b/src/Mod/Material/Gui/ModelSelect.ui new file mode 100644 index 0000000000..5debe4e047 --- /dev/null +++ b/src/Mod/Material/Gui/ModelSelect.ui @@ -0,0 +1,197 @@ + + + MatGui::ModelSelect + + + + 0 + 0 + 705 + 489 + + + + Material Models + + + + + + Qt::Horizontal + + + + + 0 + + + + + 0 + 0 + + + + + 365 + 409 + + + + General + + + + + + + + URL + + + + + + + Description + + + + + + + DOI + + + + + + + true + + + + + + + true + + + true + + + + + + + Name + + + + + + + + + true + + + + + + + + 22 + 22 + + + + + + + + + + + + + + + true + + + + + + + + 22 + 22 + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Add to favorites + + + * + + + + + + + + + + Properties + + + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + diff --git a/src/Mod/Material/Gui/PreCompiled.cpp b/src/Mod/Material/Gui/PreCompiled.cpp new file mode 100644 index 0000000000..48eade6cc8 --- /dev/null +++ b/src/Mod/Material/Gui/PreCompiled.cpp @@ -0,0 +1,22 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "PreCompiled.h" diff --git a/src/Mod/Material/Gui/PreCompiled.h b/src/Mod/Material/Gui/PreCompiled.h new file mode 100644 index 0000000000..6c9e2163ab --- /dev/null +++ b/src/Mod/Material/Gui/PreCompiled.h @@ -0,0 +1,74 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#ifndef MATGUI_PRECOMPILED_H +#define MATGUI_PRECOMPILED_H + +#include + +// point at which warnings of overly long specifiers disabled (needed for VC6) +#ifdef _MSC_VER +#pragma warning(disable : 4251) +#pragma warning(disable : 4503) +#pragma warning(disable : 4786) // specifier longer then 255 chars +#pragma warning(disable : 4273) +#endif + +#ifdef FC_OS_WIN32 +#ifndef NOMINMAX +#define NOMINMAX +#endif +#include +#endif + +#ifdef _PreComp_ + +// standard +#include +#include + +// STL +#include +#include +#include +#include +#include + +// OpenCasCade +// #include + +// Boost +#include +#include + +// Qt Toolkit +#ifndef __QtAll__ +#include +#endif + +// // Inventor includes OpenGL +// #ifndef __InventorAll__ +// # include +// #endif + +#endif //_PreComp_ + +#endif // MATGUI_PRECOMPILED_H diff --git a/src/Mod/Material/Gui/Resources/Material.qrc b/src/Mod/Material/Gui/Resources/Material.qrc new file mode 100644 index 0000000000..467818d552 --- /dev/null +++ b/src/Mod/Material/Gui/Resources/Material.qrc @@ -0,0 +1,10 @@ + + + icons/MaterialWorkbench.svg + icons/Materials_Edit.svg + icons/preferences-material.svg + icons/preview-rendered.svg + icons/preview-vector.svg + icons/table.svg + + diff --git a/src/Mod/Material/Gui/Resources/icons/MaterialWorkbench.svg b/src/Mod/Material/Gui/Resources/icons/MaterialWorkbench.svg new file mode 100644 index 0000000000..a2937dbb71 --- /dev/null +++ b/src/Mod/Material/Gui/Resources/icons/MaterialWorkbench.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [Yorik van Havre] + + + Arch_Material + 2015-04-15 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Material.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + diff --git a/src/Mod/Material/Gui/Resources/icons/Materials_Edit.svg b/src/Mod/Material/Gui/Resources/icons/Materials_Edit.svg new file mode 100644 index 0000000000..a2937dbb71 --- /dev/null +++ b/src/Mod/Material/Gui/Resources/icons/Materials_Edit.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [Yorik van Havre] + + + Arch_Material + 2015-04-15 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Material.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + diff --git a/src/Mod/Material/Gui/Resources/icons/preferences-material.svg b/src/Mod/Material/Gui/Resources/icons/preferences-material.svg new file mode 100644 index 0000000000..a2937dbb71 --- /dev/null +++ b/src/Mod/Material/Gui/Resources/icons/preferences-material.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [Yorik van Havre] + + + Arch_Material + 2015-04-15 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Material.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + diff --git a/src/Mod/Material/Gui/Resources/icons/preview-rendered.svg b/src/Mod/Material/Gui/Resources/icons/preview-rendered.svg new file mode 100644 index 0000000000..415ceccce3 --- /dev/null +++ b/src/Mod/Material/Gui/Resources/icons/preview-rendered.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + $committer + + + preview-rendered + 2013-11-19 + http://www.freecad.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Material/Resources/icons/preview-rendered.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + diff --git a/src/Mod/Material/Gui/Resources/icons/preview-vector.svg b/src/Mod/Material/Gui/Resources/icons/preview-vector.svg new file mode 100644 index 0000000000..a35d81e5b0 --- /dev/null +++ b/src/Mod/Material/Gui/Resources/icons/preview-vector.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + $committer + + + preview-vector + 2013-11-19 + http://www.freecad.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Material/Resources/icons/preview-vector.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + diff --git a/src/Mod/Material/Gui/Resources/icons/table.svg b/src/Mod/Material/Gui/Resources/icons/table.svg new file mode 100644 index 0000000000..864b5da518 --- /dev/null +++ b/src/Mod/Material/Gui/Resources/icons/table.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Material/Gui/Resources/translations/Material.ts b/src/Mod/Material/Gui/Resources/translations/Material.ts new file mode 100644 index 0000000000..181e028255 --- /dev/null +++ b/src/Mod/Material/Gui/Resources/translations/Material.ts @@ -0,0 +1,85 @@ + + + + + MaterialEditor + + + Material Editor + + + + + Material card + + + + + Opens the Product URL of this material in an external browser + + + + + Existing material cards + + + + + Opens an existing material card + + + + + Open... + + + + + Saves this material as a card + + + + + Save as... + + + + + Material parameter + + + + + Add / remove parameter + + + + + Add property + + + + + Delete property + + + + + Material + + + Product URL + + + + + UserDefined + + + + + Name + + + + diff --git a/src/Mod/Material/Gui/Workbench.cpp b/src/Mod/Material/Gui/Workbench.cpp new file mode 100644 index 0000000000..21c244052f --- /dev/null +++ b/src/Mod/Material/Gui/Workbench.cpp @@ -0,0 +1,34 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" + +#include "Workbench.h" + +using namespace MatGui; + +/// @namespace MatGui @class Workbench +TYPESYSTEM_SOURCE(MatGui::Workbench, Gui::StdWorkbench) + +Workbench::Workbench() = default; + +Workbench::~Workbench() = default; diff --git a/src/Mod/Material/Gui/Workbench.h b/src/Mod/Material/Gui/Workbench.h new file mode 100644 index 0000000000..d0de5238c6 --- /dev/null +++ b/src/Mod/Material/Gui/Workbench.h @@ -0,0 +1,47 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#ifndef MATGUI_WORKBENCH_H +#define MATGUI_WORKBENCH_H + +#include +#include + +namespace MatGui +{ + +/** + * @author David Carter + */ +class MatGuiExport Workbench: public Gui::StdWorkbench +{ + TYPESYSTEM_HEADER_WITH_OVERRIDE(); + +public: + Workbench(); + ~Workbench() override; +}; + +} // namespace MatGui + + +#endif // MATGUI_WORKBENCH_H diff --git a/src/Mod/Material/Init.py b/src/Mod/Material/Init.py index 0d9a0df6b9..2f8d2ca577 100644 --- a/src/Mod/Material/Init.py +++ b/src/Mod/Material/Init.py @@ -23,3 +23,5 @@ import FreeCAD # import for the FreeCAD Material card FreeCAD.addImportType("FreeCAD Material Card (*.FCMat)", "importFCMat") + +FreeCAD.__unit_test__ += [ "TestMaterialsApp" ] diff --git a/src/Mod/Material/InitGui.py b/src/Mod/Material/InitGui.py index 56c021e2f3..898d045b01 100644 --- a/src/Mod/Material/InitGui.py +++ b/src/Mod/Material/InitGui.py @@ -18,4 +18,30 @@ #* USA * #* * #*************************************************************************** +"""Initialization of the Material Workbench graphical interface.""" +import FreeCAD as App +import FreeCADGui as Gui +import os + + +class MaterialWorkbench(Gui.Workbench): + """Part workbench object.""" + + def __init__(self): + self.__class__.Icon = os.path.join(App.getResourceDir(), + "Mod", "Material", + "Resources", "icons", + "MaterialWorkbench.svg") + self.__class__.MenuText = "Material" + self.__class__.ToolTip = "Material workbench" + + def Initialize(self): + # load the module + import MatGui + + def GetClassName(self): + return "MatGui::Workbench" + + +Gui.addWorkbench(MaterialWorkbench()) diff --git a/src/Mod/Material/Material.py b/src/Mod/Material/Material.py deleted file mode 100644 index e6a628c6e2..0000000000 --- a/src/Mod/Material/Material.py +++ /dev/null @@ -1,135 +0,0 @@ -# *************************************************************************** -# * Copyright (c) 2013-2015 Juergen Riegel * -# * * -# * This program is free software; you can redistribute it and/or modify * -# * it under the terms of the GNU Lesser General Public License (LGPL) * -# * as published by the Free Software Foundation; either version 2 of * -# * the License, or (at your option) any later version. * -# * for detail see the LICENCE text file. * -# * * -# * This program is distributed in the hope that it will be useful, * -# * but WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -# * GNU Library General Public License for more details. * -# * * -# * You should have received a copy of the GNU Library General Public * -# * License along with this program; if not, write to the Free Software * -# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * -# * USA * -# * * -# *************************************************************************** - -import sys -import FreeCAD - - -# The usage description if you use this tool from the command line ("__main__") -CommandlineUsage = """Material - Tool to work with FreeCAD Material definition cards - -Usage: - Material [Options] card-file-name - -Options: - -c, --output-csv=filename write a comma separated grid with the material data - -Exit: - 0 No Error or Warning found - 1 Argument error, wrong or too few Arguments given - -Tool to work with FreeCAD Material definition cards - -Examples: - - Material "StandardMaterial/Steel.FCMat" - -Author: - (c) 2013 Juergen Riegel - mail@juergen-riegel.net - Licence: LGPL - -Version: - 0.1 -""" - - -# see comments in module importFCMat, there is an independent parser implementation -# for reading and writing FCMat files -# inside FreeCAD mostly the one from importFCMat.py is used - - -def importFCMat(fileName): - "Read a FCMat file into a dictionary" - try: - import ConfigParser as configparser - except ImportError: - import configparser - - FreeCAD.Console.PrintError( - 'This mat card reader is probably deprecated and not widely used in FreeCAD. ' - 'See comment in Material.py module.\n' - ) - Config = configparser.RawConfigParser() - Config.optionxform = str - Config.read(fileName, encoding='utf-8') # respect unicode filenames - dict1 = {} - for section in Config.sections(): - options = Config.options(section) - for option in options: - dict1[option] = Config.get(section, option) - - return dict1 - - -def exportFCMat(fileName, matDict): - "Write a material dictionary to a FCMat file" - try: - import ConfigParser as configparser - except ImportError: - import configparser - import string - Config = configparser.RawConfigParser() - - FreeCAD.Console.PrintError( - 'This mat card writer is probably deprecated and not widely used in FreeCAD. ' - 'See comment in Material.py module.\n' - ) - # create groups - for x in matDict.keys(): - grp, key = string.split(x, sep='_') - if not Config.has_section(grp): - Config.add_section(grp) - - # fill groups - for x in matDict.keys(): - grp, key = string.split(x, sep='_') - Config.set(grp, key, matDict[x]) - - Preamble = "# This is a FreeCAD material-card file\n\n" - # Writing our configuration file to 'example.cfg' - with open(fileName, 'wb') as configfile: - configfile.write(Preamble) - Config.write(configfile) - - -if __name__ == '__main__': - import getopt - try: - opts, args = getopt.getopt(sys.argv[1:], "c:", ["output-csv="]) - except getopt.GetoptError: - # print help information and exit: - sys.stderr.write(CommandlineUsage) - sys.exit(1) - - # checking on the options - for o, a in opts: - if o in ("-c", "--output-csv"): - print("writing file: " + a + "\n") - OutPath = a - - # running through the files - FileName = args[0] - - kv_map = importFCMat(FileName) - for k in kv_map.keys(): - print(repr(k) + " : " + repr(kv_map[k])) - sys.exit(0) # no error diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index 044bd2f2f5..a21ded9da7 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -25,12 +25,15 @@ __author__ = "Yorik van Havre, Bernd Hahnebach" __url__ = "http://www.freecad.org" import os +from pathlib import PurePath import sys from PySide import QtCore, QtGui, QtSvg import FreeCAD import FreeCADGui # import Material_rc +from materialtools.cardutils import get_material_preferred_directory, get_material_preferred_save_directory + # is this still needed after the move to card utils??? unicode = str @@ -52,17 +55,21 @@ class MaterialEditor: self.customprops = [] self.internalprops = [] self.groups = [] - self.directory = FreeCAD.getResourceDir() + "Mod/Material" + self.directory = get_material_preferred_directory() + self.save_directory = get_material_preferred_save_directory() + if self.directory is None: + self.directory = FreeCAD.getResourceDir() + "Mod/Material" self.materials = {} self.cards = {} self.icons = {} self.initialIndex = -1 + self.edited = False self.card_path = card_path filePath = os.path.dirname(__file__) + os.sep self.iconPath = (filePath + "Resources" + os.sep + "icons" + os.sep) # load the UI file from the same directory as this script - self.widget = FreeCADGui.PySideUic.loadUi(filePath + "materials-editor.ui") + self.widget = FreeCADGui.PySideUic.loadUi(filePath + "Resources" + os.sep + "ui" + os.sep + "materials-editor.ui") # remove unused Help button self.widget.setWindowFlags(self.widget.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint) @@ -104,7 +111,7 @@ class MaterialEditor: # currently closes the dialog standardButtons.rejected.connect(self.reject) - standardButtons.accepted.connect(self.accept) + standardButtons.button(QtGui.QDialogButtonBox.Ok).clicked.connect(self.verify) buttonOpen.clicked.connect(self.openfile) buttonSave.clicked.connect(self.savefile) buttonURL.clicked.connect(self.openProductURL) @@ -117,6 +124,7 @@ class MaterialEditor: treeView.setModel(model) treeView.setUniformRowHeights(True) treeView.setItemDelegate(MaterialsDelegate()) + model.itemChanged.connect(self.modelChange) # init model self.implementModel() @@ -181,6 +189,7 @@ class MaterialEditor: # top.sortChildren(0) # treeView.expandAll() + self.edited = False def updateMatParamsInTree(self, data): @@ -220,10 +229,20 @@ class MaterialEditor: it = QtGui.QStandardItem(i) userGroup.appendRow([item, it]) self.customprops.append(k) + self.edited = False def chooseMaterial(self, index): if index < 0: return + + if self.verifyMaterial(): + """ + Save any unchanged data + """ + self.edited = False + else: + return + self.card_path = self.widget.ComboMaterial.itemData(index) FreeCAD.Console.PrintMessage( "choose_material in material editor:\n" @@ -239,6 +258,21 @@ class MaterialEditor: else: FreeCAD.Console.PrintError("Material card not found: {}\n".format(self.card_path)) + def verifyMaterial(self): + if self.edited: + reply = QtGui.QMessageBox.question(self.widget, #FreeCADGui.getMainWindow(), + translate("Material","The document has been modified."), + translate("Material","Do you want to save your changes?"), + QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel, + QtGui.QMessageBox.Save) + + if reply == QtGui.QMessageBox.Cancel: + return False + if reply == QtGui.QMessageBox.Save: + self.savefile() + + return True + def updateCardsInCombo(self): """updates the contents of the materials combo with existing material cards""" @@ -280,6 +314,32 @@ class MaterialEditor: if url: QtGui.QDesktopServices.openUrl(QtCore.QUrl(url, QtCore.QUrl.TolerantMode)) + def modelChange(self, item): + """ + Called when an item in the tree is modified. This will set edited to True, but this + will be reset in the event of mass updates, such as loading a card + """ + self.edited = True + + def verify(self, button): + """ + Verify that the user wants to save any changed data before exiting + """ + + if self.edited: + reply = QtGui.QMessageBox.question(self.widget, #FreeCADGui.getMainWindow(), + translate("Material","The document has been modified."), + translate("Material","Do you want to save your changes?"), + QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel, + QtGui.QMessageBox.Save) + + if reply == QtGui.QMessageBox.Cancel: + return + if reply == QtGui.QMessageBox.Save: + self.savefile() + + self.accept() + def accept(self): "" @@ -340,6 +400,7 @@ class MaterialEditor: it = QtGui.QStandardItem(value) top.appendRow([item, it]) self.customprops.append(key) + self.edited = True def deleteCustomProperty(self, key=None): @@ -376,6 +437,8 @@ class MaterialEditor: it.setText("") buttonDeleteProperty.setProperty("text", "Delete value") + self.edited = True + buttonDeleteProperty.setEnabled(False) def onClickTree(self, index): @@ -505,12 +568,20 @@ class MaterialEditor: return color.name() def openfile(self): + if self.verifyMaterial(): + """ + Save any unchanged data + """ + self.edited = False + else: + return + "Opens a FCMat file" if self.category == "Solid": directory = self.directory + os.sep + "StandardMaterial" else: directory = self.directory + os.sep + "FluidMaterial" - if self.card_path is None: + if self.card_path is None or len(self.card_path) == 0: self.card_path = directory filetuple = QtGui.QFileDialog.getOpenFileName( QtGui.QApplication.activeWindow(), @@ -529,8 +600,11 @@ class MaterialEditor: # D:/FreeCAD-build/data/Mod\Material\FluidMaterial\Air.FCMat # To keep it simple, we take a path from the ComboMaterial and change only the # material card filename - if self.initialIndex > -1: - path = self.widget.ComboMaterial.itemData(self.initialIndex) + # + # Using the initialIndex variable won't work before a card os selected for the + # first time, so use index 1. Index 0 is a blank entry + if self.widget.ComboMaterial.count() > 1: + path = self.widget.ComboMaterial.itemData(1) # at first check if we have a uniform usage # (if a character is not present, rsplit delivers the initial string) testBackslash = path.rsplit('\\', 1)[0] @@ -590,19 +664,27 @@ class MaterialEditor: filetuple = QtGui.QFileDialog.getSaveFileName( QtGui.QApplication.activeWindow(), "Save FreeCAD Material file", - self.directory + "/" + name + ".FCMat", + self.save_directory + "/" + name + ".FCMat", "*.FCMat" ) # a tuple of two empty strings returns True, so use the filename directly filename = filetuple[0] if filename: - self.directory = os.path.dirname(filename) - # should not be resource dir but user result dir instead + # Update the directories to the current save value + self.save_directory = os.path.dirname(filename) + self.directory = self.save_directory + self.card_path = filename + d = self.getDict() # self.outputDict(d) if d: + # Set the card name to match the filename + path = PurePath(filename) + d["CardName"] = path.stem + from importFCMat import write write(filename, d) + self.edited = False self.updateCardsInCombo() def show(self): @@ -854,8 +936,13 @@ def translate(context, text): def openEditor(obj=None, prop=None): """openEditor([obj,prop]): opens the editor, optionally with an object name and material property name to edit""" - editor = MaterialEditor(obj, prop) - editor.exec_() + param = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material/Cards") + legacy = param.GetBool("LegacyEditor", True) + if legacy: + editor = MaterialEditor(obj, prop) + editor.exec_() + else: + FreeCADGui.runCommand('Materials_Edit',0) def editMaterial(material=None, card_path=None, category="Solid"): diff --git a/src/Mod/Material/MaterialGlobal.h b/src/Mod/Material/MaterialGlobal.h new file mode 100644 index 0000000000..24aa8fdfb2 --- /dev/null +++ b/src/Mod/Material/MaterialGlobal.h @@ -0,0 +1,45 @@ +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include + +#ifndef MATERIAL_GLOBAL_H +#define MATERIAL_GLOBAL_H + +// Material +#ifndef MaterialsExport +#ifdef Material_EXPORTS +#define MaterialsExport FREECAD_DECL_EXPORT +#else +#define MaterialsExport FREECAD_DECL_IMPORT +#endif +#endif + +// MatGui +#ifndef MatGuiExport +#ifdef MatGui_EXPORTS +#define MatGuiExport FREECAD_DECL_EXPORT +#else +#define MatGuiExport FREECAD_DECL_IMPORT +#endif +#endif + +#endif // MATERIAL_GLOBAL_H diff --git a/src/Mod/Material/Resources/Material.qrc b/src/Mod/Material/Resources/Material.qrc index e3cc6f00c1..f5f3ad827c 100644 --- a/src/Mod/Material/Resources/Material.qrc +++ b/src/Mod/Material/Resources/Material.qrc @@ -2,5 +2,6 @@ icons/preview-rendered.svg icons/preview-vector.svg + ui/materials-editor.ui diff --git a/src/Mod/Material/Resources/Materials/Appearance/Aluminum.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Aluminum.FCMat new file mode 100644 index 0000000000..d33f1d0ef4 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Aluminum.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "d1f317f0-5ffa-4798-8ab3-af2ff0b5182c" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Aluminum" + Description: "Defines the Aluminum appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.3000, 0.3000, 0.3000, 1.0)" + DiffuseColor: "(0.3000, 0.3000, 0.3000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.0900" + SpecularColor: "(0.3000, 0.3000, 0.3000, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Brass.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Brass.FCMat new file mode 100644 index 0000000000..f17c932862 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Brass.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "4151e19c-fd6a-4ca4-83d4-d5e17d76cb9c" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Brass" + Description: "Defines the Brass appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.3294, 0.2235, 0.0275, 1.0)" + DiffuseColor: "(0.7804, 0.5686, 0.1137, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.2179" + SpecularColor: "(0.9922, 0.9412, 0.8078, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Bronze.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Bronze.FCMat new file mode 100644 index 0000000000..bc6c294526 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Bronze.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "ae194589-02d4-4e9b-98a7-f523f660d510" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Bronze" + Description: "Defines the Bronze appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.2125, 0.1275, 0.0540, 1.0)" + DiffuseColor: "(0.7140, 0.4284, 0.1814, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.2000" + SpecularColor: "(0.3935, 0.2719, 0.1667, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Chrome.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Chrome.FCMat new file mode 100644 index 0000000000..dccbfaec0e --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Chrome.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "a9544b88-dde7-4d05-9bdb-c008a4e88dc1" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Chrome" + Description: "Defines the Chrome appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.3500, 0.3500, 0.3500, 1.0)" + DiffuseColor: "(0.9176, 0.9176, 0.9176, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.1000" + SpecularColor: "(0.9746, 0.9746, 0.9746, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Copper.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Copper.FCMat new file mode 100644 index 0000000000..643ca6ed06 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Copper.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "524cad9b-b841-4037-9851-badeca7dcee2" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Copper" + Description: "Defines the Copper appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.3300, 0.2600, 0.2300, 1.0)" + DiffuseColor: "(0.5000, 0.1100, 0.0000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.9300" + SpecularColor: "(0.9500, 0.7300, 0.0000, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/DefaultAppearance.FCMat b/src/Mod/Material/Resources/Materials/Appearance/DefaultAppearance.FCMat new file mode 100644 index 0000000000..9795ceae40 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/DefaultAppearance.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "5dbb7be6-8b63-479b-ab4c-87be02ead973" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Default Appearance" + Description: "Defines the default appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.2000, 0.2000, 0.2000, 1.0)" + DiffuseColor: "(0.8000, 0.8000, 0.8000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.2000" + SpecularColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Emerald.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Emerald.FCMat new file mode 100644 index 0000000000..d98a8f1153 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Emerald.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "54def35f-a6bf-472e-8410-dc9fb4b143cf" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Emerald" + Description: "Defines the Emerald appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.0215, 0.1745, 0.0215, 1.0)" + DiffuseColor: "(0.0757, 0.6142, 0.0757, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.6000" + SpecularColor: "(0.6330, 0.7278, 0.6330, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Gold.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Gold.FCMat new file mode 100644 index 0000000000..170b7d1302 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Gold.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "85257e2c-be3f-40a1-b03f-0bd4ba58ca08" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Gold" + Description: "Defines the Gold appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.3000, 0.2306, 0.0953, 1.0)" + DiffuseColor: "(0.4000, 0.2760, 0.0000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.0625" + SpecularColor: "(0.9000, 0.8820, 0.7020, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Jade.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Jade.FCMat new file mode 100644 index 0000000000..3a956ebff2 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Jade.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "cddfa21f-0715-49dd-b35b-951c076fa52c" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Jade" + Description: "Defines the Jade appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.1350, 0.2225, 0.1575, 1.0)" + DiffuseColor: "(0.5400, 0.8900, 0.6300, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.1000" + SpecularColor: "(0.3162, 0.3162, 0.3162, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Metalized.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Metalized.FCMat new file mode 100644 index 0000000000..11892dc311 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Metalized.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "d149a177-07f1-4e53-9bad-0b5bf0663600" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Metalized" + Description: "Defines the Metalized appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.1800, 0.1800, 0.1800, 1.0)" + DiffuseColor: "(0.0000, 0.0000, 0.0000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.1300" + SpecularColor: "(0.4500, 0.4500, 0.4500, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/NeonGNC.FCMat b/src/Mod/Material/Resources/Materials/Appearance/NeonGNC.FCMat new file mode 100644 index 0000000000..ddf2092e1c --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/NeonGNC.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "c0341eef-0897-4fcf-a7f7-eddf1a2600a5" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Neon GNC" + Description: "Defines the Neon GNC appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.2000, 0.2000, 0.2000, 1.0)" + DiffuseColor: "(0.0000, 0.0000, 0.0000, 1.0)" + EmissiveColor: "(1.0000, 1.0000, 0.0000, 1.0)" + Shininess: "0.0500" + SpecularColor: "(0.6200, 0.6200, 0.6200, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/NeonPHC.FCMat b/src/Mod/Material/Resources/Materials/Appearance/NeonPHC.FCMat new file mode 100644 index 0000000000..ed315a25b6 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/NeonPHC.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "add2d6b2-c8fb-4777-a80a-52bae97300ae" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Neon PHC" + Description: "Defines the Neon PHC appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(1.0000, 1.0000, 1.0000, 1.0)" + DiffuseColor: "(1.0000, 1.0000, 1.0000, 1.0)" + EmissiveColor: "(0.0000, 0.9000, 0.4140, 1.0)" + Shininess: "0.0500" + SpecularColor: "(0.6200, 0.6200, 0.6200, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Obsidian.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Obsidian.FCMat new file mode 100644 index 0000000000..e4f366cff9 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Obsidian.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "a004c270-7d2c-4898-bec6-b1120edacea9" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Obsidian" + Description: "Defines the Obsidian appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.0538, 0.0500, 0.0662, 1.0)" + DiffuseColor: "(0.1828, 0.1700, 0.2253, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.3000" + SpecularColor: "(0.3327, 0.3286, 0.3464, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Pewter.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Pewter.FCMat new file mode 100644 index 0000000000..b7592ea3df --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Pewter.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "a61853b9-ec9f-403e-9726-0a938731aecd" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Pewter" + Description: "Defines the Pewter appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.1059, 0.0588, 0.1137, 1.0)" + DiffuseColor: "(0.4275, 0.4706, 0.5412, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.0769" + SpecularColor: "(0.3333, 0.3333, 0.5216, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Plaster.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Plaster.FCMat new file mode 100644 index 0000000000..70f6c8932a --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Plaster.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "569dccb6-c64b-4dd0-9d3c-1b78f40ad1a5" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Plaster" + Description: "Defines the Plaster appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.0500, 0.0500, 0.0500, 1.0)" + DiffuseColor: "(0.1167, 0.1167, 0.1167, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.0078" + SpecularColor: "(0.0305, 0.0305, 0.0305, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Plastic.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Plastic.FCMat new file mode 100644 index 0000000000..2484521dca --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Plastic.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "a74622cd-0e2d-4a96-b8c4-fefcc82ac694" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Plastic" + Description: "Defines the Plastic appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.1000, 0.1000, 0.1000, 1.0)" + DiffuseColor: "(0.0000, 0.0000, 0.0000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.0078" + SpecularColor: "(0.0600, 0.0600, 0.0600, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Ruby.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Ruby.FCMat new file mode 100644 index 0000000000..5a8138ba39 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Ruby.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "953261a0-cc48-41f8-a3f9-7b20ae3f9b56" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Ruby" + Description: "Defines the Ruby appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.1745, 0.0118, 0.0118, 1.0)" + DiffuseColor: "(0.6142, 0.0414, 0.0414, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.6000" + SpecularColor: "(0.7278, 0.6279, 0.6279, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Satin.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Satin.FCMat new file mode 100644 index 0000000000..97a198c206 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Satin.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "951b54ae-86b6-46d2-b452-60bd6a3ba1bb" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Satin" + Description: "Defines the Satin appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.0660, 0.0660, 0.0660, 1.0)" + DiffuseColor: "(0.0000, 0.0000, 0.0000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.0938" + SpecularColor: "(0.4400, 0.4400, 0.4400, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/ShinyPlastic.FCMat b/src/Mod/Material/Resources/Materials/Appearance/ShinyPlastic.FCMat new file mode 100644 index 0000000000..75853c01bc --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/ShinyPlastic.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "591c4c4a-22ba-4a9a-869d-e5610107d69a" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Shiny Plastic" + Description: "Defines the Shiny Plastic appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.0880, 0.0880, 0.0880, 1.0)" + DiffuseColor: "(0.0000, 0.0000, 0.0000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "1.0000" + SpecularColor: "(1.0000, 1.0000, 1.0000, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Silver.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Silver.FCMat new file mode 100644 index 0000000000..b3354a150a --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Silver.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "62839fb0-d854-4b44-92df-b7249213de49" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Silver" + Description: "Defines the Silver appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.1922, 0.1922, 0.1922, 1.0)" + DiffuseColor: "(0.5075, 0.5075, 0.5075, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.2000" + SpecularColor: "(0.5083, 0.5083, 0.5083, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Steel.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Steel.FCMat new file mode 100644 index 0000000000..7bebcd8a90 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Steel.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Steel" + Description: "Defines the Steel appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.0020, 0.0020, 0.0020, 1.0)" + DiffuseColor: "(0.0000, 0.0000, 0.0000, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.0600" + SpecularColor: "(0.9800, 0.9800, 0.9800, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/Appearance/Stone.FCMat b/src/Mod/Material/Resources/Materials/Appearance/Stone.FCMat new file mode 100644 index 0000000000..8c3910ee5d --- /dev/null +++ b/src/Mod/Material/Resources/Materials/Appearance/Stone.FCMat @@ -0,0 +1,15 @@ +# File created by ConvertFCMat.py +General: + UUID: "a9f54d61-cc98-46df-8734-b0543ceb4e45" + AuthorAndLicense: "(c) 2023 David Carter" + Name: "Stone" + Description: "Defines the Stone appearance properties" +AppearanceModels: + BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + AmbientColor: "(0.1900, 0.1520, 0.1178, 1.0)" + DiffuseColor: "(0.7500, 0.6000, 0.4650, 1.0)" + EmissiveColor: "(0.0000, 0.0000, 0.0000, 1.0)" + Shininess: "0.1700" + SpecularColor: "(0.0784, 0.0800, 0.0480, 1.0)" + Transparency: "0.0" diff --git a/src/Mod/Material/Resources/Materials/FluidMaterial/Air.FCMat b/src/Mod/Material/Resources/Materials/FluidMaterial/Air.FCMat new file mode 100644 index 0000000000..6a5be9c27c --- /dev/null +++ b/src/Mod/Material/Resources/Materials/FluidMaterial/Air.FCMat @@ -0,0 +1,25 @@ +# File created by ConvertFCMat.py +General: + UUID: "94370b96-c97e-4a3f-83b2-11d7461f7da7" + Name: "Air" + Description: "Dry air properties at 20 Degrees Celsius and 1 atm" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Gas" + Fluid: + UUID: '1ae66d8c-1ba1-4211-ad12-b9917573b202' + Density: "1.204 kg/m^3" + DynamicViscosity: "1.80e-5 kg/m/s" + KinematicViscosity: "1.511e-5 m^2/s" + PrandtlNumber: "0.7" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1.01 kJ/kg/K" + ThermalConductivity: "0.02587 W/m/K" + ThermalExpansionCoefficient: "3.43e-3 1/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + RelativePermittivity: "1.00059" + ElectricalConductivity: "1e-12 S/m" + RelativePermeability: "1.0" diff --git a/src/Mod/Material/Resources/Materials/FluidMaterial/Argon.FCMat b/src/Mod/Material/Resources/Materials/FluidMaterial/Argon.FCMat new file mode 100644 index 0000000000..1607bd59da --- /dev/null +++ b/src/Mod/Material/Resources/Materials/FluidMaterial/Argon.FCMat @@ -0,0 +1,25 @@ +# File created by ConvertFCMat.py +General: + UUID: "e359c5b5-eae2-42b1-9ef6-edde21d706ee" + Name: "Argon" + Description: "Argon properties at 20 Degrees Celsius and 1 atm" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Gas" + Fluid: + UUID: '1ae66d8c-1ba1-4211-ad12-b9917573b202' + Density: "1.641 kg/m^3" + DynamicViscosity: "22.3e-6 kg/m/s" + KinematicViscosity: "13.59-6 m^2/s" + PrandtlNumber: "0.7" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "0.520 kJ/kg/K" + ThermalConductivity: "0.018 W/m/K" + ThermalExpansionCoefficient: "3.43e-3 1/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + RelativePermittivity: "1.000513" + ElectricalConductivity: "1e-15 S/m" + RelativePermeability: "1.0" diff --git a/src/Mod/Material/Resources/Materials/FluidMaterial/Carbon_dioxide.FCMat b/src/Mod/Material/Resources/Materials/FluidMaterial/Carbon_dioxide.FCMat new file mode 100644 index 0000000000..7ffe282fed --- /dev/null +++ b/src/Mod/Material/Resources/Materials/FluidMaterial/Carbon_dioxide.FCMat @@ -0,0 +1,25 @@ +# File created by ConvertFCMat.py +General: + UUID: "ef0e4040-a498-48c3-a87b-e996bfd89195" + Name: "Carbon dioxide" + Description: "Carbon dioxide properties at 20 Degrees Celsius and 1 atm" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Gas" + Fluid: + UUID: '1ae66d8c-1ba1-4211-ad12-b9917573b202' + Density: "1.8393 kg/m^3" + DynamicViscosity: "14.7e-6 kg/m/s" + KinematicViscosity: "8.09e-6 m^2/s" + PrandtlNumber: "0.7651" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "0.8460 kJ/kg/K" + ThermalConductivity: "0.016242 W/m/K" + ThermalExpansionCoefficient: "3.43e-3 1/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + RelativePermittivity: "1.0009217" + ElectricalConductivity: "1e-12 S/m" + RelativePermeability: "1.0" diff --git a/src/Mod/Material/Resources/Materials/FluidMaterial/Nitrogen.FCMat b/src/Mod/Material/Resources/Materials/FluidMaterial/Nitrogen.FCMat new file mode 100644 index 0000000000..bd5fd3ea07 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/FluidMaterial/Nitrogen.FCMat @@ -0,0 +1,25 @@ +# File created by ConvertFCMat.py +General: + UUID: "8d02a797-5e0a-4e40-803a-75fc66de8de6" + Name: "Nitrogen" + Description: "Nitrogen properties at 20 Degrees Celsius and 1 atm" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Gas" + Fluid: + UUID: '1ae66d8c-1ba1-4211-ad12-b9917573b202' + Density: "1.2506 kg/m^3" + DynamicViscosity: "17.58e-6 kg/m/s" + KinematicViscosity: "14.06e-6 m^2/s" + PrandtlNumber: "0.7" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1.04 kJ/kg/K" + ThermalConductivity: "25.83e-3 W/m/K" + ThermalExpansionCoefficient: "3.43e-3 1/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + RelativePermittivity: "1.00058" + ElectricalConductivity: "1e-12 S/m" + RelativePermeability: "1.0" diff --git a/src/Mod/Material/Resources/Materials/FluidMaterial/None.FCMat b/src/Mod/Material/Resources/Materials/FluidMaterial/None.FCMat new file mode 100644 index 0000000000..40094e2d06 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/FluidMaterial/None.FCMat @@ -0,0 +1,16 @@ +# File created by ConvertFCMat.py +General: + UUID: "944a8018-09bf-48f6-a7b3-aa8f6a00a310" + Name: "None" + Description: "None" +Models: + Fluid: + UUID: '1ae66d8c-1ba1-4211-ad12-b9917573b202' + Density: "0 kg/m^3" + DynamicViscosity: "0 kg/m/s" + KinematicViscosity: "0 m^2/s" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "0 J/kg/K" + ThermalConductivity: "0 W/m/K" + ThermalExpansionCoefficient: "0 1/K" diff --git a/src/Mod/Material/Resources/Materials/FluidMaterial/Water.FCMat b/src/Mod/Material/Resources/Materials/FluidMaterial/Water.FCMat new file mode 100644 index 0000000000..aa4c8d35cc --- /dev/null +++ b/src/Mod/Material/Resources/Materials/FluidMaterial/Water.FCMat @@ -0,0 +1,26 @@ +# File created by ConvertFCMat.py +General: + UUID: "7e5559d5-be15-4571-a72f-20c39edd41cf" + Name: "Water" + Description: "Standard distilled water properties at 20 Degrees Celsius and 1 atm" + ReferenceSource: "''" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Gas" + Fluid: + UUID: '1ae66d8c-1ba1-4211-ad12-b9917573b202' + Density: "998 kg/m^3" + DynamicViscosity: "1.003e-3 kg/m/s" + KinematicViscosity: "1.005e-6 m^2/s" + PrandtlNumber: "7.56" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "4182 J/kg/K" + ThermalConductivity: "0.591 W/m/K" + ThermalExpansionCoefficient: "2.07e-4 m/m/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + RelativePermittivity: "80.0" + ElectricalConductivity: "5.5e-6 S/m" + RelativePermeability: "0.999992" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Concrete-EN-C35_45.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Concrete-EN-C35_45.FCMat new file mode 100644 index 0000000000..fa6eabb71f --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Concrete-EN-C35_45.FCMat @@ -0,0 +1,23 @@ +# File created by ConvertFCMat.py +General: + UUID: "dba76940-a910-4a3b-ab73-a9f412ac69d9" + AuthorAndLicense: "(c) 2019 Bernd Hahnebach (CC-BY 3.0)" + Name: "Concrete-EN-C35/45" + Description: "Concrete matrix for reinforcement material examples, 0.6 x 0.75 x 35 MPa = 15.75 MPa (https://forum.freecad.org/viewtopic.php?f=18&t=33106&start=200#p311075)" +Inherits: + Stone: + UUID: "a9f54d61-cc98-46df-8734-b0543ceb4e45" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Aggregate" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + AngleOfFriction: "30 deg" + CompressiveStrength: "15.75 MPa" + Density: "2500 kg/m^3" + PoissonRatio: "0.17" + YoungsModulus: "32000 MPa" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Concrete" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Concrete-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Concrete-Generic.FCMat new file mode 100644 index 0000000000..994874548d --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Concrete-Generic.FCMat @@ -0,0 +1,25 @@ +# File created by ConvertFCMat.py +General: + UUID: "26042aa5-56e6-4d99-8b63-dd8b9ea5a37a" + AuthorAndLicense: "(c) 2013 Yorik van Havre (CC-BY 3.0)" + Name: "Concrete" + Description: "A standard C-25 construction concrete" +Inherits: + Stone: + UUID: "a9f54d61-cc98-46df-8734-b0543ceb4e45" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Aggregate" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + StandardCode: "Masterformat 03 33 13" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "25 MPa" + Density: "2400 kg/m^3" + PoissonRatio: "0.17" + YoungsModulus: "32000 MPa" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Concrete" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Reinforcement-FIB-B500.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Reinforcement-FIB-B500.FCMat new file mode 100644 index 0000000000..13ac6afc77 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Aggregate/Reinforcement-FIB-B500.FCMat @@ -0,0 +1,16 @@ +# File created by ConvertFCMat.py +General: + UUID: "57507cd4-d22f-4d86-9794-fdb1ec8cd098" + AuthorAndLicense: "(c) 2019 Bernd Hahnebach (CC-BY 3.0)" + Name: "Reinforcement-Harry" + Description: "Reinforcement inside concrete for reinforcement material examples, from fib examples, 0.84 x 0.75 x 500 MPa = 315 MPa (https://forum.freecad.org/viewtopic.php?f=18&t=33106&start=200#p311705)" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7850 kg/m^3" + PoissonRatio: "0.3" + YieldStrength: "315 MPa" + YoungsModulus: "210000 MPa" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Carbon/Graphite.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Carbon/Graphite.FCMat new file mode 100644 index 0000000000..e66b987f2e --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Carbon/Graphite.FCMat @@ -0,0 +1,32 @@ +# File created by ConvertFCMat.py +General: + UUID: "5c67b675-69a2-4782-902a-bb90c3952f07" + AuthorAndLicense: "Uwe Stöhr, LGPL" + Name: "Graphite" + Description: "Typical material properties for pure graphite" + ReferenceSource: "Properties and characteristics of graphite" + SourceURL: "https://www.entegris.com/content/dam/web/resources/manuals-and-guides/manual-properties-and-characteristics-of-graphite-109441.pdf" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Carbon" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Solid" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "120.000 MPa" + Density: "1750.000 kg/m^3" + PoissonRatio: "0.20" + UltimateTensileStrength: "34 MPa" + YoungsModulus: "11.7 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "0.72 kJ/kg/K" + ThermalConductivity: "96.000 W/m/K" + ThermalExpansionCoefficient: "8e-6 1/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + RelativePermittivity: "0.7" + ElectricalConductivity: "2e4 S/m" + RelativePermeability: "1.0" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-E-GlassFibre.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-E-GlassFibre.FCMat new file mode 100644 index 0000000000..034f5271f0 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-E-GlassFibre.FCMat @@ -0,0 +1,18 @@ +# File created by ConvertFCMat.py +General: + UUID: "a02bf9d7-6e3e-4e36-881b-10779ee9f706" + AuthorAndLicense: "(c) 2015 DaviKaur (CC-BY 3.0)" + Name: "Glass-E" + Description: "Glass Fibre" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Glass" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "1080 MPa" + Density: "2580 kg/m^3" + UltimateTensileStrength: "3445 MPa" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Glass_fiber" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-Generic.FCMat new file mode 100644 index 0000000000..1502a1e85b --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-Generic.FCMat @@ -0,0 +1,23 @@ +# File created by ConvertFCMat.py +General: + UUID: "3e3a3e13-04a4-410e-8e36-bbd83ca66847" + AuthorAndLicense: "(c) 2015 Przemo Firszt (CC-BY 3.0)" + Name: "Glass" + Description: "Generic soda-lime glass" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Glass" + Density: + UUID: '454661e5-265b-4320-8e6f-fcf6223ac3af' + Density: "2520 kg/m^3" + IsotropicLinearElastic: + UUID: 'f6f9e48c-b116-4e82-ad7f-3659a9219c50' + PoissonRatio: "0.22" + YoungsModulus: "72000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000009 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Soda-lime_glass" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-S2-GlassFibre.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-S2-GlassFibre.FCMat new file mode 100644 index 0000000000..79d993d62d --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Glass/Glass-S2-GlassFibre.FCMat @@ -0,0 +1,18 @@ +# File created by ConvertFCMat.py +General: + UUID: "0c4943e0-248b-4df9-88d9-3b4dd84dfc68" + AuthorAndLicense: "(c) 2015 DaviKaur (CC-BY 3.0)" + Name: "Glass-S2" + Description: "Glass Fibre" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Glass" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "1600 MPa" + Density: "2460 kg/m^3" + UltimateTensileStrength: "4890 MPa" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Glass_fiber" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Alloys/Invar-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Alloys/Invar-Generic.FCMat new file mode 100644 index 0000000000..1653bde1ae --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Alloys/Invar-Generic.FCMat @@ -0,0 +1,27 @@ +# File created by ConvertFCMat.py +General: + UUID: "27745e16-2a10-4c8e-bd22-59971806909c" + AuthorAndLicense: "Uwe Stöhr" + Name: "Invar Generic" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Nickel Iron Alloy" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "8150 kg/m^3" + PoissonRatio: "0.29" + ShearModulus: "56.0 GPa" + UltimateTensileStrength: "600 MPa" + YoungsModulus: "140.0 GPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "515.0 J/kg/K" + ThermalConductivity: "13.5 W/m/K" + ThermalExpansionCoefficient: "1.25 µm/m/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + ElectricalConductivity: "1250000 S/m" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlMg3F24.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlMg3F24.FCMat new file mode 100644 index 0000000000..d3ea2edf4c --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlMg3F24.FCMat @@ -0,0 +1,31 @@ +# File created by ConvertFCMat.py +General: + UUID: "0051bddf-6f62-4406-b8c9-569322880564" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "AlMg3F24" +Inherits: + Aluminum: + UUID: "d1f317f0-5ffa-4798-8ab3-af2ff0b5182c" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Aluminium" + MaterialNumber: "3.3535.26" + StandardCode: "DIN 1725" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "2700 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "27000 MPa" + UltimateStrain: "5" + UltimateTensileStrength: "250 MPa" + YieldStrength: "180 MPa" + YoungsModulus: "70000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "900 J/kg/K" + ThermalConductivity: "150 W/m/K" + ThermalExpansionCoefficient: "23 µm/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlMgSi1F31.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlMgSi1F31.FCMat new file mode 100644 index 0000000000..ce7ad3a053 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlMgSi1F31.FCMat @@ -0,0 +1,31 @@ +# File created by ConvertFCMat.py +General: + UUID: "460e02a3-b6cd-4662-b2f6-8c9d44146c66" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "AlMgSi1F31" +Inherits: + Aluminum: + UUID: "d1f317f0-5ffa-4798-8ab3-af2ff0b5182c" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Aluminium" + MaterialNumber: "3.2315.72" + StandardCode: "DIN 1725" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "2700 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "27000 MPa" + UltimateStrain: "10" + UltimateTensileStrength: "310 MPa" + YieldStrength: "260 MPa" + YoungsModulus: "70000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "896 J/kg/K" + ThermalConductivity: "160 W/m/K" + ThermalExpansionCoefficient: "23 µm/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlZn4-5Mg1F35.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlZn4-5Mg1F35.FCMat new file mode 100644 index 0000000000..9ff117b0ed --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/AlZn4-5Mg1F35.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "05f8f1b2-b92b-4e41-8de9-1e064e78a165" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "AlZn4,5Mg1F35" +Inherits: + Aluminum: + UUID: "d1f317f0-5ffa-4798-8ab3-af2ff0b5182c" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Aluminium" + MaterialNumber: "3.4335.71" + StandardCode: "DIN 1725" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "2700 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "27000 MPa" + UltimateStrain: "10" + UltimateTensileStrength: "350 MPa" + YieldStrength: "290 MPa" + YoungsModulus: "70000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000023 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/Aluminum-6061-T6.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/Aluminum-6061-T6.FCMat new file mode 100644 index 0000000000..648350b109 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/Aluminum-6061-T6.FCMat @@ -0,0 +1,28 @@ +# File created by ConvertFCMat.py +General: + UUID: "68b152b2-fd5e-4f10-8db0-1a2df3fe0fda" + AuthorAndLicense: "(c) 2016 Mandeep Singh (CC-BY 3.0)" + Name: "Aluminum 6061-T6" + Description: "Precipitation-hardened, Nonferrous Aluminum alloy" +Inherits: + Aluminum: + UUID: "d1f317f0-5ffa-4798-8ab3-af2ff0b5182c" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Aluminium" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "2700 kg/m^3" + PoissonRatio: "0.33" + UltimateTensileStrength: "310 MPa" + YoungsModulus: "69000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalConductivity: "167 W/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/6061_aluminium_alloy" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/Aluminum-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/Aluminum-Generic.FCMat new file mode 100644 index 0000000000..c518eaf674 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Aluminum/Aluminum-Generic.FCMat @@ -0,0 +1,31 @@ +# File created by ConvertFCMat.py +General: + UUID: "9bf060e9-1663-44a2-88e2-2ff6ee858efe" + AuthorAndLicense: "Uwe Stöhr" + Name: "Aluminum Generic" +Inherits: + Aluminum: + UUID: "d1f317f0-5ffa-4798-8ab3-af2ff0b5182c" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Aluminium" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "2700 kg/m^3" + PoissonRatio: "0.35" + ShearModulus: "25.0 GPa" + UltimateTensileStrength: "310 MPa" + YoungsModulus: "70000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "897.0 J/kg/K" + ThermalConductivity: "237.0 W/m/K" + ThermalExpansionCoefficient: "23.1 µm/m/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + ElectricalConductivity: "370370.4 S/m" + RelativePermeability: "1.0" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Copper/Copper-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Copper/Copper-Generic.FCMat new file mode 100644 index 0000000000..8188c3a553 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Copper/Copper-Generic.FCMat @@ -0,0 +1,32 @@ +# File created by ConvertFCMat.py +General: + UUID: "6c03899d-496e-4c60-a41b-3d66f2337fb9" + AuthorAndLicense: "Uwe Stöhr" + Name: "Copper Generic" +Inherits: + Copper: + UUID: "524cad9b-b841-4037-9851-badeca7dcee2" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Copper" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "8960 kg/m^3" + PoissonRatio: "0.343" + ShearModulus: "46.0 GPa" + UltimateTensileStrength: "210 MPa" + YieldStrength: "33.3 MPa" + YoungsModulus: "119 GPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "385.0 J/kg/K" + ThermalConductivity: "398.0 W/m/K" + ThermalExpansionCoefficient: "16.5 µm/m/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + ElectricalConductivity: "59.59 MS/m" + RelativePermeability: "0.999994" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Iron/Iron-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Iron/Iron-Generic.FCMat new file mode 100644 index 0000000000..f99d52a37f --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Iron/Iron-Generic.FCMat @@ -0,0 +1,32 @@ +# File created by ConvertFCMat.py +General: + UUID: "1826c364-d26a-43fb-8f61-288281236836" + AuthorAndLicense: "Uwe Stöhr" + Name: "Iron Generic" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Iron" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7874 kg/m^3" + PoissonRatio: "0.29" + ShearModulus: "82.0 GPa" + UltimateTensileStrength: "497 MPa" + YieldStrength: "428 MPa" + YoungsModulus: "211 GPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "460.5 J/kg/K" + ThermalConductivity: "80.4 W/m/K" + ThermalExpansionCoefficient: "11.8 µm/m/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + ElectricalConductivity: "10.3 MS/m" + RelativePermeability: "5000.0" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat new file mode 100644 index 0000000000..7763a27728 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat @@ -0,0 +1,25 @@ +# File created by ConvertFCMat.py +General: + UUID: "92589471-a6cb-4bbc-b748-d425a17dea7d" + AuthorAndLicense: "(c) 2013 Juergen Riegel (CC-BY 3.0)" + Name: "CalculiX-Steel" + Description: "Standard steel material for CalculiX sample calculations" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + Density: + UUID: '454661e5-265b-4320-8e6f-fcf6223ac3af' + Density: "7900 kg/m^3" + IsotropicLinearElastic: + UUID: 'f6f9e48c-b116-4e82-ad7f-3659a9219c50' + PoissonRatio: "0.3" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "590 J/kg/K" + ThermalConductivity: "43 W/m/K" + ThermalExpansionCoefficient: "0.000012 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-15CrNi6.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-15CrNi6.FCMat new file mode 100644 index 0000000000..c1be13ce98 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-15CrNi6.FCMat @@ -0,0 +1,30 @@ +# File created by ConvertFCMat.py +General: + UUID: "6822df30-db32-4a68-a8d7-aaddcb9649d1" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "15CrNi6" + Description: "High-strength carbon steel" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Case-hardened steel" + MaterialNumber: "1.5919" + StandardCode: "EN 10084" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "9" + UltimateTensileStrength: "1000 MPa" + YieldStrength: "680 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-17CrNiMo6.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-17CrNiMo6.FCMat new file mode 100644 index 0000000000..462e784536 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-17CrNiMo6.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "e4c76f15-00af-4498-ac57-beaf49c150e9" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "17CrNiMo6" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Case-hardened steel" + MaterialNumber: "1.6587" + StandardCode: "EN 10084" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "8" + UltimateTensileStrength: "1150 MPa" + YieldStrength: "830 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C22.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C22.FCMat new file mode 100644 index 0000000000..f36307b08d --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C22.FCMat @@ -0,0 +1,30 @@ +# File created by ConvertFCMat.py +General: + UUID: "c424fe3d-5f49-4c39-9467-8a2a800076aa" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "1C22" + Description: "Case hardened alloy steel" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.0402" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "27" + UltimateTensileStrength: "400 MPa" + YieldStrength: "230 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C35.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C35.FCMat new file mode 100644 index 0000000000..8cc577729a --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C35.FCMat @@ -0,0 +1,30 @@ +# File created by ConvertFCMat.py +General: + UUID: "cd932bad-4085-459f-aea6-1da737ae38ae" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "1C35" + Description: "Non-alloy quality steel" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.0501" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "21" + UltimateTensileStrength: "480 MPa" + YieldStrength: "300 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C45.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C45.FCMat new file mode 100644 index 0000000000..9433799bcb --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C45.FCMat @@ -0,0 +1,30 @@ +# File created by ConvertFCMat.py +General: + UUID: "958b7a5c-4764-4a2f-a450-2153a41fb5ec" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "1C45" + Description: "Non-alloy quality steel" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.0503" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "14" + UltimateTensileStrength: "580 MPa" + YieldStrength: "340 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C60.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C60.FCMat new file mode 100644 index 0000000000..dac83e2809 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-1C60.FCMat @@ -0,0 +1,30 @@ +# File created by ConvertFCMat.py +General: + UUID: "9717f953-1cfc-41a6-8974-3ad45188ad48" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "1C60" + Description: "Non-alloy quality steel" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.0601" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "11" + UltimateTensileStrength: "650 MPa" + YieldStrength: "380 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-20NiCrMo2.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-20NiCrMo2.FCMat new file mode 100644 index 0000000000..f63fc2cd6b --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-20NiCrMo2.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "1c759697-7aef-4a14-92c5-5bf84b99a4f0" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "20NiCrMo2" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Case-hardened steel" + MaterialNumber: "1.6523" + StandardCode: "EN 10084" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "10" + UltimateTensileStrength: "900 MPa" + YieldStrength: "630 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-28Mn6.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-28Mn6.FCMat new file mode 100644 index 0000000000..5166ff1d58 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-28Mn6.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "6894c597-5771-4b56-825f-ce7d5e4689f4" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "28Mn6" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.117" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "13" + UltimateTensileStrength: "800 MPa" + YieldStrength: "590 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-2C10.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-2C10.FCMat new file mode 100644 index 0000000000..bb25674809 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-2C10.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "a7be39a1-1686-4fee-a1d5-81ef73b82d16" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "2C10" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Case-hardened steel" + MaterialNumber: "1.1121" + StandardCode: "EN 10084" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "640 MPa" + YieldStrength: "390 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-30CrNiMo8.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-30CrNiMo8.FCMat new file mode 100644 index 0000000000..b8edc93d8e --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-30CrNiMo8.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "a6d96264-affc-4406-9816-75099c1fa0d9" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "30CrNiMo8" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.658" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "9" + UltimateTensileStrength: "1250 MPa" + YieldStrength: "1050 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-34CrNiMo6.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-34CrNiMo6.FCMat new file mode 100644 index 0000000000..4c02195cf8 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-34CrNiMo6.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "e69448d5-2517-4c00-9e70-ebeb11ca017f" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "34CrNiMo6" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.6582" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "9" + UltimateTensileStrength: "1200 MPa" + YieldStrength: "1000 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-36CrNiMo4.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-36CrNiMo4.FCMat new file mode 100644 index 0000000000..f1635de298 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-36CrNiMo4.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "3e78b767-5530-4d69-a541-cf33a5a2ad19" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "36CrNiMo4" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.6511" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "10" + UltimateTensileStrength: "1100 MPa" + YieldStrength: "900 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-36NiCrMo16.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-36NiCrMo16.FCMat new file mode 100644 index 0000000000..1a9e29753a --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-36NiCrMo16.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "3fdf729c-bec4-4bfa-ba94-b0c9e51a2040" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "36NiCrMo16" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.6773" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "9" + UltimateTensileStrength: "1250 MPa" + YieldStrength: "1050 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C15.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C15.FCMat new file mode 100644 index 0000000000..6ad2a41287 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C15.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "605fd7b6-caa3-400d-b6d7-ed52c0f5da21" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "3C15" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Case-hardened steel" + MaterialNumber: "1.114" + StandardCode: "EN 10084" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "740 MPa" + YieldStrength: "440 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C22.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C22.FCMat new file mode 100644 index 0000000000..19c035f0a4 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C22.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "7313f076-faf4-41dd-8dae-1b9a586990dc" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "3C22" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1149" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "24" + UltimateTensileStrength: "550 MPa" + YieldStrength: "350 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C35.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C35.FCMat new file mode 100644 index 0000000000..583523ea88 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3C35.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "251cc54e-4a5a-4cd3-9c9e-006c416d7ce9" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "3C35" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.118" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "17" + UltimateTensileStrength: "630 MPa" + YieldStrength: "430 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3V45.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3V45.FCMat new file mode 100644 index 0000000000..193f19e1b9 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-3V45.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "d2e12a80-fd17-42db-99d8-62971f65ee84" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "3V45" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1201" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "14" + UltimateTensileStrength: "700 MPa" + YieldStrength: "500 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C10.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C10.FCMat new file mode 100644 index 0000000000..b72f563c88 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C10.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "9086ae2f-3b2e-4654-9665-0fe31effb8a2" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C10" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Case-hardened steel" + MaterialNumber: "1.0301" + StandardCode: "DIN 17210" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "16" + UltimateTensileStrength: "650 MPa" + YieldStrength: "380 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C15.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C15.FCMat new file mode 100644 index 0000000000..6a11819478 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C15.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "06ae5c92-de7b-46c9-984d-4dd87964bc5c" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C15" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Case-hardened steel" + MaterialNumber: "1.0401" + StandardCode: "DIN 17210" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "14" + UltimateTensileStrength: "750 MPa" + YieldStrength: "430 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C22E.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C22E.FCMat new file mode 100644 index 0000000000..932930426e --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C22E.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "befa2489-dba0-41c5-aa83-7cca2ac8947b" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C22E" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1151" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "20" + UltimateTensileStrength: "500 MPa" + YieldStrength: "340 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C25E.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C25E.FCMat new file mode 100644 index 0000000000..12f65b3acc --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C25E.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "b95d3de5-36af-41cd-a6dd-3f647b1d4eee" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C25E" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1158" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "19" + UltimateTensileStrength: "550 MPa" + YieldStrength: "370 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C30E.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C30E.FCMat new file mode 100644 index 0000000000..d6cfe2d8c3 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C30E.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "e88e1e86-fad2-4c70-b185-4b2975e7fba5" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C30E" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1178" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "18" + UltimateTensileStrength: "600 MPa" + YieldStrength: "400 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C40E.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C40E.FCMat new file mode 100644 index 0000000000..c777dc3028 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C40E.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "5b33f177-b0da-4ffa-acb5-a3b23ab6e630" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C40E" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1186" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "16" + UltimateTensileStrength: "650 MPa" + YieldStrength: "460 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C50E.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C50E.FCMat new file mode 100644 index 0000000000..3a73bb97f7 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C50E.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "6821be5f-5471-4939-bb1d-866f83018090" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C50E" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1206" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "13" + UltimateTensileStrength: "750 MPa" + YieldStrength: "520 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C55E.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C55E.FCMat new file mode 100644 index 0000000000..be4341ad95 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C55E.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "d60a21c9-9c4b-4463-b133-bb0e84ce46b2" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C55E" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1203" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "13" + UltimateTensileStrength: "800 MPa" + YieldStrength: "550 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C60E.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C60E.FCMat new file mode 100644 index 0000000000..7c0c04301b --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-C60E.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "56027b3e-876e-4c0e-9f39-242feaa67e13" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "C60E" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Heat-treatable steel" + MaterialNumber: "1.1221" + StandardCode: "EN 10083-1" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "13" + UltimateTensileStrength: "850 MPa" + YieldStrength: "580 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E295-GC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E295-GC.FCMat new file mode 100644 index 0000000000..9b314d4c01 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E295-GC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "fc010ef8-91de-4099-9a73-605c01dd117c" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "E295 GC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0533" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "590 MPa" + YieldStrength: "420 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E295.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E295.FCMat new file mode 100644 index 0000000000..e74c218799 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E295.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "f1567a1c-995f-4feb-8baf-09ade3e830c5" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "E295" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.005" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "20" + UltimateTensileStrength: "490 MPa" + YieldStrength: "295 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E335-GC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E335-GC.FCMat new file mode 100644 index 0000000000..9612056c9b --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E335-GC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "ab901ecc-d880-4cb4-b400-dbe4fd9b0f0a" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "E335 GC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0543" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "690 MPa" + YieldStrength: "490 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E335.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E335.FCMat new file mode 100644 index 0000000000..7ca7e2a764 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E335.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "da418876-f80e-4793-8fc8-a6040a694389" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "E335" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.006" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "16" + UltimateTensileStrength: "590 MPa" + YieldStrength: "335 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E360-GC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E360-GC.FCMat new file mode 100644 index 0000000000..aa14d78d49 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E360-GC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "4c311592-659b-4ef0-bac9-5cffe9e70612" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "E360 GC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0633" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "780 MPa" + YieldStrength: "560 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E360.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E360.FCMat new file mode 100644 index 0000000000..6ed1535ce0 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-E360.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "dfba065e-2bfb-4fe3-8eec-dfb1cb6274fe" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "E360" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.007" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "11" + UltimateTensileStrength: "690 MPa" + YieldStrength: "360 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-100.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-100.FCMat new file mode 100644 index 0000000000..282a042e41 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-100.FCMat @@ -0,0 +1,28 @@ +# File created by ConvertFCMat.py +General: + UUID: "5a1d56e3-8180-4f81-a0d7-887fb08e3752" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJL-100" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.601" + StandardCode: "EN 1561" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "34000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "100 MPa" + YoungsModulus: "88000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-150.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-150.FCMat new file mode 100644 index 0000000000..f4c9e2ca3c --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-150.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "7a2aa3c4-10fa-44b0-9420-37ae74207fa3" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJL-150" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.6015" + StandardCode: "EN 1561" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "37000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "150 MPa" + YieldStrength: "98 MPa" + YoungsModulus: "95000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-200.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-200.FCMat new file mode 100644 index 0000000000..aca3e5b83a --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-200.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "8ae26e72-65b6-4f93-9fbe-9e3f17a2e1b5" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJL-200" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.602" + StandardCode: "EN 1561" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "40000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "200 MPa" + YieldStrength: "130 MPa" + YoungsModulus: "105000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-250.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-250.FCMat new file mode 100644 index 0000000000..13d4da1f70 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-250.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "71f32e31-656e-4f94-a5f0-5b656b9367c6" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJL-250" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.6025" + StandardCode: "EN 1561" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "44000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "250 MPa" + YieldStrength: "165 MPa" + YoungsModulus: "115000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-300.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-300.FCMat new file mode 100644 index 0000000000..489a2e3c24 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-300.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "6db01463-7772-4d0e-ab81-fae6d45ce669" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJL-300" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.603" + StandardCode: "EN 1561" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "48000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "300 MPa" + YieldStrength: "195 MPa" + YoungsModulus: "125000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-350.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-350.FCMat new file mode 100644 index 0000000000..9922275365 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJL-350.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "c4ff4bef-4885-41d5-904f-9c71a8018c98" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJL-350" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.6035" + StandardCode: "EN 1561" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "52000 MPa" + UltimateStrain: "15" + UltimateTensileStrength: "350 MPa" + YieldStrength: "228 MPa" + YoungsModulus: "135000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-350-10.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-350-10.FCMat new file mode 100644 index 0000000000..05dc53a302 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-350-10.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "eec1833a-424a-4c4f-bdf2-6f8377845d54" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJMB-350-10" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.8135" + StandardCode: "EN 1562" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "10" + UltimateTensileStrength: "350 MPa" + YieldStrength: "200 MPa" + YoungsModulus: "175000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-550-4.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-550-4.FCMat new file mode 100644 index 0000000000..7e8b518d5c --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-550-4.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "095140bb-df01-4bb9-8ff3-062aa91ec48c" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJMB-550-4" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.8155" + StandardCode: "EN 1562" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "2" + UltimateTensileStrength: "550 MPa" + YieldStrength: "340 MPa" + YoungsModulus: "175000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-650-2.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-650-2.FCMat new file mode 100644 index 0000000000..d22fcd93ad --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMB-650-2.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "490a348c-f508-4599-a5e0-2f6b211126d5" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJMB-650-2" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.8165" + StandardCode: "EN 1562" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "2" + UltimateTensileStrength: "650 MPa" + YieldStrength: "430 MPa" + YoungsModulus: "175000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-350-4.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-350-4.FCMat new file mode 100644 index 0000000000..148e26a9b3 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-350-4.FCMat @@ -0,0 +1,28 @@ +# File created by ConvertFCMat.py +General: + UUID: "a97c3eab-a1e8-472b-ba40-519a0d660019" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJMW-350-4" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.8035" + StandardCode: "EN 1562" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "4" + UltimateTensileStrength: "350 MPa" + YoungsModulus: "175000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-360-12.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-360-12.FCMat new file mode 100644 index 0000000000..604538d200 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-360-12.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "81a865af-79b6-4e0b-98ad-5cde134ad99e" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJMW-360-12" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.8038" + StandardCode: "EN 1562" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "5" + UltimateTensileStrength: "380 MPa" + YieldStrength: "200 MPa" + YoungsModulus: "175000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-400-5.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-400-5.FCMat new file mode 100644 index 0000000000..db74ef871c --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-400-5.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "9d71fc9c-960a-47e8-afa8-a86a24b3ff89" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJMW-400-5" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.804" + StandardCode: "EN 1562" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "7" + UltimateTensileStrength: "400 MPa" + YieldStrength: "220 MPa" + YoungsModulus: "175000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-450-7.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-450-7.FCMat new file mode 100644 index 0000000000..0e6de5ac4e --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJMW-450-7.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "c0eedc49-d63b-429d-be63-ef0ea442f45c" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJMW-450-7" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.8045" + StandardCode: "EN 1562" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "10" + UltimateTensileStrength: "450 MPa" + YieldStrength: "260 MPa" + YoungsModulus: "175000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.00001 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-400-15.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-400-15.FCMat new file mode 100644 index 0000000000..ab7c0b2163 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-400-15.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "f6300691-ecf0-4846-acb1-8c2bad3359a8" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJS-400-15" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.704" + StandardCode: "EN 1563" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "65000 MPa" + UltimateStrain: "15" + UltimateTensileStrength: "400 MPa" + YieldStrength: "250 MPa" + YoungsModulus: "167000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-500-7.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-500-7.FCMat new file mode 100644 index 0000000000..5a28f4356f --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-500-7.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "51aabe6f-642b-4f47-9006-1c8c3613a422" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJS-500-7" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.705" + StandardCode: "EN 1563" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "66000 MPa" + UltimateStrain: "2" + UltimateTensileStrength: "500 MPa" + YieldStrength: "320 MPa" + YoungsModulus: "170000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-600-3.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-600-3.FCMat new file mode 100644 index 0000000000..0f3f5d7ed9 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-600-3.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "eb573f18-5a7b-493b-bfda-d711f03f7f71" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJS-600-3" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.706" + StandardCode: "EN 1563" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "2" + UltimateTensileStrength: "600 MPa" + YieldStrength: "370 MPa" + YoungsModulus: "177000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-700-2.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-700-2.FCMat new file mode 100644 index 0000000000..28c327f104 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-700-2.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "9a194e62-d2e4-466d-92ba-2707107c4e3c" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJS-700-2" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.707" + StandardCode: "EN 1563" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "2" + UltimateTensileStrength: "700 MPa" + YieldStrength: "420 MPa" + YoungsModulus: "180000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-800-1.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-800-1.FCMat new file mode 100644 index 0000000000..071d813334 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-EN-GJS-800-1.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "97c444f9-83ae-48d8-98e5-603349d06f7e" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "EN-GJS-800-1" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast iron" + MaterialNumber: "0.708" + StandardCode: "EN 1563" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7200 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "67000 MPa" + UltimateStrain: "2" + UltimateTensileStrength: "800 MPa" + YieldStrength: "480 MPa" + YoungsModulus: "180000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G16Mn5.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G16Mn5.FCMat new file mode 100644 index 0000000000..97d45db1ae --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G16Mn5.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "fc5c14ba-4885-4c75-aaf6-0ec4f2365f40" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "G16Mn5" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast steel" + MaterialNumber: "1.1131" + StandardCode: "DIN 1681" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "430 MPa" + YieldStrength: "260 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G200.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G200.FCMat new file mode 100644 index 0000000000..51965ab4d2 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G200.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "8d799def-e941-4cb6-b48d-72b9a292fafe" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "G200" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast steel" + MaterialNumber: "1.042" + StandardCode: "DIN 1681" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "25" + UltimateTensileStrength: "380 MPa" + YieldStrength: "200 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G20Mn5.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G20Mn5.FCMat new file mode 100644 index 0000000000..7e1e9c8e6d --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G20Mn5.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "d384d1e5-e2fe-4e09-9a0f-78e5670425ee" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "G20Mn5" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast steel" + MaterialNumber: "1.112" + StandardCode: "DIN 1681" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "500 MPa" + YieldStrength: "360 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G230.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G230.FCMat new file mode 100644 index 0000000000..2c11dcd9f6 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G230.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "53931707-6fe7-4ac0-ac7a-e9ddfec70fa5" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "G230" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast steel" + MaterialNumber: "1.0446" + StandardCode: "DIN 1681" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "22" + UltimateTensileStrength: "450 MPa" + YieldStrength: "230 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G260.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G260.FCMat new file mode 100644 index 0000000000..4c4b62744e --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G260.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "22971112-d137-4db1-9349-edf5e281e333" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "G260" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast steel" + MaterialNumber: "1.0552" + StandardCode: "DIN 1681" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "18" + UltimateTensileStrength: "520 MPa" + YieldStrength: "260 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G300.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G300.FCMat new file mode 100644 index 0000000000..8c0acbd1cd --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G300.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "33f1c891-7488-4324-9af9-cbdde6726b49" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "G300" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast steel" + MaterialNumber: "1.0558" + StandardCode: "DIN 1681" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "15" + UltimateTensileStrength: "600 MPa" + YieldStrength: "300 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G30Mn5.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G30Mn5.FCMat new file mode 100644 index 0000000000..bb11cbee52 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-G30Mn5.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "e03df70c-ceb8-4317-825d-1195c8c178d0" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "G30Mn5" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cast steel" + MaterialNumber: "1.1165" + StandardCode: "DIN 17205" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "14" + UltimateTensileStrength: "520 MPa" + YieldStrength: "400 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-Generic.FCMat new file mode 100644 index 0000000000..c2fead712a --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-Generic.FCMat @@ -0,0 +1,28 @@ +# File created by ConvertFCMat.py +General: + UUID: "90bbd8ef-8623-4d78-b3bf-e0bdb9b74dd3" + AuthorAndLicense: "(c) 2013 Juergen Riegel (CC-BY 3.0)" + Name: "Steel-Generic" + Description: "This is a blend Steel material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised steel cards." +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + Density: + UUID: '454661e5-265b-4320-8e6f-fcf6223ac3af' + Density: "7900 kg/m^3" + IsotropicLinearElastic: + UUID: 'f6f9e48c-b116-4e82-ad7f-3659a9219c50' + PoissonRatio: "0.3" + YoungsModulus: "200000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "500 J/kg/K" + ThermalConductivity: "50 W/m/K" + ThermalExpansionCoefficient: "0.000012 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Steel" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S185.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S185.FCMat new file mode 100644 index 0000000000..ebba16c9d5 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S185.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "6f32981a-7bbf-49a1-842c-7567a195fa7e" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S185" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0035" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "18" + UltimateTensileStrength: "310 MPa" + YieldStrength: "190 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JO.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JO.FCMat new file mode 100644 index 0000000000..3f26e56e56 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JO.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "5b13e02a-b173-4e2d-95fd-a30d9e0f7cf5" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S235JO" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0114" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "26" + UltimateTensileStrength: "360 MPa" + YieldStrength: "235 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JR.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JR.FCMat new file mode 100644 index 0000000000..5c4cf2a2ca --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JR.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "4a96627d-6518-458c-8ccf-846f69fd8a50" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S235JR" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0037" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "26" + UltimateTensileStrength: "360 MPa" + YieldStrength: "235 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JRG1.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JRG1.FCMat new file mode 100644 index 0000000000..a4949171a9 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S235JRG1.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "d8cc450d-7d6d-4377-8a8d-ffe3cf30fcb2" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S235JRG1" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0036" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "26" + UltimateTensileStrength: "360 MPa" + YieldStrength: "235 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S260NC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S260NC.FCMat new file mode 100644 index 0000000000..09cf375caa --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S260NC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "4994efd8-fc7b-41b3-ad61-9d98d1bdbe6e" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S260NC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cold forming steel" + MaterialNumber: "1.0971" + StandardCode: "SEW 092" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "30" + UltimateTensileStrength: "350 MPa" + YieldStrength: "280 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275JO.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275JO.FCMat new file mode 100644 index 0000000000..95a8ec460a --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275JO.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "f9deac5f-91a4-41aa-b49c-ef09ec4613e2" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S275JO" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0143" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "22" + UltimateTensileStrength: "430 MPa" + YieldStrength: "275 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275JR.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275JR.FCMat new file mode 100644 index 0000000000..9d57c21c9d --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275JR.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "30e4da7d-1fe3-41de-911a-a42e3405bb7b" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S275JR" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0044" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "22" + UltimateTensileStrength: "430 MPa" + YieldStrength: "275 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275N.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275N.FCMat new file mode 100644 index 0000000000..18c0439561 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S275N.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "07592e35-3e1a-470f-8eda-f4bee7d9cb4a" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S275N" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.049" + StandardCode: "EN 10113-2" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "24" + UltimateTensileStrength: "370 MPa" + YieldStrength: "275 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335JO.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335JO.FCMat new file mode 100644 index 0000000000..c8ae2510e0 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335JO.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "c50ad549-b4f4-47ab-9bc6-4eb5191da111" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S335JO" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0553" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "22" + UltimateTensileStrength: "510 MPa" + YieldStrength: "355 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335JR.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335JR.FCMat new file mode 100644 index 0000000000..931e9d418f --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335JR.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "dbd04cee-3b92-4b79-a208-58547ebe3807" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S335JR" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0045" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "22" + UltimateTensileStrength: "510 MPa" + YieldStrength: "355 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335N.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335N.FCMat new file mode 100644 index 0000000000..231271d7cd --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S335N.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "16d7f1d5-449f-4b9e-b57a-7ea114fda115" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S335N" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.0545" + StandardCode: "EN 10113-2" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "22" + UltimateTensileStrength: "470 MPa" + YieldStrength: "355 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S340MC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S340MC.FCMat new file mode 100644 index 0000000000..a3e0a90eb4 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S340MC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "5785ea5e-3376-47dd-8dc2-f1267c47e9bc" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S340MC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cold forming steel" + MaterialNumber: "1.0974" + StandardCode: "SEW 092" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "25" + UltimateTensileStrength: "480 MPa" + YieldStrength: "340 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S355J2G3.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S355J2G3.FCMat new file mode 100644 index 0000000000..71b783d323 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S355J2G3.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "b9e861ee-93fb-4eca-a2de-03579bc503c1" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S355J2G3" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.057" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "22" + UltimateTensileStrength: "510 MPa" + YieldStrength: "355 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S380MC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S380MC.FCMat new file mode 100644 index 0000000000..aa8d2c2c94 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S380MC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "da2a429b-8763-4586-be3d-620e7dd30271" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S380MC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cold forming steel" + MaterialNumber: "1.0978" + StandardCode: "SEW 092" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "23" + UltimateTensileStrength: "520 MPa" + YieldStrength: "380 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S420MC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S420MC.FCMat new file mode 100644 index 0000000000..41b6518bed --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S420MC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "c3452eff-f68e-4cfd-a24e-27e2abcd01ac" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S420MC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cold forming steel" + MaterialNumber: "1.098" + StandardCode: "EN 10149" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "21" + UltimateTensileStrength: "550 MPa" + YieldStrength: "420 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S420N.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S420N.FCMat new file mode 100644 index 0000000000..a8a2d0b6cd --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S420N.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "902f2d4a-5bd0-44bf-9c14-54462ba6778b" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S420N" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.8902" + StandardCode: "EN 10113-2" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "19" + UltimateTensileStrength: "520 MPa" + YieldStrength: "420 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S460MC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S460MC.FCMat new file mode 100644 index 0000000000..2b972e87ef --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S460MC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "c254dac5-3ee3-49b9-b8d4-16d20d21c94f" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S460MC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cold forming steel" + MaterialNumber: "1.0982" + StandardCode: "SEW 092" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "19" + UltimateTensileStrength: "590 MPa" + YieldStrength: "460 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S460N.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S460N.FCMat new file mode 100644 index 0000000000..d3c96c9639 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S460N.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "f0ae245a-1041-4674-ac4f-bf212dda6009" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S460N" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.8901" + StandardCode: "EN 10113-2" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "17" + UltimateTensileStrength: "550 MPa" + YieldStrength: "460 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S500MC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S500MC.FCMat new file mode 100644 index 0000000000..7703c36586 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S500MC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "ad8e2007-ee73-4b71-8830-6d40a8407284" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S500MC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cold forming steel" + MaterialNumber: "1.0984" + StandardCode: "EN 10149" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "17" + UltimateTensileStrength: "620 MPa" + YieldStrength: "500 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S550MC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S550MC.FCMat new file mode 100644 index 0000000000..9ac063cd0d --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S550MC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "b7308026-9278-4346-b157-2b3da280b61b" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S550MC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cold forming steel" + MaterialNumber: "1.0986" + StandardCode: "SEW 092" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "15" + UltimateTensileStrength: "680 MPa" + YieldStrength: "550 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S690MC.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S690MC.FCMat new file mode 100644 index 0000000000..1d979fd02c --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-S690MC.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "41360af5-98ed-4125-a89c-ff711e4dd2bf" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "S690MC" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Cold forming steel" + MaterialNumber: "1.0966" + StandardCode: "SEW 092" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "15" + UltimateTensileStrength: "790 MPa" + YieldStrength: "690 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-37-2K.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-37-2K.FCMat new file mode 100644 index 0000000000..0478534039 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-37-2K.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "e97be20f-246a-48b5-9718-3d39486e7af2" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "St 37-2K" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Mild steel" + MaterialNumber: "1.0161" + StandardCode: "EN 10025" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "460 MPa" + YieldStrength: "320 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-255.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-255.FCMat new file mode 100644 index 0000000000..230b39f30a --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-255.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "1078eb9f-ac3e-4b24-b40e-b9ead77828e0" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "St E 255" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.0461" + StandardCode: "DIN 17102" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "360 MPa" + YieldStrength: "260 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-315.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-315.FCMat new file mode 100644 index 0000000000..efcc99b6f9 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-315.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "74ca3b08-d561-4440-a4c2-d9b839b66670" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "St E 315" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.0505" + StandardCode: "DIN 17102" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "440 MPa" + YieldStrength: "320 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-380.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-380.FCMat new file mode 100644 index 0000000000..f2d7b9df43 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-380.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "a1b62461-7abc-45da-9a3c-3068367d2990" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "St E 380" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.89" + StandardCode: "DIN 17102" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "500 MPa" + YieldStrength: "380 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-460.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-460.FCMat new file mode 100644 index 0000000000..9ec5596e74 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-460.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "b312ad7b-95d4-4ca5-9736-360dbed918ee" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "St E 460" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.8905" + StandardCode: "DIN 17102" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "560 MPa" + YieldStrength: "460 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-500.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-500.FCMat new file mode 100644 index 0000000000..7c08645652 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-St-E-500.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "90fb6bd4-05db-4d44-ba89-280b5a060921" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "St E 500" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Fine grain steel" + MaterialNumber: "1.8907" + StandardCode: "DIN 17102" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "0" + UltimateTensileStrength: "610 MPa" + YieldStrength: "500 MPa" + YoungsModulus: "210000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X2CrNiMoN17-13-3.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X2CrNiMoN17-13-3.FCMat new file mode 100644 index 0000000000..104b026672 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X2CrNiMoN17-13-3.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "a05b5f9b-27b9-4554-8feb-553f9d6027ef" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "X2CrNiMoN17-13-3" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Stainless steel" + MaterialNumber: "1.4429" + StandardCode: "EN 10088" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "35" + UltimateTensileStrength: "580 MPa" + YieldStrength: "295 MPa" + YoungsModulus: "200000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X2CrNiN24-4.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X2CrNiN24-4.FCMat new file mode 100644 index 0000000000..f59cd81717 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X2CrNiN24-4.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "be74ada5-2775-41fc-a44b-36df6fb5e0b8" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "X2CrNiN24-4" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Stainless steel" + MaterialNumber: "1.4362" + StandardCode: "EN 10088" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "25" + UltimateTensileStrength: "600 MPa" + YieldStrength: "400 MPa" + YoungsModulus: "200000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X39CrMo17-1.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X39CrMo17-1.FCMat new file mode 100644 index 0000000000..ec90558bbe --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X39CrMo17-1.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "9e7069ef-296d-401d-9331-d3e11267c2e0" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "X39CrMo17-1" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Stainless steel" + MaterialNumber: "1.4122" + StandardCode: "EN 10088" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "12" + UltimateTensileStrength: "750 MPa" + YieldStrength: "500 MPa" + YoungsModulus: "213000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X3CrNiMo13-14.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X3CrNiMo13-14.FCMat new file mode 100644 index 0000000000..b4fc5986dd --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X3CrNiMo13-14.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "88632101-8868-407a-a95f-01773b5f2245" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "X3CrNiMo13-14" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Stainless steel" + MaterialNumber: "1.4313" + StandardCode: "EN 10088" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "11" + UltimateTensileStrength: "900 MPa" + YieldStrength: "800 MPa" + YoungsModulus: "216000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X5CrNi18-10.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X5CrNi18-10.FCMat new file mode 100644 index 0000000000..e8c5f023bf --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X5CrNi18-10.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "e5329208-0c38-47ec-8c59-e7bf6a35801d" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "X5CrNi18-10" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Stainless steel" + MaterialNumber: "1.4301" + StandardCode: "EN 10088" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "40" + UltimateTensileStrength: "520 MPa" + YieldStrength: "210 MPa" + YoungsModulus: "200000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X5CrNiMo17-12-2.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X5CrNiMo17-12-2.FCMat new file mode 100644 index 0000000000..5bf2b0b38b --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X5CrNiMo17-12-2.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "7625a484-96de-438d-b251-2b71044cfa88" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "X5CrNiMo17-12-2" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Stainless steel" + MaterialNumber: "1.4401" + StandardCode: "EN 10088" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "68000 MPa" + UltimateStrain: "40" + UltimateTensileStrength: "520 MPa" + YieldStrength: "220 MPa" + YoungsModulus: "180000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X6CrNiTi18-10.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X6CrNiTi18-10.FCMat new file mode 100644 index 0000000000..8e04da41e5 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Steel/Steel-X6CrNiTi18-10.FCMat @@ -0,0 +1,29 @@ +# File created by ConvertFCMat.py +General: + UUID: "2c577c45-ebae-46b2-9e36-e41fbcce9286" + AuthorAndLicense: "(c) 2014 M. Münch - GNU Lesser General Public License (LGPL)" + Name: "X6CrNiTi18-10" +Inherits: + Steel: + UUID: "4b849c55-6b3a-4f75-a055-40c0d0324596" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Stainless steel" + MaterialNumber: "1.4541" + StandardCode: "EN 10088" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "7800 kg/m^3" + PoissonRatio: "0.3" + ShearModulus: "81000 MPa" + UltimateStrain: "40" + UltimateTensileStrength: "500 MPa" + YieldStrength: "200 MPa" + YoungsModulus: "200000 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + ThermalExpansionCoefficient: "0.000011 m/m/K" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Titanium/Ti-6Al-4V.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Titanium/Ti-6Al-4V.FCMat new file mode 100644 index 0000000000..b68cc7b6d0 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Metal/Titanium/Ti-6Al-4V.FCMat @@ -0,0 +1,31 @@ +# File created by ConvertFCMat.py +General: + UUID: "f8013463-8008-4063-818c-ab6884cfa015" + AuthorAndLicense: "vlk" + Name: "Ti-6Al-4V (Grade 5)" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Metal" + MaterialStandard: + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + KindOfMaterial: "Titanium" + MaterialNumber: "3.7165" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "4430 kg/m^3" + PoissonRatio: "0.330" + ShearModulus: "44 GPa" + UltimateTensileStrength: "975.5 MPa" + YieldStrength: "910 MPa" + YoungsModulus: "114 GPa" + Hardness: "35 HRC" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "553.0 J/kg/K" + ThermalConductivity: "6.7 W/m/K" + ThermalExpansionCoefficient: "8.6 µm/m/K" + Electromagnetic: + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + ElectricalConductivity: "580012.8 S/m" + RelativePermeability: "1.00005" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/ABS-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/ABS-Generic.FCMat new file mode 100644 index 0000000000..d85813be24 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/ABS-Generic.FCMat @@ -0,0 +1,26 @@ +# File created by ConvertFCMat.py +General: + UUID: "73371529-2983-47dd-b988-6739a2e20029" + AuthorAndLicense: "(c) 2013 Juergen Riegel (CC-BY 3.0)" + Name: "ABS" + Description: "This is a blend AcrylnitrilButadienStyrol (ABS) material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised ABS-blend cards." + SourceURL: "http://www.matweb.com/search/DataSheet.aspx?MatGUID=eb7a78f5948d481c9493a67f0d089646" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Thermoplast" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "1060 kg/m^3" + PoissonRatio: "0.37" + UltimateTensileStrength: "38.8 MPa" + YieldStrength: "44.1 MPa" + YoungsModulus: "2300 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "2050 J/kg/K" + ThermalConductivity: "0.158 W/m/K" + ThermalExpansionCoefficient: "0.000093 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Acrylonitrile_butadiene_styrene" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/Acrylic-Glass-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/Acrylic-Glass-Generic.FCMat new file mode 100644 index 0000000000..086f0b1ad5 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/Acrylic-Glass-Generic.FCMat @@ -0,0 +1,28 @@ +# File created by ConvertFCMat.py +General: + UUID: "f255cd82-91d5-4e97-9032-1843128a2eaa" + AuthorAndLicense: "(c) 2016 Przemo Firszt (CC-BY 3.0)" + Name: "Acrylic Glass" + Description: "Poly(methyl methacrylate) (PMMA, acrylic, acrylic glass, trade names Plexiglas, Acrylite, Lucite, Perspex) a transparent thermoplastic often used in sheet form as a lightweight or shatter-resistant alternative to glass." + SourceURL: "http://www.matweb.com/search/DataSheet.aspx?MatGUID=632572aeef2a4224b5ac8fbd4f1b6f77" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "of the material, i.e. for PLA is Thermoplast, for Steel is Metal Thermoplast" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "103 MPa" + Density: "1160 kg/m^3" + PoissonRatio: "0.38" + ShearModulus: "1.08 GPa" + UltimateTensileStrength: "57.7 MPa" + YieldStrength: "73.7 MPa" + YoungsModulus: "2550 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1480 J/kg/K" + ThermalConductivity: "0.193 W/m/K" + ThermalExpansionCoefficient: "0.000075 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Poly(methyl_methacrylate)" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PA6-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PA6-Generic.FCMat new file mode 100644 index 0000000000..1a16486a01 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PA6-Generic.FCMat @@ -0,0 +1,23 @@ +# File created by ConvertFCMat.py +General: + UUID: "9d59dc3b-ce66-4bec-82c9-b962082e7c9e" + AuthorAndLicense: "(c) 2019 Uwe Stöhr (CC-BY 3.0)" + Name: "Polyamide 6" + SourceURL: "http://www.matweb.com/search/datasheet.aspx?MatGUID=8d78f3cfcb6f49d595896ce6ce6a2ef1" +Models: + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "67.6 MPa" + Density: "1150 kg/m^3" + PoissonRatio: "0.39" + UltimateTensileStrength: "75.5 MPa" + YieldStrength: "70.5 MPa" + YoungsModulus: "2930 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1670 J/kg/K" + ThermalConductivity: "0.262 W/m/K" + ThermalExpansionCoefficient: "0.000082 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Nylon_6" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PET-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PET-Generic.FCMat new file mode 100644 index 0000000000..6822285250 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PET-Generic.FCMat @@ -0,0 +1,24 @@ +# File created by ConvertFCMat.py +General: + UUID: "f73004e3-6fb4-4591-8be7-89d1370be312" + AuthorAndLicense: "(c) 2019 Uwe Stöhr (CC-BY 3.0)" + Name: "PET" + SourceURL: "http://www.matweb.com/search/DataSheet.aspx?MatGUID=a696bdcdff6f41dd98f8eec3599eaa20" +Models: + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "38.0 MPa" + Density: "1380 kg/m^3" + PoissonRatio: "0.36" + ShearModulus: "0.0385 GPa" + UltimateTensileStrength: "38.8 MPa" + YieldStrength: "62.8 MPa" + YoungsModulus: "3150 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1140 J/kg/K" + ThermalConductivity: "0.181 W/m/K" + ThermalExpansionCoefficient: "0.000072 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Polyethylene_terephthalate" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PLA-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PLA-Generic.FCMat new file mode 100644 index 0000000000..f1f23fd796 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PLA-Generic.FCMat @@ -0,0 +1,26 @@ +# File created by ConvertFCMat.py +General: + UUID: "93861244-fbbe-41a9-a7e0-aeed53abd782" + AuthorAndLicense: "(c) 2019 Uwe Stöhr (CC-BY 3.0)" + Name: "PLA" + Description: "Polylactic acid or polylactide (PLA, Poly) is a biodegradable thermoplastic aliphatic polyester derived from renewable resources, such as corn starch, tapioca roots, chips, starch or sugarcane." + SourceURL: "https://www.sd3d.com/wp-content/uploads/2017/06/MaterialTDS-PLA_01.pdf" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Thermoplast" + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "1240 kg/m^3" + PoissonRatio: "0.36" + UltimateTensileStrength: "26.4 MPa" + YieldStrength: "35.9 MPa" + YoungsModulus: "3640 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1800 J/kg/K" + ThermalConductivity: "0.130 W/m/K" + ThermalExpansionCoefficient: "0.000041 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Polylactic_acid" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PP-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PP-Generic.FCMat new file mode 100644 index 0000000000..19a8d81b6b --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PP-Generic.FCMat @@ -0,0 +1,23 @@ +# File created by ConvertFCMat.py +General: + UUID: "0e669f57-de27-4915-9a02-124f36047972" + AuthorAndLicense: "(c) 2019 Uwe Stöhr (CC-BY 3.0)" + Name: "Polypropylene" + SourceURL: "http://www.matweb.com/search/DataSheet.aspx?MatGUID=a882a1c603374e278d062f106dfda95b" +Models: + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "10 MPa" + Density: "916 kg/m^3" + PoissonRatio: "0.44" + UltimateTensileStrength: "79.7 MPa" + YieldStrength: "32.8 MPa" + YoungsModulus: "1470 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1920 J/kg/K" + ThermalConductivity: "0.249 W/m/K" + ThermalExpansionCoefficient: "0.000123 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Polypropylene" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PTFE-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PTFE-Generic.FCMat new file mode 100644 index 0000000000..b7091e9e05 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PTFE-Generic.FCMat @@ -0,0 +1,23 @@ +# File created by ConvertFCMat.py +General: + UUID: "8ce226db-43ef-4471-93f1-07e7276aa276" + AuthorAndLicense: "(c) 2019 Uwe Stöhr (CC-BY 3.0)" + Name: "PTFE" + SourceURL: "http://www.matweb.com/search/datasheet.aspx?MatGUID=4d14eac958e5401a8fd152e1261b6843" +Models: + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + CompressiveStrength: "10.2 MPa" + Density: "2070 kg/m^3" + PoissonRatio: "0.46" + UltimateTensileStrength: "34.6 MPa" + YieldStrength: "20.5 MPa" + YoungsModulus: "564 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1010 J/kg/K" + ThermalConductivity: "0.263 W/m/K" + ThermalExpansionCoefficient: "0.000108 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Polytetrafluoroethylene" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PVC-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PVC-Generic.FCMat new file mode 100644 index 0000000000..dfde218e7f --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Thermoplast/PVC-Generic.FCMat @@ -0,0 +1,21 @@ +# File created by ConvertFCMat.py +General: + UUID: "758cfc44-f4ad-4605-8645-75e9e6b053ab" + AuthorAndLicense: "(c) 2019 Uwe Stöhr (CC-BY 3.0)" + Name: "PVC" + SourceURL: "http://www.matweb.com/search/DataSheet.aspx?MatGUID=1f650966ec834bb8833dd4c6e3116079" +Models: + LinearElastic: + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + Density: "1380 kg/m^3" + PoissonRatio: "0.38" + UltimateTensileStrength: "50 MPa" + YoungsModulus: "2800 MPa" + Thermal: + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + SpecificHeat: "1000 J/kg/K" + ThermalConductivity: "0.150 W/m/K" + ThermalExpansionCoefficient: "0.000075 m/m/K" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Polyvinyl_chloride" diff --git a/src/Mod/Material/Resources/Materials/StandardMaterial/Wood/Wood-Generic.FCMat b/src/Mod/Material/Resources/Materials/StandardMaterial/Wood/Wood-Generic.FCMat new file mode 100644 index 0000000000..9c64883f91 --- /dev/null +++ b/src/Mod/Material/Resources/Materials/StandardMaterial/Wood/Wood-Generic.FCMat @@ -0,0 +1,20 @@ +# File created by ConvertFCMat.py +General: + UUID: "b588224e-e8d6-47ad-ba1f-a058333fd1c6" + AuthorAndLicense: "(c) 2015 Bernd Hahnebach (CC-BY 3.0)" + Name: "Wood" + Description: "A standard construction wood" +Models: + Father: + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + Father: "Aggregate" + Density: + UUID: '454661e5-265b-4320-8e6f-fcf6223ac3af' + Density: "700 kg/m^3" + IsotropicLinearElastic: + UUID: 'f6f9e48c-b116-4e82-ad7f-3659a9219c50' + PoissonRatio: "0.05" + YoungsModulus: "12000 MPa" + Costs: + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + ProductURL: "https://en.wikipedia.org/wiki/Wood" diff --git a/src/Mod/Material/Resources/Models/Architectural/Architectural.yml b/src/Mod/Material/Resources/Models/Architectural/Architectural.yml new file mode 100644 index 0000000000..348c69ecc3 --- /dev/null +++ b/src/Mod/Material/Resources/Models/Architectural/Architectural.yml @@ -0,0 +1,69 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: "Architectural" + UUID: '32439c3b-262f-4b7b-99a8-f7f44e5894c8' + URL: '' + Description: "default architectural model" + DOI: "" + Color: + Type: 'String' + Units: '' + URL: '' + Description: " " + EnvironmentalEfficiencyClass: + Type: 'String' + Units: '' + URL: '' + Description: " " + ExecutionInstructions: + Type: 'String' + Units: '' + URL: '' + Description: " " + Finish: + Type: 'String' + Units: '' + URL: '' + Description: " " + FireResistanceClass: + Type: 'String' + Units: '' + URL: '' + Description: " " + Model: + Type: 'String' + Units: '' + URL: '' + Description: " " + SoundTransmissionClass: + Type: 'String' + Units: '' + URL: '' + Description: " " + UnitsPerQuantity: + Type: 'Float' + Units: '' + URL: '' + Description: " " diff --git a/src/Mod/Material/Resources/Models/Costs/Costs.yml b/src/Mod/Material/Resources/Models/Costs/Costs.yml new file mode 100644 index 0000000000..92eb8323e4 --- /dev/null +++ b/src/Mod/Material/Resources/Models/Costs/Costs.yml @@ -0,0 +1,47 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: "Costs" + UUID: '881df808-8726-4c2e-be38-688bb6cce466' + URL: '' + Description: "default cost model" + DOI: "" + ProductURL: + Type: 'URL' + Units: '' + URL: 'https://de.wikipedia.org/wiki/Hyperlink' + Description: "Product URL, recommended are wikipedia links" + SpecificPrice: + Type: 'Float' + Units: '' + URL: '' + Description: > + Specific price in currency / mass. A currency is not supported by + FreeCAD unit system. Will be empty in all FreeCAD cards. Means the + user needs to put in himself. + Vendor: + Type: 'String' + Units: '' + URL: '' + Description: "Vendor of the material" diff --git a/src/Mod/Material/Resources/Models/Electromagnetic/Electromagnetic.yml b/src/Mod/Material/Resources/Models/Electromagnetic/Electromagnetic.yml new file mode 100644 index 0000000000..1f70ab439c --- /dev/null +++ b/src/Mod/Material/Resources/Models/Electromagnetic/Electromagnetic.yml @@ -0,0 +1,45 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: "Electromagnetic" + UUID: 'b2eb5f48-74b3-4193-9fbb-948674f427f3' + URL: '' + Description: "default electromagnetic model" + DOI: "" + RelativePermittivity: + Type: 'Float' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Relative_permittivity' + Description: "The ratio to the permittivity of the vacuum" + ElectricalConductivity: + Type: 'Quantity' + Units: 'S/m' + URL: 'https://en.wikipedia.org/wiki/Electrical_resistivity_and_conductivity' + Description: > + The electrical conductivity in [FreeCAD ElectricalConductivity unit] + RelativePermeability: + Type: 'Float' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Permeability_(electromagnetism)' + Description: "The ratio to the permeability of the vacuum" diff --git a/src/Mod/Material/Resources/Models/Fluid/Fluid.yml b/src/Mod/Material/Resources/Models/Fluid/Fluid.yml new file mode 100644 index 0000000000..4ddea05de3 --- /dev/null +++ b/src/Mod/Material/Resources/Models/Fluid/Fluid.yml @@ -0,0 +1,51 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** +Model: + Name: "Fluid" + UUID: '1ae66d8c-1ba1-4211-ad12-b9917573b202' + URL: '' + Description: "default fluid model" + DOI: "" + Inherits: + - Density: + UUID: '454661e5-265b-4320-8e6f-fcf6223ac3af' + DynamicViscosity: + Type: 'Quantity' + Units: 'Pa*s' + URL: 'https://en.wikipedia.org/wiki/Viscosity' + Description: > + Dynamic viscosity is defined as the ability of a material to resist + flow and deform during mechanical oscillation as a function of + temperature, frequency, time, or both + KinematicViscosity: + Type: 'Quantity' + Units: 'm^2/s' + URL: 'https://en.wikipedia.org/wiki/Viscosity' + Description: "Kinematic Viscosity = Dynamic Viscosity / Density" + PrandtlNumber: + Type: 'Float' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Prandtl_number' + Description: > + The Prandtl number is a dimensionless number defined as the ratio + of momentum diffusivity to thermal diffusivity diff --git a/src/Mod/Material/Resources/Models/Legacy/Father.yml b/src/Mod/Material/Resources/Models/Legacy/Father.yml new file mode 100644 index 0000000000..fccb79eda1 --- /dev/null +++ b/src/Mod/Material/Resources/Models/Legacy/Father.yml @@ -0,0 +1,36 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: 'Father' + UUID: '9cdda8b6-b606-4778-8f13-3934d8668e67' + URL: '' + Description: "Used to define a class of materials" + DOI: "" + Father: + Type: 'String' + Units: '' + URL: '' + Description: > + Father of the material, ex. the father of PLA is Thermoplast, the + father of Steel is Metal diff --git a/src/Mod/Material/Resources/Models/Legacy/MaterialStandard.yml b/src/Mod/Material/Resources/Models/Legacy/MaterialStandard.yml new file mode 100644 index 0000000000..c1d2cf9d27 --- /dev/null +++ b/src/Mod/Material/Resources/Models/Legacy/MaterialStandard.yml @@ -0,0 +1,46 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: 'Material Standard' + UUID: '1e2c0088-904a-4537-925f-64064c07d700' + URL: '' + Description: "Describes the norm or standards referenced by this material" + DOI: "" + KindOfMaterial: + Type: 'String' + Units: '' + URL: '' + Description: " " + MaterialNumber: + Type: 'String' + Units: '' + URL: '' + Description: " " + StandardCode: + Type: 'String' + Units: '' + URL: '' + Description: > + This is a reference to a norm or standards system where this material + is referenced by a precise ID or number diff --git a/src/Mod/Material/Resources/Models/Mechanical/Density.yml b/src/Mod/Material/Resources/Models/Mechanical/Density.yml new file mode 100644 index 0000000000..fc040675fb --- /dev/null +++ b/src/Mod/Material/Resources/Models/Mechanical/Density.yml @@ -0,0 +1,34 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: 'Density' + UUID: '454661e5-265b-4320-8e6f-fcf6223ac3af' + URL: '' + Description: 'Density is the most basic physical model' + DOI: '' + Density: + Type: 'Quantity' + Units: 'kg/m^3' + URL: 'https://en.wikipedia.org/wiki/Density' + Description: "Density in [FreeCAD Density unit]" diff --git a/src/Mod/Material/Resources/Models/Mechanical/HypotheticalExample.yml b/src/Mod/Material/Resources/Models/Mechanical/HypotheticalExample.yml new file mode 100644 index 0000000000..396f53c3b2 --- /dev/null +++ b/src/Mod/Material/Resources/Models/Mechanical/HypotheticalExample.yml @@ -0,0 +1,41 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: 'Hypothetical Example' + UUID: 'a401af74-e4a2-4bad-8dd5-0f3d1748c462' + URL: 'https://en.wikipedia.org/wiki/Linear_elasticity' + Description: > + This is not a real physical model. It is intended as an example of a new + physical model + DOI: "" + GigaWatts: + Type: 'Quantity' + Units: '' + URL: '' + Description: "" + TimeFluxDensity: + Type: 'Quantity' + Units: '' + URL: '' + Description: "" diff --git a/src/Mod/Material/Resources/Models/Mechanical/IsotropicLinearElastic.yml b/src/Mod/Material/Resources/Models/Mechanical/IsotropicLinearElastic.yml new file mode 100644 index 0000000000..71eb1c519e --- /dev/null +++ b/src/Mod/Material/Resources/Models/Mechanical/IsotropicLinearElastic.yml @@ -0,0 +1,51 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: 'Isotropic Linear Elastic' + UUID: 'f6f9e48c-b116-4e82-ad7f-3659a9219c50' + URL: 'https://en.wikipedia.org/wiki/Linear_elasticity' + Description: > + Materials that are linearly elastic obey Hooke's law i.e. the stress + and strain relationship is linear + DOI: "10.1016/j.ijplas.2004.06.004" + BulkModulus: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Bulk_modulus' + Description: "Bulk modulus in [FreeCAD Pressure unit]" + PoissonRatio: + Type: 'Float' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Poisson%27s_ratio' + Description: "Poisson's ratio [unitless]" + ShearModulus: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Shear_modulus' + Description: "Shear modulus in [FreeCAD Pressure unit]" + YoungsModulus: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Young%27s_modulus' + Description: "Young's modulus (or E-Module) in [FreeCAD Pressure unit]" diff --git a/src/Mod/Material/Resources/Models/Mechanical/LinearElastic.yml b/src/Mod/Material/Resources/Models/Mechanical/LinearElastic.yml new file mode 100644 index 0000000000..83b02a264f --- /dev/null +++ b/src/Mod/Material/Resources/Models/Mechanical/LinearElastic.yml @@ -0,0 +1,81 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: 'Linear Elastic' + UUID: '7b561d1d-fb9b-44f6-9da9-56a4f74d7536' + URL: 'https://en.wikipedia.org/wiki/Linear_elasticity' + Description: > + Materials that are linearly elastic obey Hooke's law i.e. the stress and + strain relationship is linear + DOI: "10.1016/j.ijplas.2004.06.004" + Inherits: + - Density: + UUID: '454661e5-265b-4320-8e6f-fcf6223ac3af' + - IsotropicLinearElastic: + UUID: 'f6f9e48c-b116-4e82-ad7f-3659a9219c50' + AngleOfFriction: + Type: 'Quantity' + Units: 'deg' + URL: 'https://en.wikipedia.org/wiki/Friction#Angle_of_friction' + Description: > + Further information can be found at + https://en.wikipedia.org/wiki/Mohr%E2%80%93Coulomb_theory + CompressiveStrength: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Compressive_strength' + Description: "Compressive strength in [FreeCAD Pressure unit]" + FractureToughness: + Type: 'Float' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Fracture_toughness' + Description: > + Unit MPa * m^0.5 is not possible ATM in FreeCAD thus String. Keep in mind + the unit is fixed MPa * m^0.5. + https://github.com/FreeCAD/FreeCAD/pull/2156 + UltimateStrain: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Deformation_(mechanics)' + Description: " " + UltimateTensileStrength: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Ultimate_tensile_strength' + Description: "Ultimate tensile strength in [FreeCAD Pressure unit]" + YieldStrength: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Yield_Strength' + Description: "Yield strength in [FreeCAD Pressure unit]" + Stiffness: + Type: 'Quantity' + Units: 'N/m' + URL: 'https://en.wikipedia.org/wiki/Stiffness' + Description: "Stiffness (or Spring Stiffness) in [FreeCAD Stiffness unit]" + Hardness: + Type: 'Quantity' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Mohs_scale' + Description: "Hardness. FreeCAD does not currently support hardness units" diff --git a/src/Mod/Material/Resources/Models/Mechanical/OgdenYld2004p18.yml b/src/Mod/Material/Resources/Models/Mechanical/OgdenYld2004p18.yml new file mode 100644 index 0000000000..7bf43f619b --- /dev/null +++ b/src/Mod/Material/Resources/Models/Mechanical/OgdenYld2004p18.yml @@ -0,0 +1,65 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: 'OgdenYld2004p18' + UUID: '3ef9e427-cc25-43f7-817f-79ff0d49625f' + URL: 'https://en.wikipedia.org/wiki/Linear_elasticity' + Description: > + Materials that are linearly elastic obey Hooke's law i.e. the stress and + strain relationship is linear + DOI: "10.1016/j.ijplas.2004.06.004" + OgdenModuli: + Type: 'List' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Ogden_hyperelastic_model' + Description: "Elastic moduli μ for Ogden [FreeCAD Pressure unit]" + OgdenExponent: + Type: 'Integer' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Ogden_hyperelastic_model' + Description: "Exponent ɑ for Ogden [unitless]" + InitialYieldStress: + Type: 'Quantity' + Units: 'kPa' + URL: '' + Description: > + Saturation stress for Voce isotropic hardening [FreeCAD Pressure unit] + VoceSaturationStress: + Type: 'Quantity' + Units: 'kPa' + URL: '' + Description: > + Saturation stress for Voce isotropic hardening [FreeCAD Pressure unit] + VoceStrainScale: + Type: 'Float' + Units: '' + URL: '' + Description: "Strain scale in Voce isotropic hardening [unitless]" + Yld2004p18Coefficients: + Type: 'List' + Units: '' + URL: '' + Description: > + Coefficients (c_12, c_13, c_21, c_23, c_31, c_32, c_44, c_55, c_66) + in Yld2004-18p yield surface [unitless] diff --git a/src/Mod/Material/Resources/Models/Mechanical/OrthotropicLinearElastic.yml b/src/Mod/Material/Resources/Models/Mechanical/OrthotropicLinearElastic.yml new file mode 100644 index 0000000000..b63302dc96 --- /dev/null +++ b/src/Mod/Material/Resources/Models/Mechanical/OrthotropicLinearElastic.yml @@ -0,0 +1,76 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: 'Orthotropic Linear Elastic' + UUID: 'b19ccc6b-a431-418e-91c2-0ac8c649d146' + URL: 'https://en.wikipedia.org/wiki/Linear_elasticity' + Description: > + Materials that are linearly elastic obey Hooke's law i.e. the stress and + strain relationship is linear + DOI: "" + PoissonRatioXY: + Type: 'Float' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Poisson%27s_ratio' + Description: "Poisson's ratio [unitless]" + PoissonRatioXZ: + Type: 'Float' + Units: '' + URL: 'https://en.wikipedia.org/wiki/Poisson%27s_ratio' + Description: "Poisson's ratio [unitless]" + PoissonRatioYZ: + Type: 'Float' + Units: 'Pressure' + URL: 'https://en.wikipedia.org/wiki/Poisson%27s_ratio' + Description: "Poisson's ratio [unitless]" + ShearModulusXY: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Shear_modulus' + Description: "Shear modulus in [FreeCAD Pressure unit]" + ShearModulusXZ: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Shear_modulus' + Description: "Shear modulus in [FreeCAD Pressure unit]" + ShearModulusYZ: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Shear_modulus' + Description: "Shear modulus in [FreeCAD Pressure unit]" + YoungsModulusX: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Young%27s_modulus' + Description: "Young's modulus (or E-Module) in [FreeCAD Pressure unit]" + YoungsModulusY: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Young%27s_modulus' + Description: "Young's modulus (or E-Module) in [FreeCAD Pressure unit]" + YoungsModulusZ: + Type: 'Quantity' + Units: 'kPa' + URL: 'https://en.wikipedia.org/wiki/Young%27s_modulus' + Description: "Young's modulus (or E-Module) in [FreeCAD Pressure unit]" diff --git a/src/Mod/Material/Resources/Models/Rendering/AdvancedRendering.yml b/src/Mod/Material/Resources/Models/Rendering/AdvancedRendering.yml new file mode 100644 index 0000000000..84223de33b --- /dev/null +++ b/src/Mod/Material/Resources/Models/Rendering/AdvancedRendering.yml @@ -0,0 +1,42 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +AppearanceModel: + Name: "Advanced Rendering" + UUID: 'c880f092-cdae-43d6-a24b-55e884aacbbf' + URL: '' + Description: "default rendering model" + DOI: "" + Inherits: + - BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + FragmentShader: + Type: 'String' + Units: '' + URL: '' + Description: " " + VertexShader: + Type: 'String' + Units: '' + URL: '' + Description: " " diff --git a/src/Mod/Material/Resources/Models/Rendering/BasicRendering.yml b/src/Mod/Material/Resources/Models/Rendering/BasicRendering.yml new file mode 100644 index 0000000000..c5d145ba2d --- /dev/null +++ b/src/Mod/Material/Resources/Models/Rendering/BasicRendering.yml @@ -0,0 +1,59 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +AppearanceModel: + Name: "Basic Rendering" + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + URL: '' + Description: "default rendering model" + DOI: "" + AmbientColor: + Type: 'Color' + Units: '' + URL: '' + Description: " " + DiffuseColor: + Type: 'Color' + Units: '' + URL: '' + Description: " " + EmissiveColor: + Type: 'Color' + Units: '' + URL: '' + Description: " " + Shininess: + Type: 'Float' + Units: '' + URL: '' + Description: " " + SpecularColor: + Type: 'Color' + Units: '' + URL: '' + Description: " " + Transparency: + Type: 'Float' + Units: '' + URL: '' + Description: " " diff --git a/src/Mod/Material/Resources/Models/Rendering/TextureRendering.yml b/src/Mod/Material/Resources/Models/Rendering/TextureRendering.yml new file mode 100644 index 0000000000..c2fadfa0ad --- /dev/null +++ b/src/Mod/Material/Resources/Models/Rendering/TextureRendering.yml @@ -0,0 +1,42 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +AppearanceModel: + Name: "Texture Rendering" + UUID: 'bbdcc65b-67ca-489c-bd5c-a36e33d1c160' + URL: '' + Description: "default rendering model" + DOI: "" + Inherits: + - BasicRendering: + UUID: 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e' + TexturePath: + Type: 'File' + Units: '' + URL: '' + Description: " " + TextureScaling: + Type: 'Float' + Units: '' + URL: '' + Description: " " diff --git a/src/Mod/Material/Resources/Models/Rendering/VectorRendering.yml b/src/Mod/Material/Resources/Models/Rendering/VectorRendering.yml new file mode 100644 index 0000000000..a1eb05213e --- /dev/null +++ b/src/Mod/Material/Resources/Models/Rendering/VectorRendering.yml @@ -0,0 +1,59 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +AppearanceModel: + Name: "Vector Rendering" + UUID: 'fdf5a80e-de50-4157-b2e5-b6e5f88b680e' + URL: '' + Description: "default vector rendering model" + DOI: "" + SectionFillPattern: + Type: 'File' + Units: '' + URL: '' + Description: " " + SectionLinewidth: + Type: 'Float' + Units: '' + URL: '' + Description: " " + SectionColor: + Type: 'Color' + Units: '' + URL: '' + Description: " " + ViewColor: + Type: 'Color' + Units: '' + URL: '' + Description: " " + ViewFillPattern: + Type: 'Boolean' + Units: '' + URL: '' + Description: " " + ViewLinewidth: + Type: 'Float' + Units: '' + URL: '' + Description: " " diff --git a/src/Mod/Material/Resources/Models/Thermal/Thermal.yml b/src/Mod/Material/Resources/Models/Thermal/Thermal.yml new file mode 100644 index 0000000000..f8154af60b --- /dev/null +++ b/src/Mod/Material/Resources/Models/Thermal/Thermal.yml @@ -0,0 +1,47 @@ +--- +# *************************************************************************** +# * * +# * Copyright (c) 2023 David Carter * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +Model: + Name: "Thermal" + UUID: '9959d007-a970-4ea7-bae4-3eb1b8b883c7' + URL: '' + Description: "default thermal model" + DOI: "" + SpecificHeat: + Type: 'Quantity' + Units: 'J/kg/K' + URL: 'https://en.wikipedia.org/wiki/Heat_capacity' + Description: "Specific capacity in [FreeCAD SpecificHeat unit]" + ThermalConductivity: + Type: 'Quantity' + Units: 'W/m/K' + URL: 'https://en.wikipedia.org/wiki/Thermal_conductivity' + Description: "Thermal conductivity in [FreeCAD ThermalConductivity unit]" + ThermalExpansionCoefficient: + Type: 'Quantity' + Units: 'm/m/K' + URL: + 'https://en.wikipedia.org/wiki/Volumetric_thermal_expansion_coefficient' + Description: > + Thermal expansion coefficient (linear) in [FreeCAD + ThermalExpansionCoefficient unit] diff --git a/src/Mod/Material/Resources/translations/Material.ts b/src/Mod/Material/Resources/translations/Material.ts index 181e028255..a62ca97d3a 100644 --- a/src/Mod/Material/Resources/translations/Material.ts +++ b/src/Mod/Material/Resources/translations/Material.ts @@ -4,62 +4,62 @@ MaterialEditor - + Material Editor - + Material card - + Opens the Product URL of this material in an external browser - + Existing material cards - + Opens an existing material card - + Open... - + Saves this material as a card - + Save as... - + Material parameter - + Add / remove parameter - + Add property - + Delete property @@ -67,19 +67,345 @@ Material - + + + The document has been modified. + + + + + + Do you want to save your changes? + + + + Product URL - + UserDefined - + Name + + MatGui::Array2D + + + 2D Array + + + + + Default Value + + + + + MatGui::Array3D + + + 3D Array + + + + + Default Value + + + + + MatGui::DlgSettingsMaterial + + + General + + + + + Card resources + + + + + The cards built-in to FreeCAD will be listed as available. + + + + + Use built-in materials + + + + + Use materials added by external workbenches. + + + + + Use materials from external workbenches + + + + + Also cards from FreeCAD's preferences directory will be listed as available. + + + + + Use materials from Materials directory in user's FreeCAD preference directory + + + + + Also material cards also from the specified directory +will be listed as available. + + + + + Use materials from user defined directory + + + + + User directory + + + + + Card sorting and duplicates + + + + + Duplicate cards will be deleted from the displayed material card list. + + + + + Delete card duplicates + + + + + Material cards appear sorted by their resources (locations). +If unchecked, they will be sorted by their name. + + + + + Sort by resources + + + + + Testing + + + + + Use legacy editor + + + + + MatGui::MaterialSave + + + Save Material + + + + + Library: + + + + + New Folder + + + + + Filename: + + + + + MatGui::MaterialsEditor + + + Materials + + + + + General + + + + + Description + + + + + Name + + + + + Source Reference + + + + + Parent + + + + + Author and License + + + + + Tags + + + + + Source URL + + + + + * + + + + + Properties + + + + + + + + + + + + + - + + + + + Appearance + + + + + MatGui::ModelSelect + + + Material Models + + + + + General + + + + + URL + + + + + Description + + + + + DOI + + + + + Name + + + + + Add to favorites + + + + + * + + + + + Properties + + + + + QObject + + + Material + + + + + + No writeable library + + + + + Unsaved Material + + + + + Do you want to save your changes to the material before closing? + + + + + If you don't save, your changes will be lost. + + + + + CmdMaterialsEdit + + + Material + + + + + Edit... + + + + + Edit material properties + + + diff --git a/src/Mod/Material/materials-editor.ui b/src/Mod/Material/Resources/ui/materials-editor.ui similarity index 100% rename from src/Mod/Material/materials-editor.ui rename to src/Mod/Material/Resources/ui/materials-editor.ui diff --git a/src/Mod/Material/StandardMaterial/ABS-Generic.FCMat b/src/Mod/Material/StandardMaterial/ABS-Generic.FCMat deleted file mode 100644 index f0062310f1..0000000000 --- a/src/Mod/Material/StandardMaterial/ABS-Generic.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; ABS-Generic -; (c) 2013 Juergen Riegel (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = ABS -Description = This is a blend AcrylnitrilButadienStyrol (ABS) material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised ABS-blend cards. -Father = Thermoplast -SourceURL = http://www.matweb.com/search/DataSheet.aspx?MatGUID=eb7a78f5948d481c9493a67f0d089646 - -[Mechanical] -Density = 1060 kg/m^3 -PoissonRatio = 0.37 -UltimateTensileStrength = 38.8 MPa -YieldStrength = 44.1 MPa -YoungsModulus = 2300 MPa - -[Thermal] -SpecificHeat = 2050 J/kg/K -ThermalConductivity = 0.158 W/m/K -ThermalExpansionCoefficient = 0.000093 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Acrylonitrile_butadiene_styrene diff --git a/src/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat b/src/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat deleted file mode 100644 index 76b9b3b352..0000000000 --- a/src/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat +++ /dev/null @@ -1,29 +0,0 @@ -; Acrylic-Glass-Generic -; (c) 2016 Przemo Firszt (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Acrylic Glass -Description = Poly(methyl methacrylate) (PMMA, acrylic, acrylic glass, trade names Plexiglas, Acrylite, Lucite, Perspex) a transparent thermoplastic often used in sheet form as a lightweight or shatter-resistant alternative to glass. -DescriptionPL = Szkło akrylowe (szkło organiczne; inaczej pleksi, pleksiglas, metapleks) – przezroczyste tworzywo sztuczne, którego głównym składnikiem jest polimer – poli(metakrylan metylu) (PMMA). -Father = of the material, i.e. for PLA is Thermoplast, for Steel is Metal Thermoplast -SourceURL = http://www.matweb.com/search/DataSheet.aspx?MatGUID=632572aeef2a4224b5ac8fbd4f1b6f77 - -[Mechanical] -CompressiveStrength = 103 MPa -Density = 1160 kg/m^3 -PoissonRatio = 0.38 -ShearModulus = 1.08 GPa -UltimateTensileStrength = 57.7 MPa -YieldStrength = 73.7 MPa -YoungsModulus = 2550 MPa - -[Thermal] -SpecificHeat = 1480 J/kg/K -ThermalConductivity = 0.193 W/m/K -ThermalExpansionCoefficient = 0.000075 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Poly(methyl_methacrylate) diff --git a/src/Mod/Material/StandardMaterial/AlMg3F24.FCMat b/src/Mod/Material/StandardMaterial/AlMg3F24.FCMat deleted file mode 100644 index ef6234d1ef..0000000000 --- a/src/Mod/Material/StandardMaterial/AlMg3F24.FCMat +++ /dev/null @@ -1,28 +0,0 @@ -; AlMg3F24 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = AlMg3F24 -NameDE = AlMg3F24 -Father = Metal -KindOfMaterial = Aluminium -KindOfMaterialDE = Aluminium -MaterialNumber = 3.3535.26 -Norm = DIN 1725 - -[Mechanical] -Density = 2700 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 27000 MPa -UltimateStrain = 5 -UltimateTensileStrength = 250 MPa -YieldStrength = 180 MPa -YoungsModulus = 70000 MPa - -[Thermal] -SpecificHeat = 900 J/kg/K -ThermalConductivity = 150 W/m/K -ThermalExpansionCoefficient = 23 µm/m/K diff --git a/src/Mod/Material/StandardMaterial/AlMgSi1F31.FCMat b/src/Mod/Material/StandardMaterial/AlMgSi1F31.FCMat deleted file mode 100644 index 3e0734a0e8..0000000000 --- a/src/Mod/Material/StandardMaterial/AlMgSi1F31.FCMat +++ /dev/null @@ -1,28 +0,0 @@ -; AlMgSi1F31 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = AlMgSi1F31 -NameDE = AlMgSi1F31 -Father = Metal -KindOfMaterial = Aluminium -KindOfMaterialDE = Aluminium -MaterialNumber = 3.2315.72 -Norm = DIN 1725 - -[Mechanical] -Density = 2700 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 27000 MPa -UltimateStrain = 10 -UltimateTensileStrength = 310 MPa -YieldStrength = 260 MPa -YoungsModulus = 70000 MPa - -[Thermal] -SpecificHeat = 896 J/kg/K -ThermalConductivity = 160 W/m/K -ThermalExpansionCoefficient = 23 µm/m/K diff --git a/src/Mod/Material/StandardMaterial/AlZn4-5Mg1F35.FCMat b/src/Mod/Material/StandardMaterial/AlZn4-5Mg1F35.FCMat deleted file mode 100644 index c38cc5d6bc..0000000000 --- a/src/Mod/Material/StandardMaterial/AlZn4-5Mg1F35.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; AlZn4-5Mg1F35 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = AlZn4,5Mg1F35 -NameDE = AlZn4,5Mg1F35 -Father = Metal -KindOfMaterial = Aluminium -KindOfMaterialDE = Aluminium -MaterialNumber = 3.4335.71 -Norm = DIN 1725 - -[Mechanical] -Density = 2700 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 27000 MPa -UltimateStrain = 10 -UltimateTensileStrength = 350 MPa -YieldStrength = 290 MPa -YoungsModulus = 70000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000023 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Aluminum-6061-T6.FCMat b/src/Mod/Material/StandardMaterial/Aluminum-6061-T6.FCMat deleted file mode 100644 index 250ed9bbd1..0000000000 --- a/src/Mod/Material/StandardMaterial/Aluminum-6061-T6.FCMat +++ /dev/null @@ -1,24 +0,0 @@ -; Aluminum-6061-T6 -; (c) 2016 Mandeep Singh (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Aluminum 6061-T6 -Description = Precipitation-hardened, Nonferrous Aluminum alloy -Father = Metal -KindOfMaterial = Aluminium -KindOfMaterialDE = Aluminium - -[Mechanical] -Density = 2700 kg/m^3 -PoissonRatio = 0.33 -UltimateTensileStrength = 310 MPa -YoungsModulus = 69000 MPa - -[Thermal] -ThermalConductivity = 167 W/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/6061_aluminium_alloy diff --git a/src/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat b/src/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat deleted file mode 100644 index 949895a84b..0000000000 --- a/src/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Aluminum-Generic -; Uwe Stöhr -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD 0.21.29751 (Git) - -[General] -Name = Aluminum Generic -Father = Metal -KindOfMaterial = Aluminium - -[Mechanical] -Density = 2700 kg/m^3 -PoissonRatio = 0.35 -ShearModulus = 25.0 GPa -UltimateTensileStrength = 310 MPa -YoungsModulus = 70000 MPa - -[Thermal] -SpecificHeat = 897.0 J/kg/K -ThermalConductivity = 237.0 W/m/K -ThermalExpansionCoefficient = 23.1 µm/m/K - -[Electromagnetic] -ElectricalConductivity = 370370.4 S/m -RelativePermeability = 1.0 diff --git a/src/Mod/Material/StandardMaterial/CalculiX-Steel.FCMat b/src/Mod/Material/StandardMaterial/CalculiX-Steel.FCMat deleted file mode 100644 index 94dc3563b3..0000000000 --- a/src/Mod/Material/StandardMaterial/CalculiX-Steel.FCMat +++ /dev/null @@ -1,20 +0,0 @@ -; CalculiX-Steel -; (c) 2013 Juergen Riegel (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = CalculiX-Steel -Description = Standard steel material for CalculiX sample calculations -Father = Metal - -[Mechanical] -Density = 7900 kg/m^3 -PoissonRatio = 0.3 -YoungsModulus = 210000 MPa - -[Thermal] -SpecificHeat = 590 J/kg/K -ThermalConductivity = 43 W/m/K -ThermalExpansionCoefficient = 0.000012 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Concrete-EN-C35_45.FCMat b/src/Mod/Material/StandardMaterial/Concrete-EN-C35_45.FCMat deleted file mode 100644 index 8439381a72..0000000000 --- a/src/Mod/Material/StandardMaterial/Concrete-EN-C35_45.FCMat +++ /dev/null @@ -1,20 +0,0 @@ -; Concrete-EN-C35_45 -; (c) 2019 Bernd Hahnebach (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD 0.19.16886 (Git) - -[General] -Name = Concrete-EN-C35/45 -Description = Concrete matrix for reinforcement material examples, 0.6 x 0.75 x 35 MPa = 15.75 MPa (https://forum.freecad.org/viewtopic.php?f=18&t=33106&start=200#p311075) -Father = Aggregate - -[Mechanical] -AngleOfFriction = 30 deg -CompressiveStrength = 15.75 MPa -Density = 2500 kg/m^3 -PoissonRatio = 0.17 -YoungsModulus = 32000 MPa - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Concrete diff --git a/src/Mod/Material/StandardMaterial/Concrete-Generic.FCMat b/src/Mod/Material/StandardMaterial/Concrete-Generic.FCMat deleted file mode 100644 index af1911ac7b..0000000000 --- a/src/Mod/Material/StandardMaterial/Concrete-Generic.FCMat +++ /dev/null @@ -1,20 +0,0 @@ -; Concrete-Generic -; (c) 2013 Yorik van Havre (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Concrete -Description = A standard C-25 construction concrete -Father = Aggregate -StandardCode = Masterformat 03 33 13 - -[Mechanical] -CompressiveStrength = 25 MPa -Density = 2400 kg/m^3 -PoissonRatio = 0.17 -YoungsModulus = 32000 MPa - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Concrete diff --git a/src/Mod/Material/StandardMaterial/Copper-Generic.FCMat b/src/Mod/Material/StandardMaterial/Copper-Generic.FCMat deleted file mode 100644 index 2c951f0838..0000000000 --- a/src/Mod/Material/StandardMaterial/Copper-Generic.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Copper Generic -; Uwe Stöhr -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD 0.21.30044 (Git) - -[General] -Name = Copper Generic -Father = Metal -KindOfMaterial = Copper - -[Mechanical] -Density = 8960 kg/m^3 -PoissonRatio = 0.343 -ShearModulus = 46.0 GPa -UltimateTensileStrength = 210 MPa -YieldStrength = 33.3 MPa -YoungsModulus = 119 GPa - -[Thermal] -SpecificHeat = 385.0 J/kg/K -ThermalConductivity = 398.0 W/m/K -ThermalExpansionCoefficient = 16.5 µm/m/K - -[Electromagnetic] -ElectricalConductivity = 59.59 MS/m -RelativePermeability = 0.999994 diff --git a/src/Mod/Material/StandardMaterial/Glass-E-GlassFibre.FCMat b/src/Mod/Material/StandardMaterial/Glass-E-GlassFibre.FCMat deleted file mode 100644 index 7f1ef6ac10..0000000000 --- a/src/Mod/Material/StandardMaterial/Glass-E-GlassFibre.FCMat +++ /dev/null @@ -1,18 +0,0 @@ -; Glass-E-GlassFibre -; (c) 2015 DaviKaur (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Glass-E -Description = Glass Fibre -Father = Glass - -[Mechanical] -CompressiveStrength = 1080 MPa -Density = 2580 kg/m^3 -UltimateTensileStrength = 3445 MPa - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Glass_fiber diff --git a/src/Mod/Material/StandardMaterial/Glass-Generic.FCMat b/src/Mod/Material/StandardMaterial/Glass-Generic.FCMat deleted file mode 100644 index e339c6a00f..0000000000 --- a/src/Mod/Material/StandardMaterial/Glass-Generic.FCMat +++ /dev/null @@ -1,23 +0,0 @@ -; Glass-Generic -; (c) 2015 Przemo Firszt (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Glass -Description = Generic soda-lime glass -DescriptionDE = Normalglas -DescriptionPL = Szkło sodowe -Father = Glass - -[Mechanical] -Density = 2520 kg/m^3 -PoissonRatio = 0.22 -YoungsModulus = 72000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000009 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Soda-lime_glass diff --git a/src/Mod/Material/StandardMaterial/Glass-S2-GlassFibre.FCMat b/src/Mod/Material/StandardMaterial/Glass-S2-GlassFibre.FCMat deleted file mode 100644 index 61e77d119e..0000000000 --- a/src/Mod/Material/StandardMaterial/Glass-S2-GlassFibre.FCMat +++ /dev/null @@ -1,18 +0,0 @@ -; Glass-S2-GlassFibre -; (c) 2015 DaviKaur (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Glass-S2 -Description = Glass Fibre -Father = Glass - -[Mechanical] -CompressiveStrength = 1600 MPa -Density = 2460 kg/m^3 -UltimateTensileStrength = 4890 MPa - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Glass_fiber diff --git a/src/Mod/Material/StandardMaterial/Graphite.FCMat b/src/Mod/Material/StandardMaterial/Graphite.FCMat deleted file mode 100644 index f9b5a70a4c..0000000000 --- a/src/Mod/Material/StandardMaterial/Graphite.FCMat +++ /dev/null @@ -1,33 +0,0 @@ -; Graphite -; Uwe Stöhr, LGPL -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD 0.20.24516 (Git) - -[General] -Name = Graphite -Description = Typical material properties for pure graphite -Father = Carbon -KindOfMaterial = Solid -ReferenceSource = Properties and characteristics of graphite -SourceURL = https://www.entegris.com/content/dam/web/resources/manuals-and-guides/manual-properties-and-characteristics-of-graphite-109441.pdf - -[Mechanical] -CompressiveStrength = 120.000 MPa -Density = 1750.000 kg/m^3 -PoissonRatio = 0.20 -UltimateTensileStrength = 34 MPa -YoungsModulus = 11.7 MPa - -[Thermal] -SpecificHeat = 0.72 kJ/kg/K -ThermalConductivity = 96.000 W/m/K -ThermalExpansionCoefficient = 8e-6 1/K - -[Electromagnetic] -RelativePermittivity = 0.7 -ElectricalConductivity = 2e4 S/m -RelativePermeability = 1.0 - -[UserDefined] -MolarMass = 12 diff --git a/src/Mod/Material/StandardMaterial/Invar-Generic.FCMat b/src/Mod/Material/StandardMaterial/Invar-Generic.FCMat deleted file mode 100644 index acae1212f5..0000000000 --- a/src/Mod/Material/StandardMaterial/Invar-Generic.FCMat +++ /dev/null @@ -1,25 +0,0 @@ -; Invar Generic -; Uwe Stöhr -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD 0.21.30044 (Git) - -[General] -Name = Invar Generic -Father = Metal -KindOfMaterial = Nickel Iron Alloy - -[Mechanical] -Density = 8150 kg/m^3 -PoissonRatio = 0.29 -ShearModulus = 56.0 GPa -UltimateTensileStrength = 600 MPa -YoungsModulus = 140.0 GPa - -[Thermal] -SpecificHeat = 515.0 J/kg/K -ThermalConductivity = 13.5 W/m/K -ThermalExpansionCoefficient = 1.25 µm/m/K - -[Electromagnetic] -ElectricalConductivity = 1250000 S/m diff --git a/src/Mod/Material/StandardMaterial/Iron-Generic.FCMat b/src/Mod/Material/StandardMaterial/Iron-Generic.FCMat deleted file mode 100644 index dcfe1bb767..0000000000 --- a/src/Mod/Material/StandardMaterial/Iron-Generic.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Iron Generic -; Uwe Stöhr -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material - -[General] -Name = Iron Generic -Father = Metal -KindOfMaterial = Iron - -[Mechanical] -Density = 7874 kg/m^3 -PoissonRatio = 0.29 -ShearModulus = 82.0 GPa -UltimateTensileStrength = 497 MPa -YieldStrength = 428 MPa -YoungsModulus = 211 GPa - -[Thermal] -SpecificHeat = 460.5 J/kg/K -ThermalConductivity = 80.4 W/m/K -ThermalExpansionCoefficient = 11.8 µm/m/K - -[Electromagnetic] -ElectricalConductivity = 10.3 MS/m -RelativePermeability = 5000.0 diff --git a/src/Mod/Material/StandardMaterial/None.FCMat b/src/Mod/Material/StandardMaterial/None.FCMat deleted file mode 100644 index ddc08894ed..0000000000 --- a/src/Mod/Material/StandardMaterial/None.FCMat +++ /dev/null @@ -1,16 +0,0 @@ -; None -; (c) 2015 Przemo Firszt (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = None -Description = This is a not defined material -Father = None - -[Mechanical] -Density = 0 kg/m^3 -PoissonRatio = 0 -UltimateTensileStrength = 0 MPa -YoungsModulus = 0 MPa diff --git a/src/Mod/Material/StandardMaterial/PA6-Generic.FCMat b/src/Mod/Material/StandardMaterial/PA6-Generic.FCMat deleted file mode 100644 index 9db6124158..0000000000 --- a/src/Mod/Material/StandardMaterial/PA6-Generic.FCMat +++ /dev/null @@ -1,25 +0,0 @@ -; PA6-Generic -; (c) 2019 Uwe Stöhr (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Polyamide 6 -SourceURL = http://www.matweb.com/search/datasheet.aspx?MatGUID=8d78f3cfcb6f49d595896ce6ce6a2ef1 - -[Mechanical] -CompressiveStrength = 67.6 MPa -Density = 1150 kg/m^3 -PoissonRatio = 0.39 -UltimateTensileStrength = 75.5 MPa -YieldStrength = 70.5 MPa -YoungsModulus = 2930 MPa - -[Thermal] -SpecificHeat = 1670 J/kg/K -ThermalConductivity = 0.262 W/m/K -ThermalExpansionCoefficient = 0.000082 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Nylon_6 diff --git a/src/Mod/Material/StandardMaterial/PET-Generic.FCMat b/src/Mod/Material/StandardMaterial/PET-Generic.FCMat deleted file mode 100644 index aea97917aa..0000000000 --- a/src/Mod/Material/StandardMaterial/PET-Generic.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; PET-Generic -; (c) 2019 Uwe Stöhr (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = PET -SourceURL = http://www.matweb.com/search/DataSheet.aspx?MatGUID=a696bdcdff6f41dd98f8eec3599eaa20 - -[Mechanical] -CompressiveStrength = 38.0 MPa -Density = 1380 kg/m^3 -PoissonRatio = 0.36 -ShearModulus = 0.0385 GPa -UltimateTensileStrength = 38.8 MPa -YieldStrength = 62.8 MPa -YoungsModulus = 3150 MPa - -[Thermal] -SpecificHeat = 1140 J/kg/K -ThermalConductivity = 0.181 W/m/K -ThermalExpansionCoefficient = 0.000072 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Polyethylene_terephthalate diff --git a/src/Mod/Material/StandardMaterial/PLA-Generic.FCMat b/src/Mod/Material/StandardMaterial/PLA-Generic.FCMat deleted file mode 100644 index 64f24a638f..0000000000 --- a/src/Mod/Material/StandardMaterial/PLA-Generic.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; PLA-Generic -; (c) 2019 Uwe Stöhr (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = PLA -Description = Polylactic acid or polylactide (PLA, Poly) is a biodegradable thermoplastic aliphatic polyester derived from renewable resources, such as corn starch, tapioca roots, chips, starch or sugarcane. -Father = Thermoplast -SourceURL = https://www.sd3d.com/wp-content/uploads/2017/06/MaterialTDS-PLA_01.pdf - -[Mechanical] -Density = 1240 kg/m^3 -PoissonRatio = 0.36 -UltimateTensileStrength = 26.4 MPa -YieldStrength = 35.9 MPa -YoungsModulus = 3640 MPa - -[Thermal] -SpecificHeat = 1800 J/kg/K -ThermalConductivity = 0.130 W/m/K -ThermalExpansionCoefficient = 0.000041 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Polylactic_acid diff --git a/src/Mod/Material/StandardMaterial/PP-Generic.FCMat b/src/Mod/Material/StandardMaterial/PP-Generic.FCMat deleted file mode 100644 index 172162b0b5..0000000000 --- a/src/Mod/Material/StandardMaterial/PP-Generic.FCMat +++ /dev/null @@ -1,25 +0,0 @@ -; PP-Generic -; (c) 2019 Uwe Stöhr (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Polypropylene -SourceURL = http://www.matweb.com/search/DataSheet.aspx?MatGUID=a882a1c603374e278d062f106dfda95b - -[Mechanical] -CompressiveStrength = 10 MPa -Density = 916 kg/m^3 -PoissonRatio = 0.44 -UltimateTensileStrength = 79.7 MPa -YieldStrength = 32.8 MPa -YoungsModulus = 1470 MPa - -[Thermal] -SpecificHeat = 1920 J/kg/K -ThermalConductivity = 0.249 W/m/K -ThermalExpansionCoefficient = 0.000123 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Polypropylene diff --git a/src/Mod/Material/StandardMaterial/PTFE-Generic.FCMat b/src/Mod/Material/StandardMaterial/PTFE-Generic.FCMat deleted file mode 100644 index 06362ff068..0000000000 --- a/src/Mod/Material/StandardMaterial/PTFE-Generic.FCMat +++ /dev/null @@ -1,25 +0,0 @@ -; PTFE-Generic -; (c) 2019 Uwe Stöhr (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = PTFE -SourceURL = http://www.matweb.com/search/datasheet.aspx?MatGUID=4d14eac958e5401a8fd152e1261b6843 - -[Mechanical] -CompressiveStrength = 10.2 MPa -Density = 2070 kg/m^3 -PoissonRatio = 0.46 -UltimateTensileStrength = 34.6 MPa -YieldStrength = 20.5 MPa -YoungsModulus = 564 MPa - -[Thermal] -SpecificHeat = 1010 J/kg/K -ThermalConductivity = 0.263 W/m/K -ThermalExpansionCoefficient = 0.000108 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Polytetrafluoroethylene diff --git a/src/Mod/Material/StandardMaterial/PVC-Generic.FCMat b/src/Mod/Material/StandardMaterial/PVC-Generic.FCMat deleted file mode 100644 index c3f4455e5b..0000000000 --- a/src/Mod/Material/StandardMaterial/PVC-Generic.FCMat +++ /dev/null @@ -1,23 +0,0 @@ -; PVC-Generic -; (c) 2019 Uwe Stöhr (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = PVC -SourceURL = http://www.matweb.com/search/DataSheet.aspx?MatGUID=1f650966ec834bb8833dd4c6e3116079 - -[Mechanical] -Density = 1380 kg/m^3 -PoissonRatio = 0.38 -UltimateTensileStrength = 50 MPa -YoungsModulus = 2800 MPa - -[Thermal] -SpecificHeat = 1000 J/kg/K -ThermalConductivity = 0.150 W/m/K -ThermalExpansionCoefficient = 0.000075 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Polyvinyl_chloride diff --git a/src/Mod/Material/StandardMaterial/Readme.txt b/src/Mod/Material/StandardMaterial/Readme.txt deleted file mode 100644 index 2c42c08e75..0000000000 --- a/src/Mod/Material/StandardMaterial/Readme.txt +++ /dev/null @@ -1,23 +0,0 @@ -This is the FreeCAD standard material library. It's intended to gather -the most common Material definitions. -How to do a description is explained here: -https://www.freecad.org/wiki/Material - -To make the material description useful for a lot of applications only -files with the (CC BY 3.0) license will be accepted into the FreeCAD -source distribution. For more detail about the license, see here: -http://creativecommons.org/ - -Please help! -Enlargen the base of Materials for FreeCAD will greatly benefit the -usability of FreeCAD. So please help us to add new Materials, review -existing ones or add additional values. A good source for material -definitions are textbooks or the www.matweb.com database. - -2013 Juergen Riegel - -Edit: -This is work in progress. Please verify the material properties before -use. - -Please use the provided TEMPLATE.FCMat file to create new materials. diff --git a/src/Mod/Material/StandardMaterial/Reinforcement-FIB-B500.FCMat b/src/Mod/Material/StandardMaterial/Reinforcement-FIB-B500.FCMat deleted file mode 100644 index 2958fea2cc..0000000000 --- a/src/Mod/Material/StandardMaterial/Reinforcement-FIB-B500.FCMat +++ /dev/null @@ -1,15 +0,0 @@ -; Reinforcement-FIB-B500 -; (c) 2019 Bernd Hahnebach (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD 0.19.16886 (Git) - -[General] -Name = Reinforcement-Harry -Description = Reinforcement inside concrete for reinforcement material examples, from fib examples, 0.84 x 0.75 x 500 MPa = 315 MPa (https://forum.freecad.org/viewtopic.php?f=18&t=33106&start=200#p311705) - -[Mechanical] -Density = 7850 kg/m^3 -PoissonRatio = 0.3 -YieldStrength = 315 MPa -YoungsModulus = 210000 MPa diff --git a/src/Mod/Material/StandardMaterial/Steel-15CrNi6.FCMat b/src/Mod/Material/StandardMaterial/Steel-15CrNi6.FCMat deleted file mode 100644 index 07e962b3b6..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-15CrNi6.FCMat +++ /dev/null @@ -1,28 +0,0 @@ -; Steel-15CrNi6 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 15CrNi6 -Description = High-strength carbon steel -DescriptionDE = höchste Beanspruchung, Achsen, Wellen, Ritzel, Nocken, Kegelräder -DescriptionPL = Wysokowytrzymała stal węglowa -Father = Metal -KindOfMaterial = Case-hardened steel -KindOfMaterialDE = Einsatzstahl -MaterialNumber = 1.5919 -Norm = EN 10084 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 9 -UltimateTensileStrength = 1000 MPa -YieldStrength = 680 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-17CrNiMo6.FCMat b/src/Mod/Material/StandardMaterial/Steel-17CrNiMo6.FCMat deleted file mode 100644 index ba354bec6a..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-17CrNiMo6.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-17CrNiMo6 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 17CrNiMo6 -NameDE = 17CrNiMo6 -DescriptionDE = höchste Beanspruchung, Wellen, Zahnräder -Father = Metal -KindOfMaterial = Case-hardened steel -KindOfMaterialDE = Einsatzstahl -MaterialNumber = 1.6587 -Norm = EN 10084 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 8 -UltimateTensileStrength = 1150 MPa -YieldStrength = 830 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-1C22.FCMat b/src/Mod/Material/StandardMaterial/Steel-1C22.FCMat deleted file mode 100644 index de988855c5..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-1C22.FCMat +++ /dev/null @@ -1,29 +0,0 @@ -; Steel-1C22 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 1C22 -NameDE = C22 -Description = Case hardened alloy steel -DescriptionDE = kleiner Vergütungsdurchmesser, gut schweißbar -DescriptionPL = Stal stopowa do nawęglania -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.0402 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 27 -UltimateTensileStrength = 400 MPa -YieldStrength = 230 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-1C35.FCMat b/src/Mod/Material/StandardMaterial/Steel-1C35.FCMat deleted file mode 100644 index 65358d6f79..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-1C35.FCMat +++ /dev/null @@ -1,28 +0,0 @@ -; Steel-1C35 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 1C35 -NameDE = C35 -Description = Non-alloy quality steel -DescriptionPL = Wysokogatunkowa stal niestopowa -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.0501 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 21 -UltimateTensileStrength = 480 MPa -YieldStrength = 300 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-1C45.FCMat b/src/Mod/Material/StandardMaterial/Steel-1C45.FCMat deleted file mode 100644 index f335f2c871..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-1C45.FCMat +++ /dev/null @@ -1,28 +0,0 @@ -; Steel-1C45 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 1C45 -NameDE = C45 -Description = Non-alloy quality steel -DescriptionPL = Wysokogatunkowa stal niestopowa -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.0503 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 14 -UltimateTensileStrength = 580 MPa -YieldStrength = 340 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-1C60.FCMat b/src/Mod/Material/StandardMaterial/Steel-1C60.FCMat deleted file mode 100644 index 7c52f99de0..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-1C60.FCMat +++ /dev/null @@ -1,28 +0,0 @@ -; Steel-1C60 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 1C60 -NameDE = C60 -Description = Non-alloy quality steel -DescriptionPL = Wysokogatunkowa stal niestopowa -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.0601 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 11 -UltimateTensileStrength = 650 MPa -YieldStrength = 380 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-20NiCrMo2.FCMat b/src/Mod/Material/StandardMaterial/Steel-20NiCrMo2.FCMat deleted file mode 100644 index 55cf66bb63..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-20NiCrMo2.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-20NiCrMo2 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 20NiCrMo2 -NameDE = 21NiCrMo2 -DescriptionDE = höchste Beanspruchung, Wellen, Zahnräder -Father = Metal -KindOfMaterial = Case-hardened steel -KindOfMaterialDE = Einsatzstahl -MaterialNumber = 1.6523 -Norm = EN 10084 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 10 -UltimateTensileStrength = 900 MPa -YieldStrength = 630 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-28Mn6.FCMat b/src/Mod/Material/StandardMaterial/Steel-28Mn6.FCMat deleted file mode 100644 index abfd94961d..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-28Mn6.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-28Mn6 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 28Mn6 -NameDE = 28Mn6 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.117 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 13 -UltimateTensileStrength = 800 MPa -YieldStrength = 590 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-2C10.FCMat b/src/Mod/Material/StandardMaterial/Steel-2C10.FCMat deleted file mode 100644 index c2925a46fa..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-2C10.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-2C10 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 2C10 -NameDE = Ck10 -Father = Metal -KindOfMaterial = Case-hardened steel -KindOfMaterialDE = Einsatzstahl -MaterialNumber = 1.1121 -Norm = EN 10084 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 640 MPa -YieldStrength = 390 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-30CrNiMo8.FCMat b/src/Mod/Material/StandardMaterial/Steel-30CrNiMo8.FCMat deleted file mode 100644 index 2049d6fa33..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-30CrNiMo8.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-30CrNiMo8 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 30CrNiMo8 -NameDE = 30CrNiMo8 -DescriptionDE = höchste Beanspruchung, Wellen, Zahnräder -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.658 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 9 -UltimateTensileStrength = 1250 MPa -YieldStrength = 1050 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-34CrNiMo6.FCMat b/src/Mod/Material/StandardMaterial/Steel-34CrNiMo6.FCMat deleted file mode 100644 index f022606163..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-34CrNiMo6.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-34CrNiMo6 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 34CrNiMo6 -NameDE = 34CrNiMo6 -DescriptionDE = höchste Beanspruchung, Wellen, Zahnräder -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.6582 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 9 -UltimateTensileStrength = 1200 MPa -YieldStrength = 1000 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-36CrNiMo4.FCMat b/src/Mod/Material/StandardMaterial/Steel-36CrNiMo4.FCMat deleted file mode 100644 index 2c2d22037a..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-36CrNiMo4.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-36CrNiMo4 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 36CrNiMo4 -NameDE = 36CrNiMo4 -DescriptionDE = höchste Beanspruchung, Wellen, Zahnräder -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.6511 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 10 -UltimateTensileStrength = 1100 MPa -YieldStrength = 900 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-36NiCrMo16.FCMat b/src/Mod/Material/StandardMaterial/Steel-36NiCrMo16.FCMat deleted file mode 100644 index 3c67ef0d84..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-36NiCrMo16.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-36NiCrMo16 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 36NiCrMo16 -NameDE = 36NiCrMo16 -DescriptionDE = höchste Beanspruchung, Wellen, Zahnräder -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.6773 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 9 -UltimateTensileStrength = 1250 MPa -YieldStrength = 1050 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-3C15.FCMat b/src/Mod/Material/StandardMaterial/Steel-3C15.FCMat deleted file mode 100644 index c1ec6e82f3..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-3C15.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-3C15 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 3C15 -NameDE = Cm15 -Father = Metal -KindOfMaterial = Case-hardened steel -KindOfMaterialDE = Einsatzstahl -MaterialNumber = 1.114 -Norm = EN 10084 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 740 MPa -YieldStrength = 440 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-3C22.FCMat b/src/Mod/Material/StandardMaterial/Steel-3C22.FCMat deleted file mode 100644 index 86bf566666..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-3C22.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-3C22 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 3C22 -NameDE = Cm22 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1149 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 24 -UltimateTensileStrength = 550 MPa -YieldStrength = 350 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-3C35.FCMat b/src/Mod/Material/StandardMaterial/Steel-3C35.FCMat deleted file mode 100644 index 82794a57d6..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-3C35.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-3C35 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 3C35 -NameDE = Cm35 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.118 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 17 -UltimateTensileStrength = 630 MPa -YieldStrength = 430 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-3V45.FCMat b/src/Mod/Material/StandardMaterial/Steel-3V45.FCMat deleted file mode 100644 index 753b6820ed..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-3V45.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-3V45 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = 3V45 -NameDE = Cm45 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1201 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 14 -UltimateTensileStrength = 700 MPa -YieldStrength = 500 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C10.FCMat b/src/Mod/Material/StandardMaterial/Steel-C10.FCMat deleted file mode 100644 index ba357cd59f..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C10.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C10 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C10 -NameDE = C10 -Father = Metal -KindOfMaterial = Case-hardened steel -KindOfMaterialDE = Einsatzstahl -MaterialNumber = 1.0301 -Norm = DIN 17210 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 16 -UltimateTensileStrength = 650 MPa -YieldStrength = 380 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C15.FCMat b/src/Mod/Material/StandardMaterial/Steel-C15.FCMat deleted file mode 100644 index 8e848bf886..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C15.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C15 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C15 -NameDE = C15 -Father = Metal -KindOfMaterial = Case-hardened steel -KindOfMaterialDE = Einsatzstahl -MaterialNumber = 1.0401 -Norm = DIN 17210 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 14 -UltimateTensileStrength = 750 MPa -YieldStrength = 430 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C22E.FCMat b/src/Mod/Material/StandardMaterial/Steel-C22E.FCMat deleted file mode 100644 index 2ab93f02df..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C22E.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C22E -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C22E -NameDE = Ck22 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1151 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 20 -UltimateTensileStrength = 500 MPa -YieldStrength = 340 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C25E.FCMat b/src/Mod/Material/StandardMaterial/Steel-C25E.FCMat deleted file mode 100644 index fcf39af240..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C25E.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C25E -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C25E -NameDE = Ck25 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1158 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 19 -UltimateTensileStrength = 550 MPa -YieldStrength = 370 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C30E.FCMat b/src/Mod/Material/StandardMaterial/Steel-C30E.FCMat deleted file mode 100644 index 7ad49ed63b..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C30E.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C30E -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C30E -NameDE = Ck30 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1178 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 18 -UltimateTensileStrength = 600 MPa -YieldStrength = 400 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C40E.FCMat b/src/Mod/Material/StandardMaterial/Steel-C40E.FCMat deleted file mode 100644 index 09cbb1eec9..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C40E.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C40E -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C40E -NameDE = Ck40 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1186 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 16 -UltimateTensileStrength = 650 MPa -YieldStrength = 460 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C50E.FCMat b/src/Mod/Material/StandardMaterial/Steel-C50E.FCMat deleted file mode 100644 index afa4887fa8..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C50E.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C50E -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C50E -NameDE = Ck50 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1206 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 13 -UltimateTensileStrength = 750 MPa -YieldStrength = 520 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C55E.FCMat b/src/Mod/Material/StandardMaterial/Steel-C55E.FCMat deleted file mode 100644 index 76922f2f77..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C55E.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C55E -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C55E -NameDE = Ck55 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1203 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 13 -UltimateTensileStrength = 800 MPa -YieldStrength = 550 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-C60E.FCMat b/src/Mod/Material/StandardMaterial/Steel-C60E.FCMat deleted file mode 100644 index 91e890de86..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-C60E.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-C60E -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = C60E -NameDE = Ck60 -Father = Metal -KindOfMaterial = Heat-treatable steel -KindOfMaterialDE = Vergütungsstahl -MaterialNumber = 1.1221 -Norm = EN 10083-1 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 13 -UltimateTensileStrength = 850 MPa -YieldStrength = 580 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-E295-GC.FCMat b/src/Mod/Material/StandardMaterial/Steel-E295-GC.FCMat deleted file mode 100644 index f644665742..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-E295-GC.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-E295-GC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = E295 GC -NameDE = St50-2K -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0533 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 590 MPa -YieldStrength = 420 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-E295.FCMat b/src/Mod/Material/StandardMaterial/Steel-E295.FCMat deleted file mode 100644 index 60ad178cbf..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-E295.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-E295 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = E295 -NameDE = St50-2 -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.005 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 20 -UltimateTensileStrength = 490 MPa -YieldStrength = 295 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-E335-GC.FCMat b/src/Mod/Material/StandardMaterial/Steel-E335-GC.FCMat deleted file mode 100644 index 6ac331ec72..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-E335-GC.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-E335-GC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = E335 GC -NameDE = St60-2K -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0543 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 690 MPa -YieldStrength = 490 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-E335.FCMat b/src/Mod/Material/StandardMaterial/Steel-E335.FCMat deleted file mode 100644 index 50178c855d..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-E335.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-E335 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = E335 -NameDE = St60-2 -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.006 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 16 -UltimateTensileStrength = 590 MPa -YieldStrength = 335 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-E360-GC.FCMat b/src/Mod/Material/StandardMaterial/Steel-E360-GC.FCMat deleted file mode 100644 index ca79ddef0e..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-E360-GC.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-E360-GC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = E360 GC -NameDE = St70-2K -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0633 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 780 MPa -YieldStrength = 560 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-E360.FCMat b/src/Mod/Material/StandardMaterial/Steel-E360.FCMat deleted file mode 100644 index 24730eb4a3..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-E360.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-E360 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = E360 -NameDE = St70-2 -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.007 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 11 -UltimateTensileStrength = 690 MPa -YieldStrength = 360 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-100.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJL-100.FCMat deleted file mode 100644 index 129d1e82b3..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-100.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-EN-GJL-100 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJL-100 -NameDE = GG-10 -DescriptionDE = für gering beanspruchte Teile -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.601 -Norm = EN 1561 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 34000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 100 MPa -YoungsModulus = 88000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-150.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJL-150.FCMat deleted file mode 100644 index 99139e2a7c..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-150.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJL-150 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJL-150 -NameDE = GG-15 -DescriptionDE = für dünnwandige Teile wie Gehäuse, Ständer -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.6015 -Norm = EN 1561 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 37000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 150 MPa -YieldStrength = 98 MPa -YoungsModulus = 95000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-200.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJL-200.FCMat deleted file mode 100644 index 53180c3e24..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-200.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJL-200 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJL-200 -NameDE = GG-20 -DescriptionDE = Hebel, Lager , Lagerböcke -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.602 -Norm = EN 1561 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 40000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 200 MPa -YieldStrength = 130 MPa -YoungsModulus = 105000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-250.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJL-250.FCMat deleted file mode 100644 index 368068a83b..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-250.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-EN-GJL-250 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJL-250 -NameDE = GG-25 -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.6025 -Norm = EN 1561 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 44000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 250 MPa -YieldStrength = 165 MPa -YoungsModulus = 115000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-300.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJL-300.FCMat deleted file mode 100644 index f9fa8f060f..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-300.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJL-300 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJL-300 -NameDE = GG-30 -DescriptionDE = hochbeanspruchbar, für Motorständer, Lagerschalen -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.603 -Norm = EN 1561 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 48000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 300 MPa -YieldStrength = 195 MPa -YoungsModulus = 125000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-350.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJL-350.FCMat deleted file mode 100644 index cdc01bd40c..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJL-350.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJL-350 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJL-350 -NameDE = GG-35 -DescriptionDE = höchstbeanspruchbar, für Teile mit konstanter Wanddicke, Pressenständer, Turbinengehäuse -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.6035 -Norm = EN 1561 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 52000 MPa -UltimateStrain = 15 -UltimateTensileStrength = 350 MPa -YieldStrength = 228 MPa -YoungsModulus = 135000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-350-10.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-350-10.FCMat deleted file mode 100644 index e724dc67b5..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-350-10.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJMB-350-10 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJMB-350-10 -NameDE = GTS 35-10 -DescriptionDE = gut spanbar, Schaltgabeln, Getriebe-, Achsgehäuse -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.8135 -Norm = EN 1562 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 10 -UltimateTensileStrength = 350 MPa -YieldStrength = 200 MPa -YoungsModulus = 175000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-550-4.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-550-4.FCMat deleted file mode 100644 index 807a1c9109..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-550-4.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJMB-550-4 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJMB-550-4 -NameDE = GTS 55-04 -DescriptionDE = Randschichthärtung, Kurbelwellen, Bremsträger, Federböcke, Kipphebel -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.8155 -Norm = EN 1562 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 2 -UltimateTensileStrength = 550 MPa -YieldStrength = 340 MPa -YoungsModulus = 175000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-650-2.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-650-2.FCMat deleted file mode 100644 index bddb453a4a..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJMB-650-2.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJMB-650-2 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJMB-650-2 -NameDE = GTS 65-02 -DescriptionDE = Gabelköpfe -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.8165 -Norm = EN 1562 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 2 -UltimateTensileStrength = 650 MPa -YieldStrength = 430 MPa -YoungsModulus = 175000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-350-4.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-350-4.FCMat deleted file mode 100644 index 65033067a6..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-350-4.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-EN-GJMW-350-4 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJMW-350-4 -NameDE = GTW 35-04 -DescriptionDE = dünnwandige Teile, Fittings, Beschläge, Förderketten -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.8035 -Norm = EN 1562 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 4 -UltimateTensileStrength = 350 MPa -YoungsModulus = 175000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-360-12.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-360-12.FCMat deleted file mode 100644 index 1f2884e0f2..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-360-12.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJMW-360-12 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJMW-360-12 -NameDE = GTW S38-12 -DescriptionDE = für Verbundschweißteile -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.8038 -Norm = EN 1562 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 5 -UltimateTensileStrength = 380 MPa -YieldStrength = 200 MPa -YoungsModulus = 175000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-400-5.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-400-5.FCMat deleted file mode 100644 index 6bbf2ba5fe..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-400-5.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJMW-400-5 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJMW-400-5 -NameDE = GTW 40-05 -DescriptionDE = gut schweißbar, Auspuffkrümmer, Schraubzwingen -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.804 -Norm = EN 1562 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 7 -UltimateTensileStrength = 400 MPa -YieldStrength = 220 MPa -YoungsModulus = 175000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-450-7.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-450-7.FCMat deleted file mode 100644 index 8728324608..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJMW-450-7.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJMW-450-7 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJMW-450-7 -NameDE = GTW 45-07 -DescriptionDE = schlagfest, Fahrwerksteile -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.8045 -Norm = EN 1562 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 10 -UltimateTensileStrength = 450 MPa -YieldStrength = 260 MPa -YoungsModulus = 175000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.00001 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-400-15.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJS-400-15.FCMat deleted file mode 100644 index ed57c3608d..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-400-15.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJS-400-15 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJS-400-15 -NameDE = GGG-40 -DescriptionDE = Pumpen-, Getriebegehäuse -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.704 -Norm = EN 1563 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 65000 MPa -UltimateStrain = 15 -UltimateTensileStrength = 400 MPa -YieldStrength = 250 MPa -YoungsModulus = 167000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-500-7.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJS-500-7.FCMat deleted file mode 100644 index 83e9e19d8d..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-500-7.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJS-500-7 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJS-500-7 -NameDE = GGG-50 -DescriptionDE = Seiltrommeln, Bremsteile, Zylinderköpfe -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.705 -Norm = EN 1563 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 66000 MPa -UltimateStrain = 2 -UltimateTensileStrength = 500 MPa -YieldStrength = 320 MPa -YoungsModulus = 170000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-600-3.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJS-600-3.FCMat deleted file mode 100644 index 4ba156b22f..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-600-3.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJS-600-3 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJS-600-3 -NameDE = GGG-60 -DescriptionDE = Kurbelwellen, Stangen -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.706 -Norm = EN 1563 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 2 -UltimateTensileStrength = 600 MPa -YieldStrength = 370 MPa -YoungsModulus = 177000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-700-2.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJS-700-2.FCMat deleted file mode 100644 index 4b930f03f2..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-700-2.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJS-700-2 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJS-700-2 -NameDE = GGG-70 -DescriptionDE = Kurbelwellen, Zahnräder, Turbinenschaufeln -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.707 -Norm = EN 1563 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 2 -UltimateTensileStrength = 700 MPa -YieldStrength = 420 MPa -YoungsModulus = 180000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-800-1.FCMat b/src/Mod/Material/StandardMaterial/Steel-EN-GJS-800-1.FCMat deleted file mode 100644 index 648630505e..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-EN-GJS-800-1.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-EN-GJS-800-1 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = EN-GJS-800-1 -NameDE = GGG-80 -DescriptionDE = Zahnräder -Father = Metal -KindOfMaterial = Cast iron -KindOfMaterialDE = Guss -MaterialNumber = 0.708 -Norm = EN 1563 - -[Mechanical] -Density = 7200 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 67000 MPa -UltimateStrain = 2 -UltimateTensileStrength = 800 MPa -YieldStrength = 480 MPa -YoungsModulus = 180000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-G16Mn5.FCMat b/src/Mod/Material/StandardMaterial/Steel-G16Mn5.FCMat deleted file mode 100644 index 06e7d7a8fb..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-G16Mn5.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-G16Mn5 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = G16Mn5 -NameDE = GS-16Mn5N -DescriptionDE = Gehäuse, Zahnräder, Bremsscheiben -Father = Metal -KindOfMaterial = Cast steel -KindOfMaterialDE = Stahlguss -MaterialNumber = 1.1131 -Norm = DIN 1681 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 430 MPa -YieldStrength = 260 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-G200.FCMat b/src/Mod/Material/StandardMaterial/Steel-G200.FCMat deleted file mode 100644 index 8309360f62..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-G200.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-G200 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = G200 -NameDE = GS 38 -DescriptionDE = mittlere dynamische und stoßartige Belastung, gut schweißbar -Father = Metal -KindOfMaterial = Cast steel -KindOfMaterialDE = Stahlguss -MaterialNumber = 1.042 -Norm = DIN 1681 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 25 -UltimateTensileStrength = 380 MPa -YieldStrength = 200 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-G20Mn5.FCMat b/src/Mod/Material/StandardMaterial/Steel-G20Mn5.FCMat deleted file mode 100644 index bfa1121fb8..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-G20Mn5.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-G20Mn5 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = G20Mn5 -NameDE = GS-20Mn5v -DescriptionDE = Gehäuse, Zahnräder, Bremsscheiben -Father = Metal -KindOfMaterial = Cast steel -KindOfMaterialDE = Stahlguss -MaterialNumber = 1.112 -Norm = DIN 1681 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 500 MPa -YieldStrength = 360 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-G230.FCMat b/src/Mod/Material/StandardMaterial/Steel-G230.FCMat deleted file mode 100644 index 9fc39761a9..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-G230.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-G230 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = G230 -NameDE = GS 45 -DescriptionDE = mittlere dynamische und stoßartige Belastung, gut schweißbar -Father = Metal -KindOfMaterial = Cast steel -KindOfMaterialDE = Stahlguss -MaterialNumber = 1.0446 -Norm = DIN 1681 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 22 -UltimateTensileStrength = 450 MPa -YieldStrength = 230 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-G260.FCMat b/src/Mod/Material/StandardMaterial/Steel-G260.FCMat deleted file mode 100644 index a83b482620..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-G260.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-G260 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = G260 -NameDE = GS 52 -Father = Metal -KindOfMaterial = Cast steel -KindOfMaterialDE = Stahlguss -MaterialNumber = 1.0552 -Norm = DIN 1681 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 18 -UltimateTensileStrength = 520 MPa -YieldStrength = 260 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-G300.FCMat b/src/Mod/Material/StandardMaterial/Steel-G300.FCMat deleted file mode 100644 index 79cdc3d95e..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-G300.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-G300 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = G300 -NameDE = GS 60 -Father = Metal -KindOfMaterial = Cast steel -KindOfMaterialDE = Stahlguss -MaterialNumber = 1.0558 -Norm = DIN 1681 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 15 -UltimateTensileStrength = 600 MPa -YieldStrength = 300 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-G30Mn5.FCMat b/src/Mod/Material/StandardMaterial/Steel-G30Mn5.FCMat deleted file mode 100644 index a2c6b41520..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-G30Mn5.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-G30Mn5 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = G30Mn5 -NameDE = GS-30Mn5 -Father = Metal -KindOfMaterial = Cast steel -KindOfMaterialDE = Stahlguss -MaterialNumber = 1.1165 -Norm = DIN 17205 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 14 -UltimateTensileStrength = 520 MPa -YieldStrength = 400 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-Generic.FCMat b/src/Mod/Material/StandardMaterial/Steel-Generic.FCMat deleted file mode 100644 index 0e3beb43bf..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-Generic.FCMat +++ /dev/null @@ -1,23 +0,0 @@ -; Steel-Generic -; (c) 2013 Juergen Riegel (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Steel-Generic -Description = This is a blend Steel material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised steel cards. -Father = Metal - -[Mechanical] -Density = 7900 kg/m^3 -PoissonRatio = 0.3 -YoungsModulus = 200000 MPa - -[Thermal] -SpecificHeat = 500 J/kg/K -ThermalConductivity = 50 W/m/K -ThermalExpansionCoefficient = 0.000012 m/m/K - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Steel diff --git a/src/Mod/Material/StandardMaterial/Steel-S185.FCMat b/src/Mod/Material/StandardMaterial/Steel-S185.FCMat deleted file mode 100644 index 8f4f0597ae..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S185.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S185 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S185 -NameDE = St33 -DescriptionDE = für geringe Beanspruchung -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0035 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 18 -UltimateTensileStrength = 310 MPa -YieldStrength = 190 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S235JO.FCMat b/src/Mod/Material/StandardMaterial/Steel-S235JO.FCMat deleted file mode 100644 index ac8b5b633f..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S235JO.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S235JO -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S235JO -NameDE = St37-3U -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0114 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 26 -UltimateTensileStrength = 360 MPa -YieldStrength = 235 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S235JR.FCMat b/src/Mod/Material/StandardMaterial/Steel-S235JR.FCMat deleted file mode 100644 index fbdea0ea77..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S235JR.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S235JR -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S235JR -NameDE = St37-2 -DescriptionDE = üblich für mäßige Beanspruchung, gut schweißbar, nicht für Hilfsrahmen -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0037 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 26 -UltimateTensileStrength = 360 MPa -YieldStrength = 235 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S235JRG1.FCMat b/src/Mod/Material/StandardMaterial/Steel-S235JRG1.FCMat deleted file mode 100644 index 192330e502..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S235JRG1.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S235JRG1 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S235JRG1 -NameDE = USt37-2 -DescriptionDE = üblich für mäßige Beanspruchung -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0036 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 26 -UltimateTensileStrength = 360 MPa -YieldStrength = 235 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S260NC.FCMat b/src/Mod/Material/StandardMaterial/Steel-S260NC.FCMat deleted file mode 100644 index e3ea55b6b4..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S260NC.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S260NC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S260NC -NameDE = QStE260 N -DescriptionDE = gut biegbar, Fahrgestellrahmen, Hilfsrahmen, nicht für Punktlasten -Father = Metal -KindOfMaterial = Cold forming steel -KindOfMaterialDE = Kaltumformstahl -MaterialNumber = 1.0971 -Norm = SEW 092 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 30 -UltimateTensileStrength = 350 MPa -YieldStrength = 280 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S275JO.FCMat b/src/Mod/Material/StandardMaterial/Steel-S275JO.FCMat deleted file mode 100644 index 6ceb99c79e..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S275JO.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S275JO -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S275JO -NameDE = St44-3U -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0143 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 22 -UltimateTensileStrength = 430 MPa -YieldStrength = 275 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S275JR.FCMat b/src/Mod/Material/StandardMaterial/Steel-S275JR.FCMat deleted file mode 100644 index 8735369352..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S275JR.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S275JR -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S275JR -NameDE = St44-2 -DescriptionDE = Wellen, Achsen, gut bearbeitbar, gut schweißbar -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0044 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 22 -UltimateTensileStrength = 430 MPa -YieldStrength = 275 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S275N.FCMat b/src/Mod/Material/StandardMaterial/Steel-S275N.FCMat deleted file mode 100644 index 4c27237bfc..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S275N.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S275N -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S275N -NameDE = St E 275 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.049 -Norm = EN 10113-2 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 24 -UltimateTensileStrength = 370 MPa -YieldStrength = 275 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S335JO.FCMat b/src/Mod/Material/StandardMaterial/Steel-S335JO.FCMat deleted file mode 100644 index f9cc991517..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S335JO.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S335JO -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S335JO -NameDE = St60-2U -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0553 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 22 -UltimateTensileStrength = 510 MPa -YieldStrength = 355 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S335JR.FCMat b/src/Mod/Material/StandardMaterial/Steel-S335JR.FCMat deleted file mode 100644 index 380010c7b0..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S335JR.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S335JR -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S335JR -NameDE = St53-3 -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0045 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 22 -UltimateTensileStrength = 510 MPa -YieldStrength = 355 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S335N.FCMat b/src/Mod/Material/StandardMaterial/Steel-S335N.FCMat deleted file mode 100644 index 3ca21aa36b..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S335N.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S335N -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S335N -NameDE = St E 355 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.0545 -Norm = EN 10113-2 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 22 -UltimateTensileStrength = 470 MPa -YieldStrength = 355 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S340MC.FCMat b/src/Mod/Material/StandardMaterial/Steel-S340MC.FCMat deleted file mode 100644 index 95ea56bcda..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S340MC.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S340MC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S340MC -NameDE = QStE340 TM -DescriptionDE = gut biegbar, Fahrgestellrahmen, Hilfsrahmen, nicht für Punktlasten -Father = Metal -KindOfMaterial = Cold forming steel -KindOfMaterialDE = Kaltumformstahl -MaterialNumber = 1.0974 -Norm = SEW 092 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 25 -UltimateTensileStrength = 480 MPa -YieldStrength = 340 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S355J2G3.FCMat b/src/Mod/Material/StandardMaterial/Steel-S355J2G3.FCMat deleted file mode 100644 index 5069b05a2b..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S355J2G3.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S355J2G3 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S355J2G3 -NameDE = St52-3 -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.057 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 22 -UltimateTensileStrength = 510 MPa -YieldStrength = 355 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S380MC.FCMat b/src/Mod/Material/StandardMaterial/Steel-S380MC.FCMat deleted file mode 100644 index f1245d1446..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S380MC.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S380MC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S380MC -NameDE = QStE380 TM -DescriptionDE = gut biegbar, Fahrgestellrahmen, Hilfsrahmen -Father = Metal -KindOfMaterial = Cold forming steel -KindOfMaterialDE = Kaltumformstahl -MaterialNumber = 1.0978 -Norm = SEW 092 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 23 -UltimateTensileStrength = 520 MPa -YieldStrength = 380 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S420MC.FCMat b/src/Mod/Material/StandardMaterial/Steel-S420MC.FCMat deleted file mode 100644 index b98ca99115..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S420MC.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S420MC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S420MC -NameDE = QStE420 TM -DescriptionDE = gut biegbar, Fahrgestellrahmen, Hilfsrahmen -Father = Metal -KindOfMaterial = Cold forming steel -KindOfMaterialDE = Kaltumformstahl -MaterialNumber = 1.098 -Norm = EN 10149 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 21 -UltimateTensileStrength = 550 MPa -YieldStrength = 420 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S420N.FCMat b/src/Mod/Material/StandardMaterial/Steel-S420N.FCMat deleted file mode 100644 index dd892e860e..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S420N.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S420N -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S420N -NameDE = St E 420 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.8902 -Norm = EN 10113-2 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 19 -UltimateTensileStrength = 520 MPa -YieldStrength = 420 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S460MC.FCMat b/src/Mod/Material/StandardMaterial/Steel-S460MC.FCMat deleted file mode 100644 index 5b6f56ba11..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S460MC.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S460MC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S460MC -NameDE = QStE460 TM -DescriptionDE = gut biegbar, Fahrgestellrahmen, Hilfsrahmen -Father = Metal -KindOfMaterial = Cold forming steel -KindOfMaterialDE = Kaltumformstahl -MaterialNumber = 1.0982 -Norm = SEW 092 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 19 -UltimateTensileStrength = 590 MPa -YieldStrength = 460 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S460N.FCMat b/src/Mod/Material/StandardMaterial/Steel-S460N.FCMat deleted file mode 100644 index 173d3cd869..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S460N.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-S460N -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S460N -NameDE = St E 460 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.8901 -Norm = EN 10113-2 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 17 -UltimateTensileStrength = 550 MPa -YieldStrength = 460 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S500MC.FCMat b/src/Mod/Material/StandardMaterial/Steel-S500MC.FCMat deleted file mode 100644 index bc53b34ca9..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S500MC.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S500MC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S500MC -NameDE = QStE500 TM -DescriptionDE = gut biegbar, Fahrgestellrahmen, Hilfsrahmen -Father = Metal -KindOfMaterial = Cold forming steel -KindOfMaterialDE = Kaltumformstahl -MaterialNumber = 1.0984 -Norm = EN 10149 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 17 -UltimateTensileStrength = 620 MPa -YieldStrength = 500 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S550MC.FCMat b/src/Mod/Material/StandardMaterial/Steel-S550MC.FCMat deleted file mode 100644 index 67922de9f7..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S550MC.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S550MC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S550MC -NameDE = QStE550 TM -DescriptionDE = gut biegbar, Fahrgestellrahmen, Hilfsrahmen -Father = Metal -KindOfMaterial = Cold forming steel -KindOfMaterialDE = Kaltumformstahl -MaterialNumber = 1.0986 -Norm = SEW 092 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 15 -UltimateTensileStrength = 680 MPa -YieldStrength = 550 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-S690MC.FCMat b/src/Mod/Material/StandardMaterial/Steel-S690MC.FCMat deleted file mode 100644 index 30c3a4e5c2..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-S690MC.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-S690MC -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = S690MC -NameDE = QStE690 TM -DescriptionDE = gut biegbar, Fahrgestellrahmen, Hilfsrahmen -Father = Metal -KindOfMaterial = Cold forming steel -KindOfMaterialDE = Kaltumformstahl -MaterialNumber = 1.0966 -Norm = SEW 092 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 15 -UltimateTensileStrength = 790 MPa -YieldStrength = 690 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-St-37-2K.FCMat b/src/Mod/Material/StandardMaterial/Steel-St-37-2K.FCMat deleted file mode 100644 index 67bfedfdc8..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-St-37-2K.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-St-37-2K -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = St 37-2K -NameDE = St 37-2K -DescriptionDE = mäßige Beanspruchung -Father = Metal -KindOfMaterial = Mild steel -KindOfMaterialDE = Baustahl -MaterialNumber = 1.0161 -Norm = EN 10025 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 460 MPa -YieldStrength = 320 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-St-E-255.FCMat b/src/Mod/Material/StandardMaterial/Steel-St-E-255.FCMat deleted file mode 100644 index f3af3d1f50..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-St-E-255.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-St-E-255 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = St E 255 -NameDE = St E 255 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.0461 -Norm = DIN 17102 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 360 MPa -YieldStrength = 260 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-St-E-315.FCMat b/src/Mod/Material/StandardMaterial/Steel-St-E-315.FCMat deleted file mode 100644 index 8f5c0a07a0..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-St-E-315.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-St-E-315 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = St E 315 -NameDE = St E 315 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.0505 -Norm = DIN 17102 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 440 MPa -YieldStrength = 320 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-St-E-380.FCMat b/src/Mod/Material/StandardMaterial/Steel-St-E-380.FCMat deleted file mode 100644 index 0374c695d5..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-St-E-380.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-St-E-380 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = St E 380 -NameDE = St E 380 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.89 -Norm = DIN 17102 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 500 MPa -YieldStrength = 380 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-St-E-460.FCMat b/src/Mod/Material/StandardMaterial/Steel-St-E-460.FCMat deleted file mode 100644 index 4f889cde02..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-St-E-460.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-St-E-460 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = St E 460 -NameDE = St E 460 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.8905 -Norm = DIN 17102 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 560 MPa -YieldStrength = 460 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-St-E-500.FCMat b/src/Mod/Material/StandardMaterial/Steel-St-E-500.FCMat deleted file mode 100644 index d5e985ca63..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-St-E-500.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-St-E-500 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = St E 500 -NameDE = St E 500 -Father = Metal -KindOfMaterial = Fine grain steel -KindOfMaterialDE = Feinkornstahl -MaterialNumber = 1.8907 -Norm = DIN 17102 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 0 -UltimateTensileStrength = 610 MPa -YieldStrength = 500 MPa -YoungsModulus = 210000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-X2CrNiMoN17-13-3.FCMat b/src/Mod/Material/StandardMaterial/Steel-X2CrNiMoN17-13-3.FCMat deleted file mode 100644 index 9971948a7a..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-X2CrNiMoN17-13-3.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-X2CrNiMoN17-13-3 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = X2CrNiMoN17-13-3 -NameDE = X2CrNiMoN 17 13 3 -DescriptionDE = schlecht spanbar, gut schweißbar, gut kaltumformbar, Achsen, Wellen, Wärmetauscher -Father = Metal -KindOfMaterial = Stainless steel -KindOfMaterialDE = Niro -MaterialNumber = 1.4429 -Norm = EN 10088 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 35 -UltimateTensileStrength = 580 MPa -YieldStrength = 295 MPa -YoungsModulus = 200000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-X2CrNiN24-4.FCMat b/src/Mod/Material/StandardMaterial/Steel-X2CrNiN24-4.FCMat deleted file mode 100644 index f113efb323..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-X2CrNiN24-4.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-X2CrNiN24-4 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = X2CrNiN24-4 -NameDE = - -Father = Metal -KindOfMaterial = Stainless steel -KindOfMaterialDE = Niro -MaterialNumber = 1.4362 -Norm = EN 10088 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 25 -UltimateTensileStrength = 600 MPa -YieldStrength = 400 MPa -YoungsModulus = 200000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-X39CrMo17-1.FCMat b/src/Mod/Material/StandardMaterial/Steel-X39CrMo17-1.FCMat deleted file mode 100644 index 3fd1d083c8..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-X39CrMo17-1.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-X39CrMo17-1 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = X39CrMo17-1 -NameDE = - -Father = Metal -KindOfMaterial = Stainless steel -KindOfMaterialDE = Niro -MaterialNumber = 1.4122 -Norm = EN 10088 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 12 -UltimateTensileStrength = 750 MPa -YieldStrength = 500 MPa -YoungsModulus = 213000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-X3CrNiMo13-14.FCMat b/src/Mod/Material/StandardMaterial/Steel-X3CrNiMo13-14.FCMat deleted file mode 100644 index 83d3323e8c..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-X3CrNiMo13-14.FCMat +++ /dev/null @@ -1,26 +0,0 @@ -; Steel-X3CrNiMo13-14 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = X3CrNiMo13-14 -NameDE = - -Father = Metal -KindOfMaterial = Stainless steel -KindOfMaterialDE = Niro -MaterialNumber = 1.4313 -Norm = EN 10088 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 11 -UltimateTensileStrength = 900 MPa -YieldStrength = 800 MPa -YoungsModulus = 216000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-X5CrNi18-10.FCMat b/src/Mod/Material/StandardMaterial/Steel-X5CrNi18-10.FCMat deleted file mode 100644 index a2c889e1dc..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-X5CrNi18-10.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-X5CrNi18-10 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = X5CrNi18-10 -NameDE = X5CrNi 18 9 -DescriptionDE = schlecht spanbar, gut schweißbar, gut kaltumformbar, Fahrzeugbau, Lebensmitteltechnik -Father = Metal -KindOfMaterial = Stainless steel -KindOfMaterialDE = Niro -MaterialNumber = 1.4301 -Norm = EN 10088 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 40 -UltimateTensileStrength = 520 MPa -YieldStrength = 210 MPa -YoungsModulus = 200000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-X5CrNiMo17-12-2.FCMat b/src/Mod/Material/StandardMaterial/Steel-X5CrNiMo17-12-2.FCMat deleted file mode 100644 index ff49842650..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-X5CrNiMo17-12-2.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-X5CrNiMo17-12-2 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = X5CrNiMo17-12-2 -NameDE = X5CrNiMo 17 12 2 -DescriptionDE = schlecht spanbar, gut schweißbar, gut kaltumformbar, Lebensmitteltechnik -Father = Metal -KindOfMaterial = Stainless steel -KindOfMaterialDE = Niro -MaterialNumber = 1.4401 -Norm = EN 10088 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 68000 MPa -UltimateStrain = 40 -UltimateTensileStrength = 520 MPa -YieldStrength = 220 MPa -YoungsModulus = 180000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/Steel-X6CrNiTi18-10.FCMat b/src/Mod/Material/StandardMaterial/Steel-X6CrNiTi18-10.FCMat deleted file mode 100644 index 9a45bf33de..0000000000 --- a/src/Mod/Material/StandardMaterial/Steel-X6CrNiTi18-10.FCMat +++ /dev/null @@ -1,27 +0,0 @@ -; Steel-X6CrNiTi18-10 -; (c) 2014 M. Münch - GNU Lesser General Public License (LGPL) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = X6CrNiTi18-10 -NameDE = X10CrNiTi 18 9 -DescriptionDE = schlecht spanbar, gut schweißbar, gut kaltumformbar, Schienenfahrzeugbau -Father = Metal -KindOfMaterial = Stainless steel -KindOfMaterialDE = Niro -MaterialNumber = 1.4541 -Norm = EN 10088 - -[Mechanical] -Density = 7800 kg/m^3 -PoissonRatio = 0.3 -ShearModulus = 81000 MPa -UltimateStrain = 40 -UltimateTensileStrength = 500 MPa -YieldStrength = 200 MPa -YoungsModulus = 200000 MPa - -[Thermal] -ThermalExpansionCoefficient = 0.000011 m/m/K diff --git a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat b/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat deleted file mode 100644 index 815fa8030e..0000000000 --- a/src/Mod/Material/StandardMaterial/TEMPLATE.FCMat +++ /dev/null @@ -1,210 +0,0 @@ -; TEMPLATE -; (c) 2013-2015 Juergen Riegel (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material - -; localized Name, Description and KindOfMaterial uses 2 letter codes -; defined in ISO-639-1, see https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes -; find unit information in src/App/FreeCADInit.py - -[General] -; General name -Name = - -; German localized name -NameDE = - -; Polish localized name -NamePL = - -; A more elaborate description of the material -Description = - -; German localized description -DescriptionDE = - -; Polish localized description -DescriptionPL = - -; Father of the material, i.e. for PLA is Thermoplast, for Steel is Metal -Father = - -; Description to be updated -KindOfMaterial = - -; Germand localized kind of material -KindOfMaterialDE = - -; Description to be updated -MaterialNumber = - -; Description to be updated -Norm = - -; Description to be updated -ReferenceSource = - -; Description to be updated -SourceURL = - -; Description to be updated -StandardCode = - - -[Mechanical] -; Further information can be found at https://en.wikipedia.org/wiki/Mohr%E2%80%93Coulomb_theory -; https://en.wikipedia.org/wiki/Friction#Angle_of_friction -AngleOfFriction = - -; Compressive strength in [FreeCAD Pressure unit] -; https://en.wikipedia.org/wiki/Compressive_strength -CompressiveStrength = - -; Density in [FreeCAD Density unit] -; https://en.wikipedia.org/wiki/Density -Density = - -; Description to be updated -; https://en.wikipedia.org/wiki/Fracture_toughness -FractureToughness = - -; Poisson's ratio [unitless] -; https://en.wikipedia.org/wiki/Poisson%27s_ratio -PoissonRatio = - -; Shear modulus in [FreeCAD Pressure unit] -; https://en.wikipedia.org/wiki/Shear_modulus -ShearModulus = - -; Description to be updated -; https://en.wikipedia.org/wiki/Deformation_(mechanics) -UltimateStrain = - -; Ultimate tensile strength in [FreeCAD Pressure unit] -; https://en.wikipedia.org/wiki/Ultimate_tensile_strength -UltimateTensileStrength = - -; Yield strength in [FreeCAD Pressure unit] -; https://en.wikipedia.org/wiki/Yield_Strength -YieldStrength = - -; Young's modulus (or E-Module) in [FreeCAD Pressure unit] -; https://en.wikipedia.org/wiki/Young%27s_modulus -YoungsModulus = - -; Stiffness (or Spring Stiffness) in [FreeCAD Stiffness unit] -; https://en.wikipedia.org/wiki/Stiffness -Stiffness = - - -[Thermal] -; Specific capacity in [FreeCAD SpecificHeat unit] -; https://en.wikipedia.org/wiki/Heat_capacity -SpecificHeat = - -; Thermal conductivity in [FreCAD ThermalConductivity unit] -; https://en.wikipedia.org/wiki/Thermal_conductivity -ThermalConductivity = - -; Thermal expansion coefficient (linear) in [FreeCAD ThermalExpansionCoefficient unit] -; https://en.wikipedia.org/wiki/Volumetric_thermal_expansion_coefficient -ThermalExpansionCoefficient = - -[Electromagnetic] -; The ratio to the permittivity of the vacuum -; https://en.wikipedia.org/wiki/Relative_permittivity -RelativePermittivity = - -; The electrical conductivity in [FreeCAD ElectricalConductivity unit] -; https://en.wikipedia.org/wiki/Electrical_resistivity_and_conductivity -ElectricalConductivity = - -; The ratio to the permeability of the vacuum -; https://en.wikipedia.org/wiki/Permeability_(electromagnetism) -RelativePermeability = - -[Architectural] -; Description to be updated -Color = - -; Description to be updated -EnvironmentalEfficiencyClass = - -; Description to be updated -ExecutionInstructions = - -; Description to be updated -Finish = - -; Description to be updated -FireResistanceClass = - -; Description to be updated -Model = - -; Description to be updated -SoundTransmissionClass = - -; Description to be updated -UnitsPerQuantity = - - -[Rendering] -; Description to be updated -AmbientColor = - -; Description to be updated -DiffuseColor = - -; Description to be updated -EmissiveColor = - -; Description to be updated -FragmentShader = - -; Description to be updated -Shininess = - -; Description to be updated -SpecularColor = - -; Description to be updated -TexturePath = - -; Description to be updated -TextureScaling = - -; Description to be updated -Transparency = - -; Description to be updated -VertexShader = - - -[Vector rendering] -; Description to be updated -SectionFillPattern = - -; Description to be updated -SectionLinewidth = - -; Description to be updated -ViewColor = - -; Description to be updated -ViewFillPattern = - -; Description to be updated -ViewLinewidth = - - -[Cost] -; Product URL, recommended are wikipedia links -; https://de.wikipedia.org/wiki/Hyperlink -ProductURL = - -; Specific price in currency / mass. A currency is not supported by FreeCAD unit system. Will be empty in all FreeCAD cards. Means the user needs to put in himself. -SpecificPrice = - -; Vendor of the material -Vendor = diff --git a/src/Mod/Material/StandardMaterial/Ti-6Al-4V.FCMat b/src/Mod/Material/StandardMaterial/Ti-6Al-4V.FCMat deleted file mode 100755 index 3f387087de..0000000000 --- a/src/Mod/Material/StandardMaterial/Ti-6Al-4V.FCMat +++ /dev/null @@ -1,29 +0,0 @@ -; Ti-6Al-4V -; vlk -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD 0.20.29603 (Git) - -[General] -Name = Ti-6Al-4V (Grade 5) -Father = Metal -KindOfMaterial = Titanium -MaterialNumber = 3.7165 - -[Mechanical] -Density = 4430 kg/m^3 -PoissonRatio = 0.330 -ShearModulus = 44 GPa -UltimateTensileStrength = 975.5 MPa -YieldStrength = 910 MPa -YoungsModulus = 114 GPa -Hardness = 35 HRC - -[Thermal] -SpecificHeat = 553.0 J/kg/K -ThermalConductivity = 6.7 W/m/K -ThermalExpansionCoefficient = 8.6 µm/m/K - -[Electromagnetic] -ElectricalConductivity = 580012.8 S/m -RelativePermeability = 1.00005 diff --git a/src/Mod/Material/StandardMaterial/Tools/FCMat2csv.sh b/src/Mod/Material/StandardMaterial/Tools/FCMat2csv.sh deleted file mode 100755 index 246d21ac3c..0000000000 --- a/src/Mod/Material/StandardMaterial/Tools/FCMat2csv.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# Helper script that converts FCMat file into csv file - -FILE=$1 -FILE_BASENAME=$(basename $FILE) - -if [ "$FILE_BASENAME" = "TEMPLATE.FCMat" ] -then - echo "Skipping TEMPLATE.FCMat"; - exit 0 -fi - -if [ -f "$1.temp" ] -then - rm $1.temp -fi - -if [ -f "$1.csv" ] -then - rm $1.csv -fi - -echo "Processing "${FILE_BASENAME%%.FCMat} -echo "FileName = "${FILE_BASENAME%%.FCMat} > $FILE_BASENAME.temp - -while read -r PROPERTY || [[ -n "$PROPERTY" ]]; do - VALUE=$(cat $FILE | awk '{if ($1!="") print $0; else "X" }' | grep -w $PROPERTY | cut -f3- -d " ") - echo $PROPERTY' = '$VALUE >> $FILE_BASENAME.temp -done < headers - -echo "FileName" | tr '\n' "|" > $FILE_BASENAME.csv -cat headers | tr '\n' "|" | sed 's/|$/\n/' >> $FILE_BASENAME.csv -cat $FILE_BASENAME.temp | sed 's/^[\[,;].*//' | sed '/^$/d' | cut -d"=" -f2- | cut -d " " -f2- | sed 's/^/\"/' | sed 's/$/\"/' | tr '\n' "|" | sed 's/|$/\n/' >> $FILE_BASENAME.csv - -rm $FILE_BASENAME.temp diff --git a/src/Mod/Material/StandardMaterial/Tools/Materials.csv b/src/Mod/Material/StandardMaterial/Tools/Materials.csv deleted file mode 100644 index f0cdfaeba4..0000000000 --- a/src/Mod/Material/StandardMaterial/Tools/Materials.csv +++ /dev/null @@ -1,114 +0,0 @@ -FileName|Name|NameDE|NamePL|Description|DescriptionDE|DescriptionPL|Father|KindOfMaterial|KindOfMaterialDE|MaterialNumber|Norm|ReferenceSource|SourceURL|StandardCode|AngleOfFriction|CompressiveStrength|Density|FractureToughness|PoissonRatio|ShearModulus|UltimateStrain|UltimateTensileStrength|YieldStrength|YoungsModulus|SpecificHeat|ThermalConductivity|ThermalExpansionCoefficient|Color|EnvironmentalEfficiencyClass|ExecutionInstructions|Finish|FireResistanceClass|Model|SoundTransmissionClass|UnitsPerQuantity|AmbientColor|DiffuseColor|EmissiveColor|FragmentShader|Shininess|SpecularColor|TexturePath|TextureScaling|Transparency|VertexShader|SectionFillPattern|SectionLinewidth|ViewColor|ViewFillPattern|ViewLinewidth|ProductURL|SpecificPrice|Vendor -ABS-Generic|ABS|||This is a blend AcrylnitrilButadienStyrol (ABS) material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised ABS-blend cards.|||Thermoplast||||||http://www.matweb.com/search/DataSheet.aspx?MatGUID=eb7a78f5948d481c9493a67f0d089646||||1060 kg/m^3||0.37|||38.8 MPa|44.1 MPa|2300 MPa|2050 J/kg/K|0.158 W/m/K|0.000093 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Acrylonitrile_butadiene_styrene|| -Acrylic-Glass-Generic|Acrylic Glass|||Poly(methyl methacrylate) (PMMA, acrylic, acrylic glass, trade names Plexiglas, Acrylite, Lucite, Perspex) a transparent thermoplastic often used in sheet form as a lightweight or shatter-resistant alternative to glass.||Szkło akrylowe (szkło organiczne; inaczej pleksi, pleksiglas, metapleks) – przezroczyste tworzywo sztuczne, którego głównym składnikiem jest polimer – poli(metakrylan metylu) (PMMA).|of the material, i.e. for PLA is Thermoplast, for Steel is Metal Thermoplast||||||http://www.matweb.com/search/DataSheet.aspx?MatGUID=632572aeef2a4224b5ac8fbd4f1b6f77|||103 MPa|1160 kg/m^3||0.38|1.08 GPa||57.7 MPa|73.7 MPa|2550 MPa|1480 J/kg/K|0.193 W/m/K|0.000075 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Poly(methyl_methacrylate)|| -AlMg3F24|AlMg3F24|AlMg3F24|||||Metal|Aluminium|Aluminium|3.3535.26|DIN 1725||||||2700 kg/m^3||0.3|27000 MPa|5|250 MPa|180 MPa|70000 MPa|||0.000023 m/m/K|||||||||||||||||||||||||| -AlMgSi1F31|AlMgSi1F31|AlMgSi1F31|||||Metal|Aluminium|Aluminium|3.2315.72|DIN 1725||||||2700 kg/m^3||0.3|27000 MPa|10|310 MPa|260 MPa|70000 MPa|||0.000023 m/m/K|||||||||||||||||||||||||| -Aluminum-6061-T6|Aluminum 6061-T6|||Precipitation-hardened, Nonferrous Aluminum alloy|||Metal|Aluminium|Aluminium||||||||2700 kg/m^3||0.33|||310 MPa||69000 MPa||167 W/m/K|||||||||||||||||||||||||https://en.wikipedia.org/wiki/6061_aluminium_alloy|| -AlZn4-5Mg1F35|AlZn4,5Mg1F35|AlZn4,5Mg1F35|||||Metal|Aluminium|Aluminium|3.4335.71|DIN 1725||||||2700 kg/m^3||0.3|27000 MPa|10|350 MPa|290 MPa|70000 MPa|||0.000023 m/m/K|||||||||||||||||||||||||| -CalculiX-Steel|CalculiX-Steel|||Standard steel material for CalculiX sample calculations|||Metal||||||||||7900 kg/m^3||0.3|||||210000 MPa|590 J/kg/K|43 W/m/K|0.000012 m/m/K|||||||||||||||||||||||||| -Concrete-EN-C35_45|Concrete-EN-C35/45|||Concrete matrix for reinforcement material examples, 0.6 x 0.75 x 35 MPa = 15.75 MPa (https://forum.freecad.org/viewtopic.php?f=18&t=33106&start=200#p311075)|||Aggregate||||||||30 deg|15.75 MPa|2500 kg/m^3||0.17|||||32000 MPa|||||||||||||||||||||||||||https://en.wikipedia.org/wiki/Concrete|| -Concrete-Generic|Concrete|||A standard C-25 construction concrete|||Aggregate|||||||Masterformat 03 33 13||25 MPa|2400 kg/m^3||0.17|||||32000 MPa|||||||||||||||||||||||||||https://en.wikipedia.org/wiki/Concrete|| -Glass-E-GlassFibre|Glass-E|||Glass Fibre|||Glass|||||||||1080 MPa|2580 kg/m^3|||||3445 MPa|||||||||||||||||||||||||||||https://en.wikipedia.org/wiki/Glass_fiber|| -Glass-Generic|Glass|||Generic soda-lime glass|Normalglas|Szkło sodowe|Glass||||||||||2520 kg/m^3||0.22|||||72000 MPa|||0.000009 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Soda-lime_glass|| -Glass-S2-GlassFibre|Glass-S2|||Glass Fibre|||Glass|||||||||1600 MPa|2460 kg/m^3|||||4890 MPa|||||||||||||||||||||||||||||https://en.wikipedia.org/wiki/Glass_fiber|| -None|None|||This is a not defined material|||None||||||||||0 kg/m^3||0|||0 MPa||0 MPa||||||||||||||||||||||||||||| -PA6-Generic|Polyamide 6||||||||||||http://www.matweb.com/search/datasheet.aspx?MatGUID=8d78f3cfcb6f49d595896ce6ce6a2ef1|||67.6 MPa|1150 kg/m^3||0.39|||75.5 MPa|70.5 MPa|2930 MPa|1670 J/kg/K|0.262 W/m/K|0.000082 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Nylon_6|| -PET-Generic|PET||||||||||||http://www.matweb.com/search/DataSheet.aspx?MatGUID=a696bdcdff6f41dd98f8eec3599eaa20|||38.0 MPa|1380 kg/m^3||0.36|0.0385 GPa||38.8 MPa|62.8 MPa|3150 MPa|1140 J/kg/K|0.181 W/m/K|0.000072 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Polyethylene_terephthalate|| -PLA-Generic|PLA|||Polylactic acid or polylactide (PLA, Poly) is a biodegradable thermoplastic aliphatic polyester derived from renewable resources, such as corn starch, tapioca roots, chips, starch or sugarcane.|||Thermoplast||||||https://www.sd3d.com/wp-content/uploads/2017/06/MaterialTDS-PLA_01.pdf||||1240 kg/m^3||0.36|||26.4 MPa|35.9 MPa|3640 MPa|1800 J/kg/K|0.130 W/m/K|0.000041 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Polylactic_acid|| -PP-Generic|Polypropylene||||||||||||http://www.matweb.com/search/DataSheet.aspx?MatGUID=a882a1c603374e278d062f106dfda95b|||10 MPa|916 kg/m^3||0.44|||79.7 MPa|32.8 MPa|1470 MPa|1920 J/kg/K|0.249 W/m/K|0.000123 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Polypropylene|| -PTFE-Generic|PTFE||||||||||||http://www.matweb.com/search/datasheet.aspx?MatGUID=4d14eac958e5401a8fd152e1261b6843|||10.2 MPa|2070 kg/m^3||0.46|||34.6 MPa|20.5 MPa|564 MPa|1010 J/kg/K|0.263 W/m/K|0.000108 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Polytetrafluoroethylene|| -PVC-Generic|PVC||||||||||||http://www.matweb.com/search/DataSheet.aspx?MatGUID=1f650966ec834bb8833dd4c6e3116079||||1380 kg/m^3||0.38|||50 MPa||2800 MPa|1000 J/kg/K|0.150 W/m/K|0.000075 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Polyvinyl_chloride|| -Reinforcement-FIB-B500|Reinforcement-Harry|||Reinforcement inside concrete for reinforcement material examples, from fib examples, 0.84 x 0.75 x 500 MPa = 315 MPa (https://forum.freecad.org/viewtopic.php?f=18&t=33106&start=200#p311705)|||||||||||||7850 kg/m^3||0.3||||315 MPa|210000 MPa||||||||||||||||||||||||||||| -Steel-15CrNi6|15CrNi6|||High-strength carbon steel|höchste Beanspruchung, Achsen, Wellen, Ritzel, Nocken, Kegelräder|Wysokowytrzymała stal węglowa|Metal|Case-hardened steel|Einsatzstahl|1.5919|EN 10084||||||7800 kg/m^3||0.3|81000 MPa|9|1000 MPa|680 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-17CrNiMo6|17CrNiMo6|17CrNiMo6|||höchste Beanspruchung, Wellen, Zahnräder||Metal|Case-hardened steel|Einsatzstahl|1.6587|EN 10084||||||7800 kg/m^3||0.3|81000 MPa|8|1150 MPa|830 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-1C22|1C22|C22||Case hardened alloy steel|kleiner Vergütungsdurchmesser, gut schweißbar|Stal stopowa do nawęglania|Metal|Heat-treatable steel|Vergütungsstahl|1.0402|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|27|400 MPa|230 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-1C35|1C35|C35||Non-alloy quality steel||Wysokogatunkowa stal niestopowa|Metal|Heat-treatable steel|Vergütungsstahl|1.0501|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|21|480 MPa|300 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-1C45|1C45|C45||Non-alloy quality steel||Wysokogatunkowa stal niestopowa|Metal|Heat-treatable steel|Vergütungsstahl|1.0503|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|14|580 MPa|340 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-1C60|1C60|C60||Non-alloy quality steel||Wysokogatunkowa stal niestopowa|Metal|Heat-treatable steel|Vergütungsstahl|1.0601|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|11|650 MPa|380 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-20NiCrMo2|20NiCrMo2|21NiCrMo2|||höchste Beanspruchung, Wellen, Zahnräder||Metal|Case-hardened steel|Einsatzstahl|1.6523|EN 10084||||||7800 kg/m^3||0.3|81000 MPa|10|900 MPa|630 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-28Mn6|28Mn6|28Mn6|||||Metal|Heat-treatable steel|Vergütungsstahl|1.117|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|13|800 MPa|590 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-2C10|2C10|Ck10|||||Metal|Case-hardened steel|Einsatzstahl|1.1121|EN 10084||||||7800 kg/m^3||0.3|81000 MPa|0|640 MPa|390 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-30CrNiMo8|30CrNiMo8|30CrNiMo8|||höchste Beanspruchung, Wellen, Zahnräder||Metal|Heat-treatable steel|Vergütungsstahl|1.658|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|9|1250 MPa|1050 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-34CrNiMo6|34CrNiMo6|34CrNiMo6|||höchste Beanspruchung, Wellen, Zahnräder||Metal|Heat-treatable steel|Vergütungsstahl|1.6582|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|9|1200 MPa|1000 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-36CrNiMo4|36CrNiMo4|36CrNiMo4|||höchste Beanspruchung, Wellen, Zahnräder||Metal|Heat-treatable steel|Vergütungsstahl|1.6511|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|10|1100 MPa|900 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-36NiCrMo16|36NiCrMo16|36NiCrMo16|||höchste Beanspruchung, Wellen, Zahnräder||Metal|Heat-treatable steel|Vergütungsstahl|1.6773|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|9|1250 MPa|1050 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-3C15|3C15|Cm15|||||Metal|Case-hardened steel|Einsatzstahl|1.114|EN 10084||||||7800 kg/m^3||0.3|81000 MPa|0|740 MPa|440 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-3C22|3C22|Cm22|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1149|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|24|550 MPa|350 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-3C35|3C35|Cm35|||||Metal|Heat-treatable steel|Vergütungsstahl|1.118|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|17|630 MPa|430 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-3V45|3V45|Cm45|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1201|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|14|700 MPa|500 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C10|C10|C10|||||Metal|Case-hardened steel|Einsatzstahl|1.0301|DIN 17210||||||7800 kg/m^3||0.3|81000 MPa|16|650 MPa|380 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C15|C15|C15|||||Metal|Case-hardened steel|Einsatzstahl|1.0401|DIN 17210||||||7800 kg/m^3||0.3|81000 MPa|14|750 MPa|430 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C22E|C22E|Ck22|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1151|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|20|500 MPa|340 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C25E|C25E|Ck25|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1158|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|19|550 MPa|370 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C30E|C30E|Ck30|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1178|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|18|600 MPa|400 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C40E|C40E|Ck40|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1186|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|16|650 MPa|460 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C50E|C50E|Ck50|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1206|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|13|750 MPa|520 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C55E|C55E|Ck55|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1203|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|13|800 MPa|550 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-C60E|C60E|Ck60|||||Metal|Heat-treatable steel|Vergütungsstahl|1.1221|EN 10083-1||||||7800 kg/m^3||0.3|81000 MPa|13|850 MPa|580 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-E295|E295|St50-2|||||Metal|Mild steel|Baustahl|1.005|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|20|490 MPa|295 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-E295-GC|E295 GC|St50-2K|||||Metal|Mild steel|Baustahl|1.0533|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|0|590 MPa|420 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-E335|E335|St60-2|||||Metal|Mild steel|Baustahl|1.006|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|16|590 MPa|335 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-E335-GC|E335 GC|St60-2K|||||Metal|Mild steel|Baustahl|1.0543|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|0|690 MPa|490 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-E360|E360|St70-2|||||Metal|Mild steel|Baustahl|1.007|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|11|690 MPa|360 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-E360-GC|E360 GC|St70-2K|||||Metal|Mild steel|Baustahl|1.0633|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|0|780 MPa|560 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJL-100|EN-GJL-100|GG-10|||für gering beanspruchte Teile||Metal|Cast iron|Guss|0.601|EN 1561||||||7200 kg/m^3||0.3|34000 MPa|0|100 MPa||88000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJL-150|EN-GJL-150|GG-15|||für dünnwandige Teile wie Gehäuse, Ständer||Metal|Cast iron|Guss|0.6015|EN 1561||||||7200 kg/m^3||0.3|37000 MPa|0|150 MPa|98 MPa|95000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJL-200|EN-GJL-200|GG-20|||Hebel, Lager , Lagerböcke||Metal|Cast iron|Guss|0.602|EN 1561||||||7200 kg/m^3||0.3|40000 MPa|0|200 MPa|130 MPa|105000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJL-250|EN-GJL-250|GG-25|||||Metal|Cast iron|Guss|0.6025|EN 1561||||||7200 kg/m^3||0.3|44000 MPa|0|250 MPa|165 MPa|115000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJL-300|EN-GJL-300|GG-30|||hochbeanspruchbar, für Motorständer, Lagerschalen||Metal|Cast iron|Guss|0.603|EN 1561||||||7200 kg/m^3||0.3|48000 MPa|0|300 MPa|195 MPa|125000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJL-350|EN-GJL-350|GG-35|||höchstbeanspruchbar, für Teile mit konstanter Wanddicke, Pressenständer, Turbinengehäuse||Metal|Cast iron|Guss|0.6035|EN 1561||||||7200 kg/m^3||0.3|52000 MPa|15|350 MPa|228 MPa|135000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJMB-350-10|EN-GJMB-350-10|GTS 35-10|||gut spanbar, Schaltgabeln, Getriebe-, Achsgehäuse||Metal|Cast iron|Guss|0.8135|EN 1562||||||7200 kg/m^3||0.3|67000 MPa|10|350 MPa|200 MPa|175000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJMB-550-4|EN-GJMB-550-4|GTS 55-04|||Randschichthärtung, Kurbelwellen, Bremsträger, Federböcke, Kipphebel||Metal|Cast iron|Guss|0.8155|EN 1562||||||7200 kg/m^3||0.3|67000 MPa|2|550 MPa|340 MPa|175000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJMB-650-2|EN-GJMB-650-2|GTS 65-02|||Gabelköpfe||Metal|Cast iron|Guss|0.8165|EN 1562||||||7200 kg/m^3||0.3|67000 MPa|2|650 MPa|430 MPa|175000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJMW-350-4|EN-GJMW-350-4|GTW 35-04|||dünnwandige Teile, Fittings, Beschläge, Förderketten||Metal|Cast iron|Guss|0.8035|EN 1562||||||7200 kg/m^3||0.3|67000 MPa|4|350 MPa||175000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJMW-360-12|EN-GJMW-360-12|GTW S38-12|||für Verbundschweißteile||Metal|Cast iron|Guss|0.8038|EN 1562||||||7200 kg/m^3||0.3|67000 MPa|5|380 MPa|200 MPa|175000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJMW-400-5|EN-GJMW-400-5|GTW 40-05|||gut schweißbar, Auspuffkrümmer, Schraubzwingen||Metal|Cast iron|Guss|0.804|EN 1562||||||7200 kg/m^3||0.3|67000 MPa|7|400 MPa|220 MPa|175000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJMW-450-7|EN-GJMW-450-7|GTW 45-07|||schlagfest, Fahrwerksteile||Metal|Cast iron|Guss|0.8045|EN 1562||||||7200 kg/m^3||0.3|67000 MPa|10|450 MPa|260 MPa|175000 MPa|||0.00001 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJS-400-15|EN-GJS-400-15|GGG-40|||Pumpen-, Getriebegehäuse||Metal|Cast iron|Guss|0.704|EN 1563||||||7200 kg/m^3||0.3|65000 MPa|15|400 MPa|250 MPa|167000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJS-500-7|EN-GJS-500-7|GGG-50|||Seiltrommeln, Bremsteile, Zylinderköpfe||Metal|Cast iron|Guss|0.705|EN 1563||||||7200 kg/m^3||0.3|66000 MPa|2|500 MPa|320 MPa|170000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJS-600-3|EN-GJS-600-3|GGG-60|||Kurbelwellen, Stangen||Metal|Cast iron|Guss|0.706|EN 1563||||||7200 kg/m^3||0.3|67000 MPa|2|600 MPa|370 MPa|177000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJS-700-2|EN-GJS-700-2|GGG-70|||Kurbelwellen, Zahnräder, Turbinenschaufeln||Metal|Cast iron|Guss|0.707|EN 1563||||||7200 kg/m^3||0.3|67000 MPa|2|700 MPa|420 MPa|180000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-EN-GJS-800-1|EN-GJS-800-1|GGG-80|||Zahnräder||Metal|Cast iron|Guss|0.708|EN 1563||||||7200 kg/m^3||0.3|67000 MPa|2|800 MPa|480 MPa|180000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-G16Mn5|G16Mn5|GS-16Mn5N|||Gehäuse, Zahnräder, Bremsscheiben||Metal|Cast steel|Stahlguss|1.1131|DIN 1681||||||7800 kg/m^3||0.3|81000 MPa|0|430 MPa|260 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-G200|G200|GS 38|||mittlere dynamische und stoßartige Belastung, gut schweißbar||Metal|Cast steel|Stahlguss|1.042|DIN 1681||||||7800 kg/m^3||0.3|81000 MPa|25|380 MPa|200 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-G20Mn5|G20Mn5|GS-20Mn5v|||Gehäuse, Zahnräder, Bremsscheiben||Metal|Cast steel|Stahlguss|1.112|DIN 1681||||||7800 kg/m^3||0.3|81000 MPa|0|500 MPa|360 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-G230|G230|GS 45|||mittlere dynamische und stoßartige Belastung, gut schweißbar||Metal|Cast steel|Stahlguss|1.0446|DIN 1681||||||7800 kg/m^3||0.3|81000 MPa|22|450 MPa|230 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-G260|G260|GS 52|||||Metal|Cast steel|Stahlguss|1.0552|DIN 1681||||||7800 kg/m^3||0.3|81000 MPa|18|520 MPa|260 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-G300|G300|GS 60|||||Metal|Cast steel|Stahlguss|1.0558|DIN 1681||||||7800 kg/m^3||0.3|81000 MPa|15|600 MPa|300 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-G30Mn5|G30Mn5|GS-30Mn5|||||Metal|Cast steel|Stahlguss|1.1165|DIN 17205||||||7800 kg/m^3||0.3|81000 MPa|14|520 MPa|400 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-Generic|Steel-Generic|||This is a blend Steel material card. The values are at the low end of the spectrum. If you need a more precise material definition use the more specialised steel cards.|||Metal||||||||||7900 kg/m^3||0.3|||||200000 MPa|500 J/kg/K|50 W/m/K|0.000012 m/m/K||||||||||||||||||||||||https://en.wikipedia.org/wiki/Steel|| -Steel-S185|S185|St33|||für geringe Beanspruchung||Metal|Mild steel|Baustahl|1.0035|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|18|310 MPa|190 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S235JO|S235JO|St37-3U|||||Metal|Mild steel|Baustahl|1.0114|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|26|360 MPa|235 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S235JR|S235JR|St37-2|||üblich für mäßige Beanspruchung, gut schweißbar, nicht für Hilfsrahmen||Metal|Mild steel|Baustahl|1.0037|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|26|360 MPa|235 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S235JRG1|S235JRG1|USt37-2|||üblich für mäßige Beanspruchung||Metal|Mild steel|Baustahl|1.0036|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|26|360 MPa|235 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S260NC|S260NC|QStE260 N|||gut biegbar, Fahrgestellrahmen, Hilfsrahmen, nicht für Punktlasten||Metal|Cold forming steel|Kaltumformstahl|1.0971|SEW 092||||||7800 kg/m^3||0.3|81000 MPa|30|350 MPa|280 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S275JO|S275JO|St44-3U|||||Metal|Mild steel|Baustahl|1.0143|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|22|430 MPa|275 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S275JR|S275JR|St44-2|||Wellen, Achsen, gut bearbeitbar, gut schweißbar||Metal|Mild steel|Baustahl|1.0044|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|22|430 MPa|275 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S275N|S275N|St E 275|||||Metal|Fine grain steel|Feinkornstahl|1.049|EN 10113-2||||||7800 kg/m^3||0.3|81000 MPa|24|370 MPa|275 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S335JO|S335JO|St60-2U|||||Metal|Mild steel|Baustahl|1.0553|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|22|510 MPa|355 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S335JR|S335JR|St53-3|||||Metal|Mild steel|Baustahl|1.0045|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|22|510 MPa|355 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S335N|S335N|St E 355|||||Metal|Fine grain steel|Feinkornstahl|1.0545|EN 10113-2||||||7800 kg/m^3||0.3|81000 MPa|22|470 MPa|355 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S340MC|S340MC|QStE340 TM|||gut biegbar, Fahrgestellrahmen, Hilfsrahmen, nicht für Punktlasten||Metal|Cold forming steel|Kaltumformstahl|1.0974|SEW 092||||||7800 kg/m^3||0.3|81000 MPa|25|480 MPa|340 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S355J2G3|S355J2G3|St52-3|||||Metal|Mild steel|Baustahl|1.057|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|22|510 MPa|355 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S380MC|S380MC|QStE380 TM|||gut biegbar, Fahrgestellrahmen, Hilfsrahmen||Metal|Cold forming steel|Kaltumformstahl|1.0978|SEW 092||||||7800 kg/m^3||0.3|81000 MPa|23|520 MPa|380 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S420MC|S420MC|QStE420 TM|||gut biegbar, Fahrgestellrahmen, Hilfsrahmen||Metal|Cold forming steel|Kaltumformstahl|1.098|EN 10149||||||7800 kg/m^3||0.3|81000 MPa|21|550 MPa|420 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S420N|S420N|St E 420|||||Metal|Fine grain steel|Feinkornstahl|1.8902|EN 10113-2||||||7800 kg/m^3||0.3|81000 MPa|19|520 MPa|420 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S460MC|S460MC|QStE460 TM|||gut biegbar, Fahrgestellrahmen, Hilfsrahmen||Metal|Cold forming steel|Kaltumformstahl|1.0982|SEW 092||||||7800 kg/m^3||0.3|81000 MPa|19|590 MPa|460 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S460N|S460N|St E 460|||||Metal|Fine grain steel|Feinkornstahl|1.8901|EN 10113-2||||||7800 kg/m^3||0.3|81000 MPa|17|550 MPa|460 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S500MC|S500MC|QStE500 TM|||gut biegbar, Fahrgestellrahmen, Hilfsrahmen||Metal|Cold forming steel|Kaltumformstahl|1.0984|EN 10149||||||7800 kg/m^3||0.3|81000 MPa|17|620 MPa|500 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S550MC|S550MC|QStE550 TM|||gut biegbar, Fahrgestellrahmen, Hilfsrahmen||Metal|Cold forming steel|Kaltumformstahl|1.0986|SEW 092||||||7800 kg/m^3||0.3|81000 MPa|15|680 MPa|550 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-S690MC|S690MC|QStE690 TM|||gut biegbar, Fahrgestellrahmen, Hilfsrahmen||Metal|Cold forming steel|Kaltumformstahl|1.0966|SEW 092||||||7800 kg/m^3||0.3|81000 MPa|15|790 MPa|690 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-St-37-2K|St 37-2K|St 37-2K|||mäßige Beanspruchung||Metal|Mild steel|Baustahl|1.0161|EN 10025||||||7800 kg/m^3||0.3|81000 MPa|0|460 MPa|320 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-St-E-255|St E 255|St E 255|||||Metal|Fine grain steel|Feinkornstahl|1.0461|DIN 17102||||||7800 kg/m^3||0.3|81000 MPa|0|360 MPa|260 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-St-E-315|St E 315|St E 315|||||Metal|Fine grain steel|Feinkornstahl|1.0505|DIN 17102||||||7800 kg/m^3||0.3|81000 MPa|0|440 MPa|320 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-St-E-380|St E 380|St E 380|||||Metal|Fine grain steel|Feinkornstahl|1.89|DIN 17102||||||7800 kg/m^3||0.3|81000 MPa|0|500 MPa|380 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-St-E-460|St E 460|St E 460|||||Metal|Fine grain steel|Feinkornstahl|1.8905|DIN 17102||||||7800 kg/m^3||0.3|81000 MPa|0|560 MPa|460 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-St-E-500|St E 500|St E 500|||||Metal|Fine grain steel|Feinkornstahl|1.8907|DIN 17102||||||7800 kg/m^3||0.3|81000 MPa|0|610 MPa|500 MPa|210000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-X2CrNiMoN17-13-3|X2CrNiMoN17-13-3|X2CrNiMoN 17 13 3|||schlecht spanbar, gut schweißbar, gut kaltumformbar, Achsen, Wellen, Wärmetauscher||Metal|Stainless steel|Niro|1.4429|EN 10088||||||7800 kg/m^3||0.3|81000 MPa|35|580 MPa|295 MPa|200000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-X2CrNiN24-4|X2CrNiN24-4|-|||||Metal|Stainless steel|Niro|1.4362|EN 10088||||||7800 kg/m^3||0.3|81000 MPa|25|600 MPa|400 MPa|200000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-X39CrMo17-1|X39CrMo17-1|-|||||Metal|Stainless steel|Niro|1.4122|EN 10088||||||7800 kg/m^3||0.3|81000 MPa|12|750 MPa|500 MPa|213000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-X3CrNiMo13-14|X3CrNiMo13-14|-|||||Metal|Stainless steel|Niro|1.4313|EN 10088||||||7800 kg/m^3||0.3|81000 MPa|11|900 MPa|800 MPa|216000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-X5CrNi18-10|X5CrNi18-10|X5CrNi 18 9|||schlecht spanbar, gut schweißbar, gut kaltumformbar, Fahrzeugbau, Lebensmitteltechnik||Metal|Stainless steel|Niro|1.4301|EN 10088||||||7800 kg/m^3||0.3|81000 MPa|40|520 MPa|210 MPa|200000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-X5CrNiMo17-12-2|X5CrNiMo17-12-2|X5CrNiMo 17 12 2|||schlecht spanbar, gut schweißbar, gut kaltumformbar, Lebensmitteltechnik||Metal|Stainless steel|Niro|1.4401|EN 10088||||||7800 kg/m^3||0.3|68000 MPa|40|520 MPa|220 MPa|180000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Steel-X6CrNiTi18-10|X6CrNiTi18-10|X10CrNiTi 18 9|||schlecht spanbar, gut schweißbar, gut kaltumformbar, Schienenfahrzeugbau||Metal|Stainless steel|Niro|1.4541|EN 10088||||||7800 kg/m^3||0.3|81000 MPa|40|500 MPa|200 MPa|200000 MPa|||0.000011 m/m/K|||||||||||||||||||||||||| -Wood-Generic|Wood|||A standard construction wood|||Aggregate||||||||||700 kg/m^3||0.05|||||12000 MPa|||||||||||||||||||||||||||https://en.wikipedia.org/wiki/Wood|| diff --git a/src/Mod/Material/StandardMaterial/Tools/Materials.ods b/src/Mod/Material/StandardMaterial/Tools/Materials.ods deleted file mode 100644 index 3972e8edd1..0000000000 Binary files a/src/Mod/Material/StandardMaterial/Tools/Materials.ods and /dev/null differ diff --git a/src/Mod/Material/StandardMaterial/Tools/README b/src/Mod/Material/StandardMaterial/Tools/README deleted file mode 100644 index 5edc5e25ba..0000000000 --- a/src/Mod/Material/StandardMaterial/Tools/README +++ /dev/null @@ -1,42 +0,0 @@ -WARNING: The scripts operate with limited checks and can be dangerous. - Commit your changes before using the scripts! - -That directory contains set of scripts for FCMat<->ods conversion. -The main purpose of conversion FCMat<->ods is to allow batch editing as -it's much easier to edit a column in spreadsheet than 25 separate FCMat files. -Also creating new materials similar to an existing material is just -a matter of copying a row, changing file names and relevant properties. - -Typical workflow: - -1. Run ./make_ods.sh to create Materials.ods -2. Edit Materials.ods -4. Run ./make_FCMats.sh to create directory with new FCMat files -5. Copy edited FCMat files to StandardMaterials directory - -Other scenarios: - -A. Removing a property - -1. Remove the property from headers file and from the TEMPLATE.FCMat file -2. Run ./make_ods.sh to create Materials.ods -3. Run ./make_FCMats.sh to create directory with new FCMat files -4. Copy FCMat files to StandardMaterials directory - -B. Adding a property - -1. Add the property to headers file and to the TEMPLATE.FCMat file with a description -2. Run ./make_ods.sh to create Materials.ods -3. Edit Materials.ods and fill the values of the new property (empty properties are not written to FCMat files) -3. Run ./make_FCMats.sh to create directory with new FCMat files -4. Copy FCMat files to StandardMaterials directory - -C. Sorting properties as per header file order - -2. Run ./make_ods.sh to create Materials.ods -3. Run ./make_FCMats.sh to create directory with new FCMat files -4. Copy FCMat files to StandardMaterials directory - -Important comments: -1. First 5 lines of a FCMat file are copied without modification to the new FCMat file -2. The scripts are to be used only on linux, in the source code directory. \ No newline at end of file diff --git a/src/Mod/Material/StandardMaterial/Tools/headers b/src/Mod/Material/StandardMaterial/Tools/headers deleted file mode 100644 index 2aa97773ef..0000000000 --- a/src/Mod/Material/StandardMaterial/Tools/headers +++ /dev/null @@ -1,53 +0,0 @@ -Name -NameDE -NamePL -Description -DescriptionDE -DescriptionPL -Father -KindOfMaterial -KindOfMaterialDE -MaterialNumber -Norm -ReferenceSource -SourceURL -StandardCode -AngleOfFriction -CompressiveStrength -Density -FractureToughness -PoissonRatio -ShearModulus -UltimateStrain -UltimateTensileStrength -YieldStrength -YoungsModulus -SpecificHeat -ThermalConductivity -ThermalExpansionCoefficient -Color -EnvironmentalEfficiencyClass -ExecutionInstructions -Finish -FireResistanceClass -Model -SoundTransmissionClass -UnitsPerQuantity -AmbientColor -DiffuseColor -EmissiveColor -FragmentShader -Shininess -SpecularColor -TexturePath -TextureScaling -Transparency -VertexShader -SectionFillPattern -SectionLinewidth -ViewColor -ViewFillPattern -ViewLinewidth -ProductURL -SpecificPrice -Vendor diff --git a/src/Mod/Material/StandardMaterial/Tools/make_FCMats.sh b/src/Mod/Material/StandardMaterial/Tools/make_FCMats.sh deleted file mode 100755 index 09f249a3f2..0000000000 --- a/src/Mod/Material/StandardMaterial/Tools/make_FCMats.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -# That script converts Materials.ods file into FCMat files. The result files are saved in FCMAT_OUTPUT_DIR - -FCMAT_OUTPUT_DIR=FCMats -MATERIALS_FILE=Materials - -# Check for unoconv -which unoconv 2>&1 > /dev/null || ( echo "unoconv not found. Please install it first!" && exit 1 ) - -# Convert Materials.ods to Materials.csv -if [ -f "$MATERIALS_FILE.ods" ] -then - echo "Creating "$MATERIALS_FILE.csv - # 124 is field delimiter | - # 34 is text delimiter " - # 76 is encoding UTF-8 - unoconv -e FilterOptions=124,34,76 -f csv $MATERIALS_FILE.ods -else - echo "Material.ods not found. Please run make_ods.sh first!" - exit 1 -fi - -# Helper function to retrieve string from X,Y position in csv file -function get_xy() { - VALUE_XY=$(cat $MATERIALS_FILE.csv | awk -v x=$X -v y=$Y -F\| 'NR==y {print $x}' | sed 's/\"//g') -} - -# Determine number of columns and rows in the Materials.csv file -NUMBER_OF_COLUMNS=$(awk -F "|" "NR==1 { print NF }" $MATERIALS_FILE.csv ) -NUMBER_OF_ROWS=$(cat $MATERIALS_FILE.csv | wc -l) - -echo "Setting output directory:" $FCMAT_OUTPUT_DIR -if [ -d "$FCMAT_OUTPUT_DIR" ] -then - rm "$FCMAT_OUTPUT_DIR"/* 2>&1 > /dev/null -else - mkdir $FCMAT_OUTPUT_DIR -fi - -for MAT_NO in $(seq 2 $NUMBER_OF_ROWS) -do - X=1 - Y=$MAT_NO - get_xy - FCMAT_FILE=$VALUE_XY - echo "Generating material file: " $FCMAT_OUTPUT_DIR/$FCMAT_FILE.FCMat - touch $FCMAT_OUTPUT_DIR/$FCMAT_FILE.FCMat - - if [ -f "../$FCMAT_FILE.FCMat" ] - then - head -n 5 ../$FCMAT_FILE.FCMat > $FCMAT_OUTPUT_DIR/$FCMAT_FILE.FCMat - else - cp new_material_header $FCMAT_OUTPUT_DIR/$FCMAT_FILE.FCMat - fi - - echo "[FCMat]" >> $FCMAT_OUTPUT_DIR/$FCMAT_FILE.FCMat - - for X in $(seq 2 $NUMBER_OF_COLUMNS) - do - Y=1 - get_xy - PROPERTY=$VALUE_XY - Y=$MAT_NO - get_xy - VALUE=$VALUE_XY - if [ -n "$VALUE_XY" ] - then - echo $PROPERTY = $VALUE >> $FCMAT_OUTPUT_DIR/$FCMAT_FILE.FCMat; - fi - done -done diff --git a/src/Mod/Material/StandardMaterial/Tools/make_ods.sh b/src/Mod/Material/StandardMaterial/Tools/make_ods.sh deleted file mode 100755 index f64e4a99cd..0000000000 --- a/src/Mod/Material/StandardMaterial/Tools/make_ods.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# That script creates Materials.ods file from all FCMat files in current directory - -FCMAT_DIR="../" -MATERIALS_FILE=Materials - -# Remove existing $MATERIALS_FILE.csv -if [ -f "$MATERIALS_FILE.csv" ] -then - rm $MATERIALS_FILE.csv -fi - -# Create new Materials.csv from all FCMat files -ls $FCMAT_DIR*.FCMat | xargs -I [] ./FCMat2csv.sh [] && ls *.csv | xargs -I [] cat [] | awk "NR==1; NR%2 == 0" > $MATERIALS_FILE.csv - -# Check for unoconv -which unoconv 2>&1 > /dev/null || ( echo "unoconv not found. Please install it first!" && exit 1 ) - -# Convert Materials.csv to Materials.ods -echo "Creating "$MATERIALS_FILE.ods -# 124 is field delimiter | -# 34 is text delimiter " -# 76 is encoding UTF-8 -unoconv -i FilterOptions=124,34,76 -f ods $MATERIALS_FILE.csv - -# Remove all temporary files -rm *.csv diff --git a/src/Mod/Material/StandardMaterial/Tools/new_material_header b/src/Mod/Material/StandardMaterial/Tools/new_material_header deleted file mode 100644 index d5c9d9f4d2..0000000000 --- a/src/Mod/Material/StandardMaterial/Tools/new_material_header +++ /dev/null @@ -1,5 +0,0 @@ -; card_file_name -; (c) 2015 Your Name (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material - diff --git a/src/Mod/Material/StandardMaterial/Wood-Generic.FCMat b/src/Mod/Material/StandardMaterial/Wood-Generic.FCMat deleted file mode 100644 index 45b294e268..0000000000 --- a/src/Mod/Material/StandardMaterial/Wood-Generic.FCMat +++ /dev/null @@ -1,18 +0,0 @@ -; Wood-Generic -; (c) 2015 Bernd Hahnebach (CC-BY 3.0) -; information about the content of such cards can be found on the wiki: -; https://www.freecad.org/wiki/Material -; file created by FreeCAD0.18.16022 (Git) - -[General] -Name = Wood -Description = A standard construction wood -Father = Aggregate - -[Mechanical] -Density = 700 kg/m^3 -PoissonRatio = 0.05 -YoungsModulus = 12000 MPa - -[Cost] -ProductURL = https://en.wikipedia.org/wiki/Wood diff --git a/src/Mod/Material/TestMaterialsApp.py b/src/Mod/Material/TestMaterialsApp.py new file mode 100644 index 0000000000..d2a1b618f6 --- /dev/null +++ b/src/Mod/Material/TestMaterialsApp.py @@ -0,0 +1,236 @@ +#************************************************************************** +# Copyright (c) 2023 David Carter * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD is distributed in the hope that it will be useful, * +# but WITHOUT ANY WARRANTY; without even the implied warranty of * +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# GNU Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** + +# import FreeCAD +from os import walk +import unittest +import Material + +class MaterialTestCases(unittest.TestCase): + def setUp(self): + self.ModelManager = Material.ModelManager() + self.MaterialManager = Material.MaterialManager() + + def testModelManager(self): + self.assertIn("ModelLibraries", dir(self.ModelManager)) + self.assertIn("Models", dir(self.ModelManager)) + + def testMaterialManager(self): + self.assertIn("MaterialLibraries", dir(self.MaterialManager)) + self.assertIn("Materials", dir(self.MaterialManager)) + + def testModelLoad(self): + density = self.ModelManager.getModel("454661e5-265b-4320-8e6f-fcf6223ac3af") + self.assertIsNotNone(density) + self.assertEqual(density.Name, "Density") + self.assertEqual(density.UUID, "454661e5-265b-4320-8e6f-fcf6223ac3af") + self.assertIn("Density", density.Properties) + prop = density.Properties["Density"] + self.assertIn("Description", dir(prop)) + self.assertIn("Name", dir(prop)) + self.assertIn("Type", dir(prop)) + self.assertIn("URL", dir(prop)) + self.assertIn("Units", dir(prop)) + self.assertEqual(prop.Name, "Density") + + def testCalculiXSteel(self): + steel = self.MaterialManager.getMaterial("92589471-a6cb-4bbc-b748-d425a17dea7d") + self.assertIsNotNone(steel) + self.assertEqual(steel.Name, "CalculiX-Steel") + self.assertEqual(steel.UUID, "92589471-a6cb-4bbc-b748-d425a17dea7d") + + self.assertTrue(steel.hasPhysicalModel('454661e5-265b-4320-8e6f-fcf6223ac3af')) # Density + self.assertTrue(steel.hasPhysicalModel('f6f9e48c-b116-4e82-ad7f-3659a9219c50')) # IsotropicLinearElastic + self.assertTrue(steel.hasPhysicalModel('9959d007-a970-4ea7-bae4-3eb1b8b883c7')) # Thermal + self.assertFalse(steel.hasPhysicalModel('7b561d1d-fb9b-44f6-9da9-56a4f74d7536')) # Legacy linear elastic - Not in the model + self.assertTrue(steel.hasAppearanceModel('f006c7e4-35b7-43d5-bbf9-c5d572309e6e')) # BasicRendering - inherited from Steel.FCMat + + self.assertTrue(steel.isPhysicalModelComplete('454661e5-265b-4320-8e6f-fcf6223ac3af')) # Density + self.assertFalse(steel.isPhysicalModelComplete('f6f9e48c-b116-4e82-ad7f-3659a9219c50')) # IsotropicLinearElastic - incomplete + self.assertTrue(steel.isPhysicalModelComplete('9959d007-a970-4ea7-bae4-3eb1b8b883c7')) # Thermal + self.assertFalse(steel.isPhysicalModelComplete('7b561d1d-fb9b-44f6-9da9-56a4f74d7536')) # Legacy linear elastic - Not in the model + self.assertTrue(steel.isAppearanceModelComplete('f006c7e4-35b7-43d5-bbf9-c5d572309e6e')) # BasicRendering - inherited from Steel.FCMat + + self.assertTrue(steel.hasPhysicalProperty("Density")) + self.assertTrue(steel.hasPhysicalProperty("BulkModulus")) + self.assertTrue(steel.hasPhysicalProperty("PoissonRatio")) + self.assertTrue(steel.hasPhysicalProperty("YoungsModulus")) + self.assertTrue(steel.hasPhysicalProperty("ShearModulus")) + self.assertTrue(steel.hasPhysicalProperty("SpecificHeat")) + self.assertTrue(steel.hasPhysicalProperty("ThermalConductivity")) + self.assertTrue(steel.hasPhysicalProperty("ThermalExpansionCoefficient")) + self.assertTrue(steel.hasAppearanceProperty("AmbientColor")) + self.assertTrue(steel.hasAppearanceProperty("DiffuseColor")) + self.assertTrue(steel.hasAppearanceProperty("EmissiveColor")) + self.assertTrue(steel.hasAppearanceProperty("Shininess")) + self.assertTrue(steel.hasAppearanceProperty("SpecularColor")) + self.assertTrue(steel.hasAppearanceProperty("Transparency")) + + properties = steel.PhysicalProperties + self.assertIn("Density", properties) + self.assertNotIn("BulkModulus", properties) + self.assertIn("PoissonRatio", properties) + self.assertIn("YoungsModulus", properties) + self.assertNotIn("ShearModulus", properties) + self.assertIn("SpecificHeat", properties) + self.assertIn("ThermalConductivity", properties) + self.assertIn("ThermalExpansionCoefficient", properties) + self.assertNotIn("AmbientColor", properties) + self.assertNotIn("DiffuseColor", properties) + self.assertNotIn("EmissiveColor", properties) + self.assertNotIn("Shininess", properties) + self.assertNotIn("SpecularColor", properties) + self.assertNotIn("Transparency", properties) + + properties = steel.AppearanceProperties + self.assertNotIn("Density", properties) + self.assertNotIn("BulkModulus", properties) + self.assertNotIn("PoissonRatio", properties) + self.assertNotIn("YoungsModulus", properties) + self.assertNotIn("ShearModulus", properties) + self.assertNotIn("SpecificHeat", properties) + self.assertNotIn("ThermalConductivity", properties) + self.assertNotIn("ThermalExpansionCoefficient", properties) + self.assertIn("AmbientColor", properties) + self.assertIn("DiffuseColor", properties) + self.assertIn("EmissiveColor", properties) + self.assertIn("Shininess", properties) + self.assertIn("SpecularColor", properties) + self.assertIn("Transparency", properties) + + properties = steel.Properties + self.assertIn("Density", properties) + self.assertNotIn("BulkModulus", properties) + self.assertIn("PoissonRatio", properties) + self.assertIn("YoungsModulus", properties) + self.assertNotIn("ShearModulus", properties) + self.assertIn("SpecificHeat", properties) + self.assertIn("ThermalConductivity", properties) + self.assertIn("ThermalExpansionCoefficient", properties) + self.assertIn("AmbientColor", properties) + self.assertIn("DiffuseColor", properties) + self.assertIn("EmissiveColor", properties) + self.assertIn("Shininess", properties) + self.assertIn("SpecularColor", properties) + self.assertIn("Transparency", properties) + + print("Density " + properties["Density"]) + # print("BulkModulus " + properties["BulkModulus"]) + print("PoissonRatio " + properties["PoissonRatio"]) + print("YoungsModulus " + properties["YoungsModulus"]) + # print("ShearModulus " + properties["ShearModulus"]) + print("SpecificHeat " + properties["SpecificHeat"]) + print("ThermalConductivity " + properties["ThermalConductivity"]) + print("ThermalExpansionCoefficient " + properties["ThermalExpansionCoefficient"]) + print("AmbientColor " + properties["AmbientColor"]) + print("DiffuseColor " + properties["DiffuseColor"]) + print("EmissiveColor " + properties["EmissiveColor"]) + print("Shininess " + properties["Shininess"]) + print("SpecularColor " + properties["SpecularColor"]) + print("Transparency " + properties["Transparency"]) + + self.assertTrue(len(properties["Density"]) > 0) + # self.assertTrue(len(properties["BulkModulus"]) == 0) + self.assertTrue(len(properties["PoissonRatio"]) > 0) + self.assertTrue(len(properties["YoungsModulus"]) > 0) + # self.assertTrue(len(properties["ShearModulus"]) == 0) + self.assertTrue(len(properties["SpecificHeat"]) > 0) + self.assertTrue(len(properties["ThermalConductivity"]) > 0) + self.assertTrue(len(properties["ThermalExpansionCoefficient"]) > 0) + self.assertTrue(len(properties["AmbientColor"]) > 0) + self.assertTrue(len(properties["DiffuseColor"]) > 0) + self.assertTrue(len(properties["EmissiveColor"]) > 0) + self.assertTrue(len(properties["Shininess"]) > 0) + self.assertTrue(len(properties["SpecularColor"]) > 0) + self.assertTrue(len(properties["Transparency"]) > 0) + + self.assertEqual(properties["Density"], "7900.00 kg/m^3") + # self.assertEqual(properties["BulkModulus"], "") + self.assertEqual(properties["PoissonRatio"], "0.30000001192092896") + self.assertEqual(properties["YoungsModulus"], "210.00 GPa") + # self.assertEqual(properties["ShearModulus"], "") + self.assertEqual(properties["SpecificHeat"], "590.00 J/kg/K") + self.assertEqual(properties["ThermalConductivity"], "43.00 W/m/K") + self.assertEqual(properties["ThermalExpansionCoefficient"], "12.00 µm/m/K") + self.assertEqual(properties["AmbientColor"], "(0.0020, 0.0020, 0.0020, 1.0)") + self.assertEqual(properties["DiffuseColor"], "(0.0000, 0.0000, 0.0000, 1.0)") + self.assertEqual(properties["EmissiveColor"], "(0.0000, 0.0000, 0.0000, 1.0)") + self.assertEqual(properties["Shininess"], "0.05999999865889549") + self.assertEqual(properties["SpecularColor"], "(0.9800, 0.9800, 0.9800, 1.0)") + self.assertEqual(properties["Transparency"], "0") + + print("Density " + steel.getPhysicalValue("Density").UserString) + # print("BulkModulus " + properties["BulkModulus"]) + print("PoissonRatio %f" % steel.getPhysicalValue("PoissonRatio")) + print("YoungsModulus " + steel.getPhysicalValue("YoungsModulus").UserString) + # print("ShearModulus " + properties["ShearModulus"]) + print("SpecificHeat " + steel.getPhysicalValue("SpecificHeat").UserString) + print("ThermalConductivity " + steel.getPhysicalValue("ThermalConductivity").UserString) + print("ThermalExpansionCoefficient " + steel.getPhysicalValue("ThermalExpansionCoefficient").UserString) + print("AmbientColor " + steel.getAppearanceValue("AmbientColor")) + print("DiffuseColor " + steel.getAppearanceValue("DiffuseColor")) + print("EmissiveColor " + steel.getAppearanceValue("EmissiveColor")) + print("Shininess %f" % steel.getAppearanceValue("Shininess")) + print("SpecularColor " + steel.getAppearanceValue("SpecularColor")) + print("Transparency %f" % steel.getAppearanceValue("Transparency")) + + self.assertAlmostEqual(steel.getPhysicalValue("Density").Value, 7.9e-06) + self.assertAlmostEqual(steel.getPhysicalValue("PoissonRatio"), 0.3) + self.assertAlmostEqual(steel.getPhysicalValue("YoungsModulus").Value, 210000000.0) + self.assertAlmostEqual(steel.getPhysicalValue("SpecificHeat").Value, 590000000.0) + self.assertAlmostEqual(steel.getPhysicalValue("ThermalConductivity").Value, 43000.0) + self.assertAlmostEqual(steel.getPhysicalValue("ThermalExpansionCoefficient").Value, 1.2e-05) + self.assertEqual(steel.getAppearanceValue("AmbientColor"), "(0.0020, 0.0020, 0.0020, 1.0)") + self.assertEqual(steel.getAppearanceValue("DiffuseColor"), "(0.0000, 0.0000, 0.0000, 1.0)") + self.assertEqual(steel.getAppearanceValue("EmissiveColor"), "(0.0000, 0.0000, 0.0000, 1.0)") + self.assertAlmostEqual(steel.getAppearanceValue("Shininess"), 0.06) + self.assertEqual(steel.getAppearanceValue("SpecularColor"), "(0.9800, 0.9800, 0.9800, 1.0)") + self.assertAlmostEqual(steel.getAppearanceValue("Transparency"), 0.0) + + def testMaterialsWithModel(self): + materials = self.MaterialManager.materialsWithModel('f6f9e48c-b116-4e82-ad7f-3659a9219c50') # IsotropicLinearElastic + materialsComplete = self.MaterialManager.materialsWithModelComplete('f6f9e48c-b116-4e82-ad7f-3659a9219c50') # IsotropicLinearElastic + + self.assertTrue(len(materialsComplete) <= len(materials)) # Not all will be complete + + materialsLinearElastic = self.MaterialManager.materialsWithModel('7b561d1d-fb9b-44f6-9da9-56a4f74d7536') # LinearElastic + + # All LinearElastic models should be in IsotropicLinearElastic since it is inherited + self.assertTrue(len(materialsLinearElastic) <= len(materials)) + for mat in materialsLinearElastic: + self.assertIn(mat, materials) + + def testMaterialByPath(self): + steel = self.MaterialManager.getMaterialByPath('StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat', 'System') + self.assertIsNotNone(steel) + self.assertEqual(steel.Name, "CalculiX-Steel") + self.assertEqual(steel.UUID, "92589471-a6cb-4bbc-b748-d425a17dea7d") + + steel2 = self.MaterialManager.getMaterialByPath('/StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat', 'System') + self.assertIsNotNone(steel2) + self.assertEqual(steel2.Name, "CalculiX-Steel") + self.assertEqual(steel2.UUID, "92589471-a6cb-4bbc-b748-d425a17dea7d") + + steel3 = self.MaterialManager.getMaterialByPath('/System/StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat', 'System') + self.assertIsNotNone(steel3) + self.assertEqual(steel3.Name, "CalculiX-Steel") + self.assertEqual(steel3.UUID, "92589471-a6cb-4bbc-b748-d425a17dea7d") diff --git a/src/Mod/Material/importFCMat.py b/src/Mod/Material/importFCMat.py index f53ce996ef..406455b632 100644 --- a/src/Mod/Material/importFCMat.py +++ b/src/Mod/Material/importFCMat.py @@ -30,6 +30,7 @@ import os import FreeCAD from materialtools.cardutils import get_material_template +import Material if FreeCAD.GuiUp: from PySide import QtGui @@ -97,6 +98,10 @@ def decode(name): # as we had and we might will have problems again and again # https://github.com/berndhahnebach/FreeCAD_bhb/commits/materialdev +def read(filename): + materialManager = Material.MaterialManager() + material = materialManager.getMaterialByPath(filename) + return material.Properties # Metainformation # first two lines HAVE, REALLY HAVE to be the same (no comment) in any card file !!!!! @@ -106,7 +111,7 @@ def decode(name): # Line3: information string # Line4: information link # Line5: FreeCAD version info or empty -def read(filename): +def read_old(filename): "reads a FCMat file and returns a dictionary from it" # the reader returns a dictionary in any case even if the file has problems @@ -181,6 +186,105 @@ def read(filename): d[k[0].strip()] = v return d +def read2(filename): + "reads a FCMat file and returns a dictionary from it" + + # the reader returns a dictionary in any case even if the file has problems + # an empty dict is returned in such case + + # print(filename) + card_name_file = os.path.splitext(os.path.basename(filename))[0] + f = pythonopen(filename, encoding="utf8") + try: + content = f.readlines() + # print(len(content)) + # print(type(content)) + # print(content) + except Exception: + # https://forum.freecad.org/viewtopic.php?f=18&t=56912#p489721 + # older FreeCAD do not write utf-8 for special character on windows + # I have seen "ISO-8859-15" or "windows-1252" + # explicit utf-8 writing, https://github.com/FreeCAD/FreeCAD/commit/9a564dd906f + FreeCAD.Console.PrintError("Error on card loading. File might not utf-8.") + error_message = "Error on loading. Material file '{}' might not utf-8.".format(filename) + FreeCAD.Console.PrintError("{}\n".format(error_message)) + if FreeCAD.GuiUp: + QtGui.QMessageBox.critical(None, "Error on card reading", error_message) + return {} + d = {} + d["Meta"] = {} + d["General"] = {} + d["Mechanical"] = {} + d["Fluidic"] = {} + d["Thermal"] = {} + d["Electromagnetic"] = {} + d["Architectural"] = {} + d["Rendering"] = {} + d["VectorRendering"] = {} + d["Cost"] = {} + d["UserDefined"] = {} + d["Meta"]["CardName"] = card_name_file # CardName is the MatCard file name + section = '' + for ln, line in enumerate(content): + # print(line) + # enumerate starts with 0 + + # line numbers are used for CardName and AuthorAndLicense + # the use of line number is not smart for a data model + # a wrong user edit could break the file + + # comment + if line.startswith('#'): + # a '#' is assumed to be a comment which is ignored + continue + # CardName + if line.startswith(';') and ln == 0: + # print("Line CardName: {}".format(line)) + v = line.split(";")[1].strip() # Line 1 + if hasattr(v, "decode"): + v = v.decode('utf-8') + card_name_content = v + if card_name_content != d["Meta"]["CardName"]: + FreeCAD.Console.PrintLog( + "File CardName ( {} ) is not content CardName ( {} )\n" + .format(card_name_file, card_name_content) + ) + + # AuthorAndLicense + elif line.startswith(';') and ln == 1: + # print("Line AuthorAndLicense: {}".format(line)) + v = line.split(";")[1].strip() # Line 2 + if hasattr(v, "decode"): + v = v.decode('utf-8') + d["General"]["AuthorAndLicense"] = v # Move the field to the general group + + # rest + else: + # ; is a Comment + # [ is a Section + if line[0] == '[': + # print("parse section '{0}'".format(line)) + line = line[1:] + # print("\tline '{0}'".format(line)) + k = line.split("]", 1) + if len(k) >= 2: + v = k[0].strip() + if hasattr(v, "decode"): + v = v.decode('utf-8') + section = v + # print("Section '{0}'".format(section)) + elif line[0] not in ";": + # split once on first occurrence + # a link could contain a '=' and thus would be split + k = line.split("=", 1) + if len(k) == 2: + v = k[1].strip() + if hasattr(v, "decode"): + v = v.decode('utf-8') + # print("key '{0}', value '{1}'".format(k[0].strip(), v)) + d[section][k[0].strip()] = v + return d + def write(filename, dictionary, write_group_section=True): "writes the given dictionary to the given file" diff --git a/src/Mod/Material/materialtools/MaterialModels.py b/src/Mod/Material/materialtools/MaterialModels.py new file mode 100644 index 0000000000..2599dd1c2b --- /dev/null +++ b/src/Mod/Material/materialtools/MaterialModels.py @@ -0,0 +1,163 @@ +# *************************************************************************** +# * Copyright (c) 2023 David Carter * +# * * +# * This file is part of FreeCAD. * +# * * +# * FreeCAD is free software: you can redistribute it and/or modify it * +# * under the terms of the GNU Lesser General Public License as * +# * published by the Free Software Foundation, either version 2.1 of the * +# * License, or (at your option) any later version. * +# * * +# * FreeCAD is distributed in the hope that it will be useful, but * +# * WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * +# * Lesser General Public License for more details. * +# * * +# * You should have received a copy of the GNU Lesser General Public * +# * License along with FreeCAD. If not, see * +# * . * +# * * +# **************************************************************************/ + +__title__ = "material model utilities" +__author__ = "David Carter" +__url__ = "http://www.freecad.org" + +import os +import io +from pathlib import Path +import yaml + +import FreeCAD + + +unicode = str + +__models = {} +__modelsByPath = {} + +def _dereference(parent, child): + # Add the child parameters to the parent + parentModel = parent["model"] + parentBase = parent["base"] + childModel = child["model"] + childBase = child["base"] + for name, value in childModel[childBase].items(): + if name not in ["Name", "UUID", "URL", "Description", "DOI", "Inherits"] and \ + name not in parentModel[parentBase]: # Don't add if it's already there + parentModel[parentBase][name] = value + + print("dereferenced:") + print(parentModel) + +def _dereferenceInheritance(data): + if not data["dereferenced"]: + data["dereferenced"] = True # Prevent recursion loops + + model = data["model"] + base = data["base"] + if "Inherits" in model[base]: + print("Model '{0}' inherits from:".format(data["name"])) + for parent in model[base]["Inherits"]: + print("\t'{0}'".format(parent)) + print("\t\t'{0}'".format(parent.keys())) + print("\t\t'{0}'".format(parent["UUID"])) + + # This requires that all models have already been loaded undereferenced + child = __models[parent["UUID"]] + if child is not None: + _dereference(data, child) + +def _dereferenceAll(): + for data in __models.values(): + _dereferenceInheritance(data) + +def _scanFolder(folder): + print("Scanning folder '{0}'".format(folder.absolute())) + for child in folder.iterdir(): + if child.is_dir(): + _scanFolder(child) + else: + if child.suffix.lower() == ".yml": + data = getModelFromPath(child) + + if data is not None: + __models[data["uuid"]] = data + __modelsByPath[data["path"]] = data + # print(data["model"]) + else: + print("Extension '{0}'".format(child.suffix.lower())) + +def _scanModels(libraries): + __models = {} # Clear the current library + __modelsByPath = {} + print("_scanModels") + print(libraries) + for library in libraries: + _scanFolder(Path(library)) + + # Satisfy aany inheritances + _dereferenceAll() + +def getPreferredSaveDirectory(): + pass + +def getModelLibraries(): + + libraries = [] + + # TODO: Expand beyond the standard models as we do for material paths + path = Path(FreeCAD.getResourceDir()) / "Mod/Material/Resources/Models" + libraries.append(path) + + _scanModels(libraries) + + return libraries + +def getModel(uuid): + """ + Retrieve the specified model. + """ + if len(__models) < 1: + getModelLibraries() + + if uuid not in __models: + return None + return __models[uuid] + +def getModelFromPath(filePath): + """ + Retrieve the model at the specified path. + + This may not need public exposure? + """ + try: + path = Path(filePath) + stream = open(path.absolute(), "r") + model = yaml.safe_load(stream) + + base = "Model" + if "AppearanceModel" in model: + base = "AppearanceModel" + + uuid = model[base]["UUID"] + name = model[base]["Name"] + + data = {} + data["base"] = base + data["name"] = name + data["path"] = path.absolute() + data["uuid"] = uuid + data["model"] = model + data["dereferenced"] = False + return data + except Exception as ex: + print("Unable to load '{0}'".format(path.absolute())) + print(ex) + + return None + +def saveModel(model, path): + """ + Write the model to the specified path + """ \ No newline at end of file diff --git a/src/Mod/Material/materialtools/Tools/ConvertFCMat.py b/src/Mod/Material/materialtools/Tools/ConvertFCMat.py new file mode 100644 index 0000000000..26e85f46ba --- /dev/null +++ b/src/Mod/Material/materialtools/Tools/ConvertFCMat.py @@ -0,0 +1,292 @@ +# *************************************************************************** +# * Copyright (c) 2013 Juergen Riegel * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + + +__title__ = "FreeCAD material card importer" +__author__ = "Juergen Riegel" +__url__ = "https://www.freecad.org" + + +import os +import glob +import uuid +from pathlib import Path +import xml.etree.ElementTree as ET + +def decode(name): + "decodes encoded strings" + try: + decodedName = (name.decode("utf8")) + except UnicodeDecodeError: + try: + decodedName = (name.decode("latin1")) + except UnicodeDecodeError: + print("Error: Couldn't determine character encoding") + decodedName = name + return decodedName + +def read(filename): + "reads a FCMat file and returns a dictionary from it" + + # the reader returns a dictionary in any case even if the file has problems + # an empty dict is returned in such case + + card_name_file = os.path.splitext(os.path.basename(filename))[0] + f = open(filename, encoding="utf8") + try: + content = f.readlines() + except Exception: + # https://forum.freecad.org/viewtopic.php?f=18&t=56912#p489721 + # older FreeCAD do not write utf-8 for special character on windows + # I have seen "ISO-8859-15" or "windows-1252" + # explicit utf-8 writing, https://github.com/FreeCAD/FreeCAD/commit/9a564dd906f + print("Error on card loading. File might not utf-8.") + error_message = "Error on loading. Material file '{}' might not utf-8.".format(filename) + print("{}\n".format(error_message)) + return {} + d = {} + d["Meta"] = {} + d["General"] = {} + d["Mechanical"] = {} + d["Fluidic"] = {} + d["Thermal"] = {} + d["Electromagnetic"] = {} + d["Architectural"] = {} + d["Rendering"] = {} + d["VectorRendering"] = {} + d["Cost"] = {} + d["UserDefined"] = {} + d["Meta"]["CardName"] = card_name_file # CardName is the MatCard file name + section = '' + for ln, line in enumerate(content): + # line numbers are used for CardName and AuthorAndLicense + # the use of line number is not smart for a data model + # a wrong user edit could break the file + + # comment + if line.startswith('#'): + # a '#' is assumed to be a comment which is ignored + continue + # CardName + if line.startswith(';') and ln == 0: + pass + + # AuthorAndLicense + elif line.startswith(';') and ln == 1: + v = line.split(";")[1].strip() # Line 2 + if hasattr(v, "decode"): + v = v.decode('utf-8') + d["General"]["AuthorAndLicense"] = v # Move the field to the general group + + # rest + else: + # ; is a Comment + # [ is a Section + if line[0] == '[': + line = line[1:] + k = line.split("]", 1) + if len(k) >= 2: + v = k[0].strip() + if hasattr(v, "decode"): + v = v.decode('utf-8') + section = v + elif line[0] not in ";": + # split once on first occurrence + # a link could contain a '=' and thus would be split + k = line.split("=", 1) + if len(k) == 2: + v = k[1].strip() + if hasattr(v, "decode"): + v = v.decode('utf-8') + d[section][k[0].strip()] = v + return d + +def yamGeneral(card): + father = "" + materialStandard = "" + yamModels = "" + yam = "# File created by ConvertFCMat.py\n" + yam += "General:\n" + + # Add UUIDs + yam += ' UUID: "{0}"\n'.format(uuid.uuid4()) + for param in card: + if param in ["Name", "AuthorAndLicense", "Description", "ReferenceSource", "SourceURL"]: + yam += ' {0}: "{1}"\n'.format(param, card[param]) + elif param in ["Father"]: + father += ' {0}: "{1}"\n'.format(param, card[param]) + elif param in ["KindOfMaterial", "MaterialNumber", "Norm", "StandardCode"]: + if param == "Norm": # Handle the name change + materialStandard += ' {0}: "{1}"\n'.format("StandardCode", card[param]) + else: + materialStandard += ' {0}: "{1}"\n'.format(param, card[param]) + + if len(father) > 0: + yamModels += " {0}:\n".format('Father') + yamModels += " UUID: '{0}'\n".format('9cdda8b6-b606-4778-8f13-3934d8668e67') + yamModels += father + if len(materialStandard) > 0: + yamModels += " {0}:\n".format('MaterialStandard') + yamModels += " UUID: '{0}'\n".format('1e2c0088-904a-4537-925f-64064c07d700') + yamModels += materialStandard + + return yam, yamModels + +def yamSection(card, header, uuid): + if len(card) > 0: + yam = " {0}:\n".format(header) + yam += " UUID: '{0}'\n".format(uuid) + for param in card: + yam += ' {0}: "{1}"\n'.format(param, card[param]) + else: + yam = "" + + return yam + +def yamMechanical(card): + # Check which model we need + useDensity = False + useIso = False + useLinearElastic = False + for param in card: + if param in ["Density"]: + useDensity = True + elif param in ["BulkModulus", "PoissonRatio", "ShearModulus", "YoungsModulus"]: + useIso = True + elif param in ["AngleOfFriction", "CompressiveStrength", "FractureToughness", + "UltimateStrain", "UltimateTensileStrength", "YieldStrength", "Stiffness", "Hardness"]: + useLinearElastic = True + + yam = "" + if useLinearElastic: + return yamSection(card, 'LinearElastic', '7b561d1d-fb9b-44f6-9da9-56a4f74d7536') + if useIso: + yam = yamSection(card, 'IsotropicLinearElastic', 'f6f9e48c-b116-4e82-ad7f-3659a9219c50') + if useDensity: + return yam + yamSection(card, 'Density', '454661e5-265b-4320-8e6f-fcf6223ac3af') + + # default mechanical model + return "" + +def yamFluid(card): + # Split out density + for param in card: + if param not in ["Density"]: + return yamSection(card, 'Fluid', '1ae66d8c-1ba1-4211-ad12-b9917573b202') + + return yamSection(card, 'Density', '454661e5-265b-4320-8e6f-fcf6223ac3af') + +def yamThermal(card): + return yamSection(card, 'Thermal', '9959d007-a970-4ea7-bae4-3eb1b8b883c7') + +def yamElectromagnetic(card): + return yamSection(card, 'Electromagnetic', 'b2eb5f48-74b3-4193-9fbb-948674f427f3') + +def yamArchitectural(card): + return yamSection(card, 'Architectural', '32439c3b-262f-4b7b-99a8-f7f44e5894c8') + +def yamCost(card): + return yamSection(card, 'Costs', '881df808-8726-4c2e-be38-688bb6cce466') + +def yamRendering(card): + # Check which model we need + useTexture = False + useAdvanced = False + for param in card: + if param in ["TexturePath", "TextureScaling"]: + useTexture = True + elif param in ["FragmentShader", "VertexShader"]: + useAdvanced = True + + if useAdvanced: + return yamSection(card, 'AdvancedRendering', 'c880f092-cdae-43d6-a24b-55e884aacbbf') + if useTexture: + return yamSection(card, 'TextureRendering', 'bbdcc65b-67ca-489c-bd5c-a36e33d1c160') + + # default rendering model + return yamSection(card, 'BasicRendering', 'f006c7e4-35b7-43d5-bbf9-c5d572309e6e') + +def yamVectorRendering(card): + return yamSection(card, 'VectorRendering', 'fdf5a80e-de50-4157-b2e5-b6e5f88b680e') + +def saveYaml(card, output): + yam, yamModels = yamGeneral(card["General"]) + if len(card["Mechanical"]) > 0 or \ + len(card["Fluidic"]) > 0 or \ + len(card["Thermal"]) > 0 or \ + len(card["Electromagnetic"]) > 0 or \ + len(card["Architectural"]) > 0 or \ + len(card["Cost"]) > 0 or \ + len(yamModels) > 0: + yam += "Models:\n" + yam += yamModels + if "Mechanical" in card: + yam += yamMechanical(card["Mechanical"]) + if "Fluidic" in card: + yam += yamFluid(card["Fluidic"]) + if "Thermal" in card: + yam += yamThermal(card["Thermal"]) + if "Electromagnetic" in card: + yam += yamElectromagnetic(card["Electromagnetic"]) + if "Architectural" in card: + yam += yamArchitectural(card["Architectural"]) + if "Cost" in card: + yam += yamCost(card["Cost"]) + if len(card["Rendering"]) > 0 or len(card["VectorRendering"]) > 0: + yam += "AppearanceModels:\n" + if "Rendering" in card: + yam += yamRendering(card["Rendering"]) + if "VectorRendering" in card: + yam += yamVectorRendering(card["VectorRendering"]) + + file = open(output, "w", encoding="utf-8") + file.write(yam) + file.close() + +def convert(infolder, outfolder): + a_path = infolder + '/**/*.FCMat' + dir_path_list = glob.glob(a_path, recursive=True) + + for a_path in dir_path_list: + p = Path(a_path) + relative = p.relative_to(infolder) + out = Path(outfolder) / relative + print("('{0}', '{1}') -> {2}".format(infolder, relative, out)) + + try: + card = read(p) + except Exception: + print("Error converting card '{0}'. Skipped.") + continue + + out.parent.mkdir(parents=True, exist_ok=True) + saveYaml(card, out) + +import argparse +parser = argparse.ArgumentParser() +parser.add_argument("infolder", help="Input folder containing older material cards") +parser.add_argument("outfolder", help="Output folder to place the converted material cards") +args = parser.parse_args() + +print("Input folder '{0}'".format(args.infolder)) +print("Output folder '{0}'".format(args.outfolder)) + +convert(args.infolder, args.outfolder) \ No newline at end of file diff --git a/src/Mod/Material/materialtools/cardutils.py b/src/Mod/Material/materialtools/cardutils.py index bde7157a20..56dfea0ab5 100644 --- a/src/Mod/Material/materialtools/cardutils.py +++ b/src/Mod/Material/materialtools/cardutils.py @@ -25,19 +25,15 @@ __url__ = "http://www.freecad.org" import os from os.path import join +from pathlib import Path import FreeCAD +import Material unicode = str -# TODO: -# move material GUI preferences from FEM to an own preference tab in Material -# move preference GUI code to material module -# https://forum.freecad.org/viewtopic.php?f=10&t=35515 - - # TODO: # implement method check_material_keys from FEM material task panel for material editor # may be move out of the FEM material task panel to here @@ -62,36 +58,127 @@ this has been done already by eivind see https://forum.freecad.org/viewtopic.php?f=38&t=16714 ''' +def get_material_preferred_directory(category=None): + """ + Return the preferred material directory. In priority order they are: + 1. user specified + 2. user modules folder + 3. system folder + """ + mat_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material/Resources") + use_built_in_materials = mat_prefs.GetBool("UseBuiltInMaterials", True) + use_mat_from_config_dir = mat_prefs.GetBool("UseMaterialsFromConfigDir", True) + use_mat_from_custom_dir = mat_prefs.GetBool("UseMaterialsFromCustomDir", True) + + preferred = None + + if use_built_in_materials: + if category == 'Fluid': + preferred = join( + FreeCAD.getResourceDir(), "Mod", "Material", "Resources", "Materials", "FluidMaterial" + ) + + elif category == 'Solid': + preferred = join( + FreeCAD.getResourceDir(), "Mod", "Material", "Resources", "Materials", "StandardMaterial" + ) + + else: + preferred = join( + FreeCAD.getResourceDir(), "Mod", "Material" + ) + + if use_mat_from_config_dir: + user = join( + FreeCAD.ConfigGet("UserAppData"), "Material" + ) + if os.path.isdir(user): + preferred = user + + if use_mat_from_custom_dir: + custom = mat_prefs.GetString("CustomMaterialsDir", "") + if len(custom.strip()) > 0: + preferred = custom + + return preferred + +def get_material_preferred_save_directory(): + """ + Return the preferred directory for saving materials. In priority order they are: + 1. user specified + 2. user modules folder + """ + mat_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material/Resources") + use_mat_from_config_dir = mat_prefs.GetBool("UseMaterialsFromConfigDir", True) + use_mat_from_custom_dir = mat_prefs.GetBool("UseMaterialsFromCustomDir", True) + + if use_mat_from_custom_dir: + custom = mat_prefs.GetString("CustomMaterialsDir", "") + if len(custom.strip()) > 0: + # Create the directory if it doesn't exist + try: + if not os.path.isdir(custom): + os.makedirs(custom) + return custom + except Exception as ex: + print(ex) + pass + + if use_mat_from_config_dir: + user = join( + FreeCAD.ConfigGet("UserAppData"), "Material" + ) + try: + if not os.path.isdir(user): + os.makedirs(user) + return user + except Exception as ex: + print(ex) + pass + + + return "" + # ***** get resources for cards ****************************************************************** def get_material_resources(category='Solid'): resources = {} # { resource_path: icon_path, ... } - # TODO: move GUI preferences from FEM to a new side tab Material - # https://forum.freecad.org/viewtopic.php?f=10&t=35515 mat_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material/Resources") use_built_in_materials = mat_prefs.GetBool("UseBuiltInMaterials", True) + use_mat_from_modules = mat_prefs.GetBool("UseMaterialsFromWorkbenches", True) use_mat_from_config_dir = mat_prefs.GetBool("UseMaterialsFromConfigDir", True) use_mat_from_custom_dir = mat_prefs.GetBool("UseMaterialsFromCustomDir", True) if use_built_in_materials: if category == 'Fluid': builtin_mat_dir = join( - FreeCAD.getResourceDir(), "Mod", "Material", "FluidMaterial" + FreeCAD.getResourceDir(), "Mod", "Material", "Resources", "Materials", "FluidMaterial" ) else: builtin_mat_dir = join( - FreeCAD.getResourceDir(), "Mod", "Material", "StandardMaterial" + FreeCAD.getResourceDir(), "Mod", "Material", "Resources", "Materials", "StandardMaterial" ) resources[builtin_mat_dir] = ":/icons/freecad.svg" + if use_mat_from_modules: + module_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material/Resources/Modules") + module_groups = module_prefs.GetGroups() + for group in module_groups: + module = module_prefs.GetGroup(group) + module_mat_dir = module.GetString("ModuleDir", "") + module_icon_dir = module.GetString("ModuleIcon", "") + if len(module_mat_dir) > 0: + resources[module_mat_dir] = module_icon_dir + if use_mat_from_config_dir: config_mat_dir = join( FreeCAD.ConfigGet("UserAppData"), "Material" ) - resources[config_mat_dir] = ":/icons/preferences-general.svg" + if os.path.exists(config_mat_dir): + resources[config_mat_dir] = ":/icons/preferences-general.svg" if use_mat_from_custom_dir: custom_mat_dir = mat_prefs.GetString("CustomMaterialsDir", "") @@ -106,6 +193,62 @@ def get_material_resources(category='Solid'): return resources +def get_material_libraries(): + + resources = {} # { resource_path: icon_path, ... } + + mat_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material/Resources") + use_built_in_materials = mat_prefs.GetBool("UseBuiltInMaterials", True) + use_mat_from_modules = mat_prefs.GetBool("UseMaterialsFromWorkbenches", True) + use_mat_from_config_dir = mat_prefs.GetBool("UseMaterialsFromConfigDir", True) + use_mat_from_custom_dir = mat_prefs.GetBool("UseMaterialsFromCustomDir", True) + + if use_built_in_materials: + builtin_mat_dir = join( + FreeCAD.getResourceDir(), "Mod", "Material", "Resources", "Materials" + ) + resources["System"] = (builtin_mat_dir, ":/icons/freecad.svg") + + if use_mat_from_modules: + module_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material/Resources/Modules") + module_groups = module_prefs.GetGroups() + for group in module_groups: + print("\tGroup - {0}".format(group)) + module = module_prefs.GetGroup(group) + module_mat_dir = module.GetString("ModuleDir", "") + module_icon = module.GetString("ModuleIcon", "") + if len(module_mat_dir) > 0: + resources[group] = (module_mat_dir, module_icon) + + if use_mat_from_config_dir: + config_mat_dir = join( + FreeCAD.ConfigGet("UserAppData"), "Material" + ) + if os.path.exists(config_mat_dir): + resources["User"] = (config_mat_dir, ":/icons/preferences-general.svg") + + if use_mat_from_custom_dir: + custom_mat_dir = mat_prefs.GetString("CustomMaterialsDir", "") + if os.path.exists(custom_mat_dir): + resources["Custom"] = (custom_mat_dir, ":/icons/user.svg") + + return resources + + +def list_cards(mat_dir, icon): + import glob + a_path = mat_dir + '/**/*.FCMat' + print("path = '{0}'".format(a_path)) + dir_path_list = glob.glob(a_path, recursive=True) + # Need to handle duplicates + + cards = [] + for a_path in dir_path_list: + p = Path(a_path) + relative = p.relative_to(mat_dir) + cards.append(relative) + + return cards def output_resources(resources): FreeCAD.Console.PrintMessage('Directories in which we will look for material cards:\n') @@ -117,24 +260,27 @@ def output_resources(resources): # used in material editor and FEM material task panels def import_materials(category='Solid', template=False): - - resources = get_material_resources(category) - + materialManager = Material.MaterialManager() + mats = materialManager.Materials materials = {} cards = {} icons = {} - for path in resources.keys(): - materials, cards, icons = add_cards_from_a_dir( - materials, - cards, - icons, - path, - resources[path] - ) + for matUUID in mats: + mat = materialManager.getMaterial(matUUID) + physicalModels = mat.PhysicalModels + fluid = ('1ae66d8c-1ba1-4211-ad12-b9917573b202' in physicalModels) + if not fluid: + path = mat.LibraryRoot + "/" + mat.Directory + print(path) + materials[path] = mat.Properties + cards[path] = mat.Name + icons[path] = mat.LibraryIcon + + print(path) + print(mat.Properties) return (materials, cards, icons) - def add_cards_from_a_dir(materials, cards, icons, mat_dir, icon, template=False): # fill materials and icons import glob @@ -220,6 +366,8 @@ def get_material_template(withSpaces=False): # https://www.freecad.org/wiki/Material_data_model # https://www.freecad.org/wiki/Material + print("Call to get_material_template() successful") + import yaml template_data = yaml.safe_load( open(join(FreeCAD.ConfigGet('AppHomePath'), 'Mod/Material/Templatematerial.yml')) @@ -247,7 +395,7 @@ def get_material_template(withSpaces=False): def create_mat_tools_header(): headers = join(get_source_path(), 'src/Mod/Material/StandardMaterial/Tools/headers') - print(headers) + # print(headers) if not os.path.isfile(headers): FreeCAD.Console.PrintError( 'file not found: {}'.format(headers) @@ -431,7 +579,7 @@ def write_cards_to_path(cards_path, cards_data, write_group_section=True, write_ continue else: card_path = join(cards_path, (card_data['CardName'] + '.FCMat')) - print(card_path) + # print(card_path) if write_group_section is True: write(card_path, card_data, True) else: diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index 349d8e2581..2c22cad1b4 100644 --- a/src/Mod/Measure/App/CMakeLists.txt +++ b/src/Mod/Measure/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppMeasure -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp index 9733d6122a..9f366f6bb7 100644 --- a/src/Mod/Mesh/App/AppMeshPy.cpp +++ b/src/Mod/Mesh/App/AppMeshPy.cpp @@ -27,12 +27,6 @@ #include #endif -#include "Core/Approximation.h" -#include "Core/Evaluation.h" -#include "Core/Iterator.h" -#include "Core/MeshIO.h" -#include "Core/MeshKernel.h" -#include "WildMagic4/Wm4ContBox3.h" #include #include #include @@ -41,6 +35,12 @@ #include #include #include +#include "Core/Approximation.h" +#include "Core/Evaluation.h" +#include "Core/Iterator.h" +#include "Core/MeshIO.h" +#include "Core/MeshKernel.h" +#include "WildMagic4/Wm4ContBox3.h" #include "Exporter.h" #include "Importer.h" @@ -139,7 +139,7 @@ private: } Py::Object read(const Py::Tuple& args) { - char* Name; + char* Name {}; if (!PyArg_ParseTuple(args.ptr(), "et", "utf-8", &Name)) { throw Py::Exception(); } @@ -152,7 +152,7 @@ private: } Py::Object open(const Py::Tuple& args) { - char* Name; + char* Name {}; if (!PyArg_ParseTuple(args.ptr(), "et", "utf-8", &Name)) { throw Py::Exception(); } @@ -170,7 +170,7 @@ private: } Py::Object importer(const Py::Tuple& args) { - char* Name; + char* Name {}; char* DocName = nullptr; if (!PyArg_ParseTuple(args.ptr(), "et|s", "utf-8", &Name, &DocName)) { throw Py::Exception(); @@ -199,8 +199,8 @@ private: Py::Object exporter(const Py::Tuple& args, const Py::Dict& keywds) { - PyObject* objects; - char* fileNamePy; + PyObject* objects {}; + char* fileNamePy {}; // If tolerance is specified via python interface, use that. // If not, use the preference, if that exists, else default to 0.1mm. @@ -292,7 +292,7 @@ private: Py::Object show(const Py::Tuple& args) { - PyObject* pcObj; + PyObject* pcObj {}; char* name = "Mesh"; if (!PyArg_ParseTuple(args.ptr(), "O!|s", &(MeshPy::Type), &pcObj, &name)) { throw Py::Exception(); @@ -334,7 +334,7 @@ private: } PyErr_Clear(); - PyObject* box; + PyObject* box {}; if (PyArg_ParseTuple(args.ptr(), "O!", &Base::BoundBoxPy::Type, &box)) { Py::BoundingBox bbox(box, false); mesh = MeshObject::createCube(bbox.getValue()); @@ -468,7 +468,7 @@ private: } Py::Object calculateEigenTransform(const Py::Tuple& args) { - PyObject* input; + PyObject* input {}; if (!PyArg_ParseTuple(args.ptr(), "O", &input)) { throw Py::Exception(); @@ -513,7 +513,7 @@ private: } Py::Object polynomialFit(const Py::Tuple& args) { - PyObject* input; + PyObject* input {}; if (!PyArg_ParseTuple(args.ptr(), "O", &input)) { throw Py::Exception(); @@ -543,7 +543,7 @@ private: dict.setItem(Py::String("Sigma"), Py::Float(fit)); // coefficients - double a, b, c, d, e, f; + double a {}, b {}, c {}, d {}, e {}, f {}; polyFit.GetCoefficients(a, b, c, d, e, f); Py::Tuple p(6); p.setItem(0, Py::Float(a)); @@ -564,11 +564,11 @@ private: } dict.setItem(Py::String("Residuals"), r); - return dict; + return dict; // NOLINT } Py::Object minimumVolumeOrientedBox(const Py::Tuple& args) { - PyObject* input; + PyObject* input {}; if (!PyArg_ParseTuple(args.ptr(), "O", &input)) { throw Py::Exception(); @@ -626,7 +626,7 @@ private: result.setItem(5, Py::Float(mobox.Extent[1])); result.setItem(6, Py::Float(mobox.Extent[2])); - return result; + return result; // NOLINT } }; diff --git a/src/Mod/Mesh/App/Core/Algorithm.cpp b/src/Mod/Mesh/App/Core/Algorithm.cpp index 36f2cccb64..52dbb2d5d4 100644 --- a/src/Mod/Mesh/App/Core/Algorithm.cpp +++ b/src/Mod/Mesh/App/Core/Algorithm.cpp @@ -51,7 +51,7 @@ bool MeshAlgorithm::IsVertexVisible(const Base::Vector3f& rcVertex, Base::Vector3f cDirection = rcVertex - rcView; float fDistance = cDirection.Length(); Base::Vector3f cIntsct; - FacetIndex uInd; + FacetIndex uInd {}; // search for the nearest facet to rcView in direction to rcVertex if (NearestFacetOnRay(rcView, cDirection, /*1.2f*fDistance,*/ rclGrid, cIntsct, uInd)) { @@ -265,8 +265,8 @@ bool MeshAlgorithm::FirstFacetToVertex(const Base::Vector3f& rPt, else { // if not then check the distance to the border of the triangle Base::Vector3f res; - float fDist; - unsigned short uSide; + float fDist {}; + unsigned short uSide {}; cFacet.ProjectPointToPlane(rPt, res); cFacet.NearestEdgeToPoint(res, fDist, uSide); if (fDist < fEps) { @@ -405,7 +405,7 @@ void MeshAlgorithm::GetFacetBorders(const std::vector& raulInd, } // search for edges in the unsorted list - PointIndex ulFirst, ulLast; + PointIndex ulFirst {}, ulLast {}; std::list clBorder; ulFirst = aclEdges.begin()->first; ulLast = aclEdges.begin()->second; @@ -1187,7 +1187,7 @@ void MeshAlgorithm::CheckFacets(const MeshFacetGrid& rclGrid, MeshFacetIterator clIter(_rclMesh, 0); Base::Vector3f clPt2d; Base::Vector3f clGravityOfFacet; - bool bNoPointInside; + bool bNoPointInside {}; // Cache current view projection matrix since calls to Coin's projection are expensive Base::ViewProjMatrix fixedProj(pclProj->getComposedProjectionMatrix()); // Precompute the polygon's bounding box @@ -1614,7 +1614,7 @@ bool MeshAlgorithm::ConnectLines(std::list>& openEdges, std::list& boundary) const; -protected: +private: const MeshKernel& _rclMesh; /**< The mesh kernel. */ }; @@ -424,6 +424,10 @@ class MeshExport MeshCollector public: MeshCollector() = default; virtual ~MeshCollector() = default; + MeshCollector(const MeshCollector&) = default; + MeshCollector(MeshCollector&&) = default; + MeshCollector& operator=(const MeshCollector&) = default; + MeshCollector& operator=(MeshCollector&&) = default; virtual void Append(const MeshCore::MeshKernel&, FacetIndex index) = 0; }; @@ -435,7 +439,7 @@ public: {} void Append(const MeshCore::MeshKernel& kernel, FacetIndex index) override { - PointIndex ulP1, ulP2, ulP3; + PointIndex ulP1 {}, ulP2 {}, ulP3 {}; kernel.GetFacetPoints(index, ulP1, ulP2, ulP3); indices.push_back(ulP1); indices.push_back(ulP2); @@ -499,7 +503,7 @@ protected: std::set& visit, MeshCollector& collect) const; -protected: +private: const MeshKernel& _rclMesh; /**< The mesh kernel. */ std::vector> _map; }; @@ -528,7 +532,7 @@ public: /// Returns an array of common facets of the passed facet indexes. std::vector GetIndices(FacetIndex, FacetIndex) const; -protected: +private: const MeshKernel& _rclMesh; /**< The mesh kernel. */ std::vector> _map; }; @@ -557,7 +561,7 @@ public: void AddNeighbour(PointIndex, PointIndex); void RemoveNeighbour(PointIndex, PointIndex); -protected: +private: const MeshKernel& _rclMesh; /**< The mesh kernel. */ std::vector> _map; }; @@ -582,7 +586,7 @@ public: void Rebuild(); const std::pair& operator[](const MeshEdge&) const; -protected: +private: class EdgeOrder { public: @@ -630,7 +634,7 @@ public: return _norm; } -protected: +private: const MeshKernel& _rclMesh; /**< The mesh kernel. */ std::vector _norm; }; diff --git a/src/Mod/Mesh/App/Core/Approximation.cpp b/src/Mod/Mesh/App/Core/Approximation.cpp index ad204d493a..b986c2eeb5 100644 --- a/src/Mod/Mesh/App/Core/Approximation.cpp +++ b/src/Mod/Mesh/App/Core/Approximation.cpp @@ -146,8 +146,15 @@ float PlaneFit::Fit() return FLOAT_MAX; } - double sxx, sxy, sxz, syy, syz, szz, mx, my, mz; - sxx = sxy = sxz = syy = syz = szz = mx = my = mz = 0.0; + double sxx {0.0}; + double sxy {0.0}; + double sxz {0.0}; + double syy {0.0}; + double syz {0.0}; + double szz {0.0}; + double mx {0.0}; + double my {0.0}; + double mz {0.0}; for (const auto& vPoint : _vPoints) { sxx += double(vPoint.x * vPoint.x); @@ -356,9 +363,9 @@ float PlaneFit::GetSignedStdDeviation() const return FLOAT_MAX; } - float fSumXi = 0.0f, fSumXi2 = 0.0f, fMean = 0.0f, fDist = 0.0f; + float fSumXi = 0.0F, fSumXi2 = 0.0F, fMean = 0.0F, fDist = 0.0F; float fMinDist = FLOAT_MAX; - float fFactor; + float fFactor = 0.0F; float ulPtCt = float(CountPoints()); Base::Vector3f clGravity, clPt; @@ -1036,8 +1043,7 @@ struct LMCylinderFunctor // 'fjac' has dimensions m x n // It will contain the jacobian of the errors, calculated numerically in this case. - double epsilon; - epsilon = 1e-5; + const double epsilon = 1e-5; for (int i = 0; i < x.size(); i++) { Eigen::VectorXd xPlus(x); @@ -1122,8 +1128,12 @@ Base::Vector3f CylinderFit::GetInitialAxisFromNormals(const std::vector>& rcPts) const; + Approximation(const Approximation&) = default; + Approximation(Approximation&&) = default; + Approximation& operator=(const Approximation&) = default; + Approximation& operator=(Approximation&&) = default; + protected: // NOLINTBEGIN std::list _vPoints; /**< Holds the points for the fit algorithm. */ @@ -387,7 +392,7 @@ public: std::vector toBezier(double umin = 0.0, double umax = 1.0, double vmin = 0.0, double vmax = 1.0) const; -protected: +private: double PolynomFit(); double _fCoeff[10]; /**< Ziel der Koeffizienten aus dem Fit */ }; @@ -437,7 +442,7 @@ public: */ void GetBounding(Base::Vector3f& bottom, Base::Vector3f& top) const; -protected: +private: Base::Vector3f _vBase; /**< Base vector of the cylinder. */ Base::Vector3f _vAxis; /**< Axis of the cylinder. */ float _fRadius {0}; /**< Radius of the cylinder. */ @@ -474,7 +479,7 @@ public: */ void ProjectToSphere(); -protected: +private: Base::Vector3f _vCenter; /**< Center of the sphere. */ float _fRadius {0}; /**< Radius of the cylinder. */ }; @@ -498,11 +503,19 @@ public: * @param pKoef Pointer to the quadric coefficients * (double [10]) */ + // NOLINTBEGIN explicit FunctionContainer(const double* pKoef) { Assign(pKoef); pImplSurf = new Wm4::QuadricSurface(dKoeff); } + // NOLINTEND + + FunctionContainer(const FunctionContainer&) = delete; + FunctionContainer(FunctionContainer&&) = delete; + FunctionContainer& operator=(const FunctionContainer&) = delete; + FunctionContainer& operator=(FunctionContainer&&) = delete; + /** * Apply quadric coefficients * @param pKoef Pointer to the quadric coefficients @@ -676,7 +689,7 @@ public: return (2.0 * dKoeff[6]); } -protected: +private: double dKoeff[10]; /**< Coefficients of quadric */ Wm4::ImplicitSurface* pImplSurf; /**< Access to the WildMagic library */ @@ -695,7 +708,7 @@ public: float Fit() override; float Value(float x, float y) const; -protected: +private: float _fCoeff[9]; }; diff --git a/src/Mod/Mesh/App/Core/Builder.h b/src/Mod/Mesh/App/Core/Builder.h index 02da3e5663..e9ab351bb8 100644 --- a/src/Mod/Mesh/App/Core/Builder.h +++ b/src/Mod/Mesh/App/Core/Builder.h @@ -70,8 +70,8 @@ private: FacetIndex facetIdx; Edge(PointIndex p1, PointIndex p2, FacetIndex idx) + : facetIdx {idx} { - facetIdx = idx; if (p1 > p2) { pt1 = p2; pt2 = p1; @@ -117,6 +117,11 @@ public: explicit MeshBuilder(MeshKernel& rclM); ~MeshBuilder(); + MeshBuilder(const MeshBuilder&) = delete; + MeshBuilder(MeshBuilder&&) = delete; + MeshBuilder& operator=(const MeshBuilder&) = delete; + MeshBuilder& operator=(MeshBuilder&&) = delete; + /** * Set the tolerance for the comparison of points. Normally you don't need to set the tolerance. */ @@ -198,6 +203,11 @@ public: explicit MeshFastBuilder(MeshKernel& rclM); ~MeshFastBuilder(); + MeshFastBuilder(const MeshFastBuilder&) = delete; + MeshFastBuilder(MeshFastBuilder&&) = delete; + MeshFastBuilder& operator=(const MeshFastBuilder&) = delete; + MeshFastBuilder& operator=(MeshFastBuilder&&) = delete; + /** Initializes the class. Must be done before adding facets * @param ctFacets count of facets. */ diff --git a/src/Mod/Mesh/App/Core/Curvature.cpp b/src/Mod/Mesh/App/Core/Curvature.cpp index d60463f040..8c36fed6ce 100644 --- a/src/Mod/Mesh/App/Core/Curvature.cpp +++ b/src/Mod/Mesh/App/Core/Curvature.cpp @@ -59,11 +59,11 @@ MeshCurvature::MeshCurvature(const MeshKernel& kernel) std::generate(mySegment.begin(), mySegment.end(), Base::iotaGen(0)); } -MeshCurvature::MeshCurvature(const MeshKernel& kernel, const std::vector& segm) +MeshCurvature::MeshCurvature(const MeshKernel& kernel, std::vector segm) : myKernel(kernel) , myMinPoints(20) , myRadius(0.5f) - , mySegment(segm) + , mySegment(std::move(segm)) {} void MeshCurvature::ComputePerFace(bool parallel) @@ -357,7 +357,7 @@ public: {} void Append(const MeshCore::MeshKernel& kernel, FacetIndex index) override { - PointIndex ulP1, ulP2, ulP3; + PointIndex ulP1 {}, ulP2 {}, ulP3 {}; kernel.GetFacetPoints(index, ulP1, ulP2, ulP3); indices.insert(ulP1); indices.insert(ulP2); @@ -411,13 +411,13 @@ CurvatureInfo FacetCurvature::Compute(FacetIndex index) const fitPoints.push_back(verts[it] - face_gravity); } - float fMin, fMax; + float fMin {}, fMax {}; if (fitPoints.size() >= myMinPoints) { SurfaceFit surf_fit; surf_fit.AddPoints(fitPoints); surf_fit.Fit(); rkNormal = surf_fit.GetNormal(); - double dMin, dMax, dDistance; + double dMin {}, dMax {}, dDistance {}; if (surf_fit.GetCurvatureInfo(0.0, 0.0, 0.0, dMin, dMax, rkDir1, rkDir0, dDistance)) { fMin = (float)dMin; fMax = (float)dMax; diff --git a/src/Mod/Mesh/App/Core/Curvature.h b/src/Mod/Mesh/App/Core/Curvature.h index 9f724d1491..1e96135103 100644 --- a/src/Mod/Mesh/App/Core/Curvature.h +++ b/src/Mod/Mesh/App/Core/Curvature.h @@ -60,7 +60,7 @@ class MeshExport MeshCurvature { public: explicit MeshCurvature(const MeshKernel& kernel); - MeshCurvature(const MeshKernel& kernel, const std::vector& segm); + MeshCurvature(const MeshKernel& kernel, std::vector segm); float GetRadius() const { return myRadius; diff --git a/src/Mod/Mesh/App/Core/CylinderFit.cpp b/src/Mod/Mesh/App/Core/CylinderFit.cpp index 194ef85306..7a20d73bbb 100644 --- a/src/Mod/Mesh/App/Core/CylinderFit.cpp +++ b/src/Mod/Mesh/App/Core/CylinderFit.cpp @@ -291,7 +291,7 @@ float CylinderFit::Fit() // solL: Yc, Zc, M, N, R // solM: Xc, Zc, L, N, R // solN: Xc, Yc, L, M, R - SolutionD solDir; + SolutionD solDir {}; findBestSolDirection(solDir); // Initialise some matrices and vectors @@ -300,7 +300,7 @@ float CylinderFit::Fit() Eigen::VectorXd atpl(5); // Iteration loop... - double sigma0; + double sigma0 {}; bool cont = true; while (cont && (_numIter < _maxIter)) { ++_numIter; @@ -327,7 +327,7 @@ float CylinderFit::Fit() // Before updating the unknowns, compute the residuals and sigma0 and check the residual // convergence - bool vConverged; + bool vConverged {}; if (!computeResiduals(solDir, x, residuals, sigma0, _vConvLimit, vConverged)) { return FLOAT_MAX; } @@ -465,8 +465,8 @@ void CylinderFit::setupNormalEquationMatrices(SolutionD solDir, // For each point, setup the observation equation coefficients and add their // contribution into the normal equation matrices - double a[5], b[3]; - double f0, qw; + double a[5] {}, b[3] {}; + double f0 {}, qw {}; std::vector::const_iterator vIt = residuals.begin(); std::list::const_iterator cIt; for (cIt = _vPoints.begin(); cIt != _vPoints.end(); ++cIt, ++vIt) { @@ -523,11 +523,12 @@ void CylinderFit::setupObservation(SolutionD solDir, b[2] = 2.0 * (dz - _vAxis.x * _vAxis.z * dx - _vAxis.y * _vAxis.z * dy - _vAxis.z * _vAxis.z * dz); + double ddxdl {}, ddydl {}, ddzdl {}; + double ddxdm {}, ddydm {}, ddzdm {}; + double ddxdn {}, ddydn {}, ddzdn {}; + // partials of the parameters switch (solDir) { - double ddxdl, ddydl, ddzdl; - double ddxdm, ddydm, ddzdm; - double ddxdn, ddydn, ddzdn; case solL: // order of parameters: Yc, Zc, M, N, R ddxdm = -2.0 * _vAxis.y * dx00 + (_vAxis.x - _vAxis.y * _vAxis.y / _vAxis.x) * dy00 @@ -645,8 +646,8 @@ bool CylinderFit::computeResiduals(SolutionD solDir, vConverged = true; int nPtsUsed = 0; sigma0 = 0.0; - double a[5], b[3]; - double f0, qw; + double a[5] {}, b[3] {}; + double f0 {}, qw {}; // double maxdVx = 0.0; // double maxdVy = 0.0; // double maxdVz = 0.0; @@ -747,7 +748,7 @@ bool CylinderFit::updateParameters(SolutionD solDir, const Eigen::VectorXd& x) } // Update the dependent axis direction parameter - double l2, m2, n2; + double l2 {}, m2 {}, n2 {}; switch (solDir) { case solL: l2 = 1.0 - _vAxis.y * _vAxis.y - _vAxis.z * _vAxis.z; diff --git a/src/Mod/Mesh/App/Core/Degeneration.cpp b/src/Mod/Mesh/App/Core/Degeneration.cpp index 9f00419996..b01895a624 100644 --- a/src/Mod/Mesh/App/Core/Degeneration.cpp +++ b/src/Mod/Mesh/App/Core/Degeneration.cpp @@ -283,7 +283,7 @@ struct MeshFacet_Less { bool operator()(const FaceIterator& x, const FaceIterator& y) const { - PointIndex tmp; + PointIndex tmp {}; PointIndex x0 = x->_aulPoints[0]; PointIndex x1 = x->_aulPoints[1]; PointIndex x2 = x->_aulPoints[2]; diff --git a/src/Mod/Mesh/App/Core/Degeneration.h b/src/Mod/Mesh/App/Core/Degeneration.h index 0baf629930..6477002c98 100644 --- a/src/Mod/Mesh/App/Core/Degeneration.h +++ b/src/Mod/Mesh/App/Core/Degeneration.h @@ -584,7 +584,7 @@ public: {} bool Evaluate() override; -protected: +private: std::vector& _facets; }; diff --git a/src/Mod/Mesh/App/Core/Elements.cpp b/src/Mod/Mesh/App/Core/Elements.cpp index 4f04abe768..068801c94f 100644 --- a/src/Mod/Mesh/App/Core/Elements.cpp +++ b/src/Mod/Mesh/App/Core/Elements.cpp @@ -55,7 +55,7 @@ PointIndex MeshPointArray::Get(const MeshPoint& rclPoint) PointIndex MeshPointArray::GetOrAddIndex(const MeshPoint& rclPoint) { - PointIndex ulIndex; + PointIndex ulIndex {}; if ((ulIndex = Get(rclPoint)) == POINT_INDEX_MAX) { push_back(rclPoint); @@ -111,7 +111,7 @@ MeshFacetArray::MeshFacetArray(MeshFacetArray&& ary) = default; void MeshFacetArray::Erase(_TIterator pIter) { - FacetIndex i, *pulN; + FacetIndex i {}, *pulN {}; _TIterator pPass, pEnd; FacetIndex ulInd = pIter - begin(); erase(pIter); @@ -494,7 +494,7 @@ bool MeshGeomFacet::IsPointOf(const Base::Vector3f& rclPoint, float fDistance) c // force internal normal to be computed if not done yet Base::Vector3f clNorm(GetNormal()), clProjPt(rclPoint), clEdge; Base::Vector3f clP0(_aclPoints[0]), clP1(_aclPoints[1]), clP2(_aclPoints[2]); - float fLP, fLE; + float fLP {}, fLE {}; clNorm.Normalize(); clProjPt.ProjectToPlane(_aclPoints[0], clNorm); @@ -616,8 +616,8 @@ void MeshGeomFacet::ProjectFacetToPlane(MeshGeomFacet& rclFacet) const void MeshGeomFacet::Enlarge(float fDist) { Base::Vector3f clM, clU, clV, clPNew[3]; - float fA, fD; - PointIndex i, ulP1, ulP2, ulP3; + float fA {}, fD {}; + PointIndex i {}, ulP1 {}, ulP2 {}, ulP3 {}; for (i = 0; i < 3; i++) { ulP1 = i; @@ -683,7 +683,7 @@ bool MeshGeomFacet::IsDegenerated(float epsilon) const bool MeshGeomFacet::IsDeformed(float fCosOfMinAngle, float fCosOfMaxAngle) const { - float fCosAngle; + float fCosAngle {}; Base::Vector3f u, v; for (int i = 0; i < 3; i++) { @@ -1047,8 +1047,10 @@ void MeshGeomFacet::SubSample(float fStep, std::vector& rclPoint float fDetABC = bx * cy; - for (float px = (fStep / 2.0f); px < fLenAB; px += fStep) { - for (float py = (fStep / 2.0f); py < cy; py += fStep) { + for (float px = (fStep / 2.0f); px < fLenAB; px += fStep) // NOLINT + { + for (float py = (fStep / 2.0f); py < cy; py += fStep) // NOLINT + { float u = (bx * cy + cx * py - px * cy - bx * py) / fDetABC; float v = (px * cy - cx * py) / fDetABC; float w = (bx * py) / fDetABC; @@ -1146,9 +1148,9 @@ int MeshGeomFacet::IntersectWithFacet(const MeshGeomFacet& rclFacet, return 0; } - float V[3][3], U[3][3]; + float V[3][3] {}, U[3][3] {}; int coplanar = 0; - float isectpt1[3], isectpt2[3]; + float isectpt1[3] {}, isectpt2[3] {}; for (int i = 0; i < 3; i++) { V[i][0] = _aclPoints[i].x; @@ -1313,7 +1315,7 @@ float MeshGeomFacet::CenterOfCircumCircle(Base::Vector3f& rclCenter) const unsigned short MeshGeomFacet::NearestEdgeToPoint(const Base::Vector3f& rclPt) const { - unsigned short usSide; + unsigned short usSide {}; const Base::Vector3f& rcP1 = _aclPoints[0]; const Base::Vector3f& rcP2 = _aclPoints[1]; @@ -1543,7 +1545,7 @@ float MeshGeomFacet::MinimumAngle() const bool MeshGeomFacet::IsPointOfSphere(const Base::Vector3f& rP) const { - float radius; + float radius {}; Base::Vector3f center; radius = CenterOfCircumCircle(center); radius *= radius; @@ -1554,7 +1556,7 @@ bool MeshGeomFacet::IsPointOfSphere(const Base::Vector3f& rP) const bool MeshGeomFacet::IsPointOfSphere(const MeshGeomFacet& rFacet) const { - float radius; + float radius {}; Base::Vector3f center; radius = CenterOfCircumCircle(center); radius *= radius; @@ -1575,7 +1577,7 @@ float MeshGeomFacet::AspectRatio() const Base::Vector3f d1 = _aclPoints[1] - _aclPoints[2]; Base::Vector3f d2 = _aclPoints[2] - _aclPoints[0]; - float l2, maxl2 = d0.Sqr(); + float l2 {}, maxl2 = d0.Sqr(); if ((l2 = d1.Sqr()) > maxl2) { maxl2 = l2; } diff --git a/src/Mod/Mesh/App/Core/Elements.h b/src/Mod/Mesh/App/Core/Elements.h index dfd349a81b..32994a3a5c 100644 --- a/src/Mod/Mesh/App/Core/Elements.h +++ b/src/Mod/Mesh/App/Core/Elements.h @@ -665,14 +665,16 @@ public: */ bool IsCoplanar(const MeshGeomFacet& facet) const; -protected: +private: mutable Base::Vector3f _clNormal; /**< Normal of the facet. */ mutable bool _bNormalCalculated; /**< True if the normal is already calculated. */ public: + // NOLINTBEGIN Base::Vector3f _aclPoints[3]; /**< Geometric corner points. */ unsigned char _ucFlag; /**< Flag property */ unsigned long _ulProp; /**< Free usable property. */ + // NOLINTEND }; using TMeshPointArray = std::vector; @@ -993,7 +995,7 @@ inline bool MeshGeomFacet::IntersectWithPlane(const Base::Vector3f& rclBase, && (bD0 == (_aclPoints[2].DistanceToPlane(rclBase, rclNormal) > 0.0f))); } -inline MeshFacet::MeshFacet() +inline MeshFacet::MeshFacet() // NOLINT : _ucFlag(0) , _ulProp(0) { @@ -1009,15 +1011,9 @@ inline MeshFacet::MeshFacet(PointIndex p1, FacetIndex n3) : _ucFlag(0) , _ulProp(0) -{ - _aulPoints[0] = p1; - _aulPoints[1] = p2; - _aulPoints[2] = p3; - - _aulNeighbours[0] = n1; - _aulNeighbours[1] = n2; - _aulNeighbours[2] = n3; -} + , _aulPoints {p1, p2, p3} + , _aulNeighbours {n1, n2, n3} +{} void MeshFacet::SetVertices(PointIndex p1, PointIndex p2, PointIndex p3) { @@ -1191,7 +1187,7 @@ inline unsigned short MeshFacet::Side(PointIndex ulP0, PointIndex ulP1) const inline unsigned short MeshFacet::Side(const MeshFacet& rFace) const { - unsigned short side; + unsigned short side {}; for (int i = 0; i < 3; i++) { side = Side(rFace._aulPoints[i], rFace._aulPoints[(i + 1) % 3]); if (side != USHRT_MAX) { diff --git a/src/Mod/Mesh/App/Core/Evaluation.cpp b/src/Mod/Mesh/App/Core/Evaluation.cpp index 707c712ceb..5397320bef 100644 --- a/src/Mod/Mesh/App/Core/Evaluation.cpp +++ b/src/Mod/Mesh/App/Core/Evaluation.cpp @@ -184,7 +184,7 @@ unsigned long MeshEvalOrientation::HasFalsePositives(const std::vector MeshEvalOrientation::GetIndices() const { - FacetIndex ulStartFacet, ulVisited; + FacetIndex ulStartFacet {}, ulVisited {}; if (_rclMesh.CountFacets() == 0) { return {}; @@ -346,7 +346,7 @@ bool MeshEvalTopology::Evaluate() Base::SequencerLauncher seq("Checking topology...", rclFAry.size()); for (pI = rclFAry.begin(); pI != rclFAry.end(); ++pI) { for (int i = 0; i < 3; i++) { - Edge_Index item; + Edge_Index item {}; item.p0 = std::min(pI->_aulPoints[i], pI->_aulPoints[(i + 1) % 3]); item.p1 = std::max(pI->_aulPoints[i], pI->_aulPoints[(i + 1) % 3]); item.f = pI - rclFAry.begin(); @@ -485,7 +485,7 @@ bool MeshEvalPointManifolds::Evaluate() const std::set& nf = vf_it[index]; const std::set& np = vv_it[index]; - std::set::size_type sp, sf; + std::set::size_type sp {}, sf {}; sp = np.size(); sf = nf.size(); // for an inner point the number of adjacent points is equal to the number of shared faces @@ -607,7 +607,7 @@ bool MeshEvalSelfIntersection::Evaluate() MeshFacetGrid cMeshFacetGrid(_rclMesh); const MeshFacetArray& rFaces = _rclMesh.GetFacets(); MeshGridIterator clGridIter(cMeshFacetGrid); - unsigned long ulGridX, ulGridY, ulGridZ; + unsigned long ulGridX {}, ulGridY {}, ulGridZ {}; cMeshFacetGrid.GetCtGrids(ulGridX, ulGridY, ulGridZ); MeshFacetIterator cMFI(_rclMesh); @@ -713,7 +713,7 @@ void MeshEvalSelfIntersection::GetIntersections( MeshFacetGrid cMeshFacetGrid(_rclMesh); const MeshFacetArray& rFaces = _rclMesh.GetFacets(); MeshGridIterator clGridIter(cMeshFacetGrid); - unsigned long ulGridX, ulGridY, ulGridZ; + unsigned long ulGridX {}, ulGridY {}, ulGridZ {}; cMeshFacetGrid.GetCtGrids(ulGridX, ulGridY, ulGridZ); MeshFacetIterator cMFI(_rclMesh); @@ -838,7 +838,7 @@ bool MeshEvalNeighbourhood::Evaluate() Base::SequencerLauncher seq("Checking indices...", rclFAry.size()); for (pI = rclFAry.begin(); pI != rclFAry.end(); ++pI) { for (int i = 0; i < 3; i++) { - Edge_Index item; + Edge_Index item {}; item.p0 = std::min(pI->_aulPoints[i], pI->_aulPoints[(i + 1) % 3]); item.p1 = std::max(pI->_aulPoints[i], pI->_aulPoints[(i + 1) % 3]); item.f = pI - rclFAry.begin(); @@ -905,7 +905,7 @@ std::vector MeshEvalNeighbourhood::GetIndices() const Base::SequencerLauncher seq("Checking indices...", rclFAry.size()); for (pI = rclFAry.begin(); pI != rclFAry.end(); ++pI) { for (int i = 0; i < 3; i++) { - Edge_Index item; + Edge_Index item {}; item.p0 = std::min(pI->_aulPoints[i], pI->_aulPoints[(i + 1) % 3]); item.p1 = std::max(pI->_aulPoints[i], pI->_aulPoints[(i + 1) % 3]); item.f = pI - rclFAry.begin(); @@ -981,7 +981,7 @@ void MeshKernel::RebuildNeighbours(FacetIndex index) MeshFacetArray::_TConstIterator pB = this->_aclFacetArray.begin(); for (pI = pB + index; pI != this->_aclFacetArray.end(); ++pI) { for (int i = 0; i < 3; i++) { - Edge_Index item; + Edge_Index item {}; item.p0 = std::min(pI->_aulPoints[i], pI->_aulPoints[(i + 1) % 3]); item.p1 = std::max(pI->_aulPoints[i], pI->_aulPoints[(i + 1) % 3]); item.f = pI - pB; @@ -1111,7 +1111,7 @@ bool MeshEigensystem::Evaluate() float xmin = 0.0f, xmax = 0.0f, ymin = 0.0f, ymax = 0.0f, zmin = 0.0f, zmax = 0.0f; Base::Vector3f clVect, clProj; - float fH; + float fH {}; const MeshPointArray& aclPoints = _rclMesh.GetPoints(); for (const auto& it : aclPoints) { @@ -1192,8 +1192,7 @@ void MeshEigensystem::CalculateLocalSystem() _cW = planeFit.GetNormal(); // set the sign for the vectors - float fSumU, fSumV, fSumW; - fSumU = fSumV = fSumW = 0.0f; + float fSumU {0.0F}, fSumV {0.0F}, fSumW {0.0F}; for (it = aclPoints.begin(); it != aclPoints.end(); ++it) { float fU = _cU * (*it - _cC); float fV = _cV * (*it - _cC); diff --git a/src/Mod/Mesh/App/Core/Evaluation.h b/src/Mod/Mesh/App/Core/Evaluation.h index 366e152e8f..a9456ed938 100644 --- a/src/Mod/Mesh/App/Core/Evaluation.h +++ b/src/Mod/Mesh/App/Core/Evaluation.h @@ -50,6 +50,11 @@ public: {} virtual ~MeshEvaluation() = default; + MeshEvaluation(const MeshEvaluation&) = delete; + MeshEvaluation(MeshEvaluation&&) = delete; + MeshEvaluation& operator=(const MeshEvaluation&) = delete; + MeshEvaluation& operator=(MeshEvaluation&&) = delete; + /** * Evaluates the mesh kernel with respect to certain criteria. Must be reimplemented by every * subclass. This pure virtual function returns false if the mesh kernel is invalid according @@ -58,6 +63,7 @@ public: virtual bool Evaluate() = 0; protected: + // NOLINTNEXTLINE const MeshKernel& _rclMesh; /**< Mesh kernel */ }; @@ -78,6 +84,11 @@ public: {} virtual ~MeshValidation() = default; + MeshValidation(const MeshValidation&) = delete; + MeshValidation(MeshValidation&&) = delete; + MeshValidation& operator=(const MeshValidation&) = delete; + MeshValidation& operator=(MeshValidation&&) = delete; + /** * This function attempts to change the mesh kernel to be valid according to the checked * criterion: True is returned if the errors could be fixed, false otherwise. @@ -85,6 +96,7 @@ public: virtual bool Fixup() = 0; protected: + // NOLINTNEXTLINE MeshKernel& _rclMesh; /**< Mesh kernel */ }; @@ -207,8 +219,10 @@ public: } protected: + // NOLINTBEGIN std::vector> nonManifoldList; std::list> nonManifoldFacets; + // NOLINTEND }; /** @@ -229,7 +243,7 @@ public: return deletedFaces; } -protected: +private: std::vector deletedFaces; const std::list>& nonManifoldList; }; @@ -264,7 +278,7 @@ public: return static_cast(nonManifoldPoints.size()); } -protected: +private: std::vector nonManifoldPoints; std::list> facetsOfNonManifoldPoints; }; @@ -300,7 +314,7 @@ public: {} bool Fixup() override; -protected: +private: const std::vector>& _raclManifoldList; }; diff --git a/src/Mod/Mesh/App/Core/Grid.cpp b/src/Mod/Mesh/App/Core/Grid.cpp index 0ad39efa4e..3f58ee2c84 100644 --- a/src/Mod/Mesh/App/Core/Grid.cpp +++ b/src/Mod/Mesh/App/Core/Grid.cpp @@ -101,8 +101,6 @@ void MeshGrid::InitGrid() { assert(_pclMesh); - unsigned long i, j; - // Calculate grid length if not initialised // if ((_ulCtGridsX == 0) || (_ulCtGridsY == 0) || (_ulCtGridsZ == 0)) { @@ -139,9 +137,9 @@ void MeshGrid::InitGrid() // Create data structure _aulGrid.clear(); _aulGrid.resize(_ulCtGridsX); - for (i = 0; i < _ulCtGridsX; i++) { + for (unsigned long i = 0; i < _ulCtGridsX; i++) { _aulGrid[i].resize(_ulCtGridsY); - for (j = 0; j < _ulCtGridsY; j++) { + for (unsigned long j = 0; j < _ulCtGridsY; j++) { _aulGrid[i][j].resize(_ulCtGridsZ); } } @@ -151,7 +149,7 @@ unsigned long MeshGrid::Inside(const Base::BoundBox3f& rclBB, std::vector& raulElements, bool bDelDoubles) const { - unsigned long i, j, k, ulMinX, ulMinY, ulMinZ, ulMaxX, ulMaxY, ulMaxZ; + unsigned long ulMinX {}, ulMinY {}, ulMinZ {}, ulMaxX {}, ulMaxY {}, ulMaxZ {}; raulElements.clear(); @@ -159,9 +157,9 @@ unsigned long MeshGrid::Inside(const Base::BoundBox3f& rclBB, Position(Base::Vector3f(rclBB.MinX, rclBB.MinY, rclBB.MinZ), ulMinX, ulMinY, ulMinZ); Position(Base::Vector3f(rclBB.MaxX, rclBB.MaxY, rclBB.MaxZ), ulMaxX, ulMaxY, ulMaxZ); - for (i = ulMinX; i <= ulMaxX; i++) { - for (j = ulMinY; j <= ulMaxY; j++) { - for (k = ulMinZ; k <= ulMaxZ; k++) { + for (auto i = ulMinX; i <= ulMaxX; i++) { + for (auto j = ulMinY; j <= ulMaxY; j++) { + for (auto k = ulMinZ; k <= ulMaxZ; k++) { raulElements.insert(raulElements.end(), _aulGrid[i][j][k].begin(), _aulGrid[i][j][k].end()); @@ -185,7 +183,7 @@ unsigned long MeshGrid::Inside(const Base::BoundBox3f& rclBB, float fMaxDist, bool bDelDoubles) const { - unsigned long i, j, k, ulMinX, ulMinY, ulMinZ, ulMaxX, ulMaxY, ulMaxZ; + unsigned long ulMinX {}, ulMinY {}, ulMinZ {}, ulMaxX {}, ulMaxY {}, ulMaxZ {}; float fGridDiag = GetBoundBox(0, 0, 0).CalcDiagonalLength(); float fMinDistP2 = (fGridDiag * fGridDiag) + (fMaxDist * fMaxDist); @@ -195,9 +193,9 @@ unsigned long MeshGrid::Inside(const Base::BoundBox3f& rclBB, Position(Base::Vector3f(rclBB.MinX, rclBB.MinY, rclBB.MinZ), ulMinX, ulMinY, ulMinZ); Position(Base::Vector3f(rclBB.MaxX, rclBB.MaxY, rclBB.MaxZ), ulMaxX, ulMaxY, ulMaxZ); - for (i = ulMinX; i <= ulMaxX; i++) { - for (j = ulMinY; j <= ulMaxY; j++) { - for (k = ulMinZ; k <= ulMaxZ; k++) { + for (auto i = ulMinX; i <= ulMaxX; i++) { + for (auto j = ulMinY; j <= ulMaxY; j++) { + for (auto k = ulMinZ; k <= ulMaxZ; k++) { if (Base::DistanceP2(GetBoundBox(i, j, k).GetCenter(), rclOrg) < fMinDistP2) { raulElements.insert(raulElements.end(), _aulGrid[i][j][k].begin(), @@ -220,7 +218,7 @@ unsigned long MeshGrid::Inside(const Base::BoundBox3f& rclBB, unsigned long MeshGrid::Inside(const Base::BoundBox3f& rclBB, std::set& raulElements) const { - unsigned long i, j, k, ulMinX, ulMinY, ulMinZ, ulMaxX, ulMaxY, ulMaxZ; + unsigned long ulMinX {}, ulMinY {}, ulMinZ {}, ulMaxX {}, ulMaxY {}, ulMaxZ {}; raulElements.clear(); @@ -228,9 +226,9 @@ unsigned long MeshGrid::Inside(const Base::BoundBox3f& rclBB, Position(Base::Vector3f(rclBB.MinX, rclBB.MinY, rclBB.MinZ), ulMinX, ulMinY, ulMinZ); Position(Base::Vector3f(rclBB.MaxX, rclBB.MaxY, rclBB.MaxZ), ulMaxX, ulMaxY, ulMaxZ); - for (i = ulMinX; i <= ulMaxX; i++) { - for (j = ulMinY; j <= ulMaxY; j++) { - for (k = ulMinZ; k <= ulMaxZ; k++) { + for (auto i = ulMinX; i <= ulMaxX; i++) { + for (auto j = ulMinY; j <= ulMaxY; j++) { + for (auto k = ulMinZ; k <= ulMaxZ; k++) { raulElements.insert(_aulGrid[i][j][k].begin(), _aulGrid[i][j][k].end()); } } @@ -302,7 +300,7 @@ void MeshGrid::CalculateGridLength(unsigned long ulCtGrid, unsigned long ulMaxGr float fVolume = fLenX * fLenY * fLenZ; if (fVolume > 0.0f) { - float fVolElem; + float fVolElem {}; if (_ulCtElements > (ulMaxGrids * ulCtGrid)) { fVolElem = (fLenX * fLenY * fLenZ) / float(ulMaxGrids * ulCtGrid); } @@ -316,7 +314,7 @@ void MeshGrid::CalculateGridLength(unsigned long ulCtGrid, unsigned long ulMaxGr else { // Planar bounding box float fArea = fLenX * fLenY + fLenX * fLenZ + fLenY * fLenZ; - float fAreaElem; + float fAreaElem {}; if (_ulCtElements > (ulMaxGrids * ulCtGrid)) { fAreaElem = fArea / float(ulMaxGrids * ulCtGrid); } @@ -499,7 +497,7 @@ void MeshGrid::SearchNearestFromPoint(const Base::Vector3f& rclPt, Base::BoundBox3f clBB = GetBoundBox(); if (clBB.IsInBox(rclPt)) { // Point lies within - unsigned long ulX, ulY, ulZ; + unsigned long ulX {}, ulY {}, ulZ {}; Position(rclPt, ulX, ulY, ulZ); // int nX = ulX, nY = ulY, nZ = ulZ; unsigned long ulMaxLevel = @@ -605,11 +603,9 @@ void MeshGrid::GetHull(unsigned long ulX, int nY2 = std::min(int(_ulCtGridsY) - 1, int(ulY) + int(ulDistance)); int nZ2 = std::min(int(_ulCtGridsZ) - 1, int(ulZ) + int(ulDistance)); - int i, j; - // top plane - for (i = nX1; i <= nX2; i++) { - for (j = nY1; j <= nY2; j++) { + for (int i = nX1; i <= nX2; i++) { + for (int j = nY1; j <= nY2; j++) { GetElements(static_cast(i), static_cast(j), static_cast(nZ1), @@ -617,8 +613,8 @@ void MeshGrid::GetHull(unsigned long ulX, } } // bottom plane - for (i = nX1; i <= nX2; i++) { - for (j = nY1; j <= nY2; j++) { + for (int i = nX1; i <= nX2; i++) { + for (int j = nY1; j <= nY2; j++) { GetElements(static_cast(i), static_cast(j), static_cast(nZ2), @@ -626,8 +622,8 @@ void MeshGrid::GetHull(unsigned long ulX, } } // left plane - for (i = nY1; i <= nY2; i++) { - for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) { + for (int i = nY1; i <= nY2; i++) { + for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) { GetElements(static_cast(nX1), static_cast(i), static_cast(j), @@ -635,8 +631,8 @@ void MeshGrid::GetHull(unsigned long ulX, } } // right plane - for (i = nY1; i <= nY2; i++) { - for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) { + for (int i = nY1; i <= nY2; i++) { + for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) { GetElements(static_cast(nX2), static_cast(i), static_cast(j), @@ -644,8 +640,8 @@ void MeshGrid::GetHull(unsigned long ulX, } } // front plane - for (i = (nX1 + 1); i <= (nX2 - 1); i++) { - for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) { + for (int i = (nX1 + 1); i <= (nX2 - 1); i++) { + for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) { GetElements(static_cast(i), static_cast(nY1), static_cast(j), @@ -653,8 +649,8 @@ void MeshGrid::GetHull(unsigned long ulX, } } // back plane - for (i = (nX1 + 1); i <= (nX2 - 1); i++) { - for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) { + for (int i = (nX1 + 1); i <= (nX2 - 1); i++) { + for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) { GetElements(static_cast(i), static_cast(nY2), static_cast(j), @@ -680,7 +676,7 @@ unsigned long MeshGrid::GetElements(unsigned long ulX, unsigned long MeshGrid::GetElements(const Base::Vector3f& rclPoint, std::vector& aulFacets) const { - unsigned long ulX, ulY, ulZ; + unsigned long ulX {}, ulY {}, ulZ {}; if (!CheckPosition(rclPoint, ulX, ulY, ulZ)) { return 0; } @@ -724,7 +720,7 @@ bool MeshGrid::GetPositionToIndex(unsigned long id, MeshFacetGrid::MeshFacetGrid(const MeshKernel& rclM) : MeshGrid(rclM) { - RebuildGrid(); + MeshFacetGrid::RebuildGrid(); } MeshFacetGrid::MeshFacetGrid(const MeshKernel& rclM, int iCtGridPerAxis) @@ -820,7 +816,7 @@ unsigned long MeshFacetGrid::SearchNearestFromPoint(const Base::Vector3f& rclPt) Base::BoundBox3f clBB = GetBoundBox(); if (clBB.IsInBox(rclPt)) { // Point lies within - unsigned long ulX, ulY, ulZ; + unsigned long ulX {}, ulY {}, ulZ {}; Position(rclPt, ulX, ulY, ulZ); float fMinGridDist = std::min(std::min(_fGridLenX, _fGridLenY), _fGridLenZ); unsigned long ulDistance = 0; @@ -938,7 +934,7 @@ unsigned long MeshFacetGrid::SearchNearestFromPoint(const Base::Vector3f& rclPt, Inside(clBB, aulFacets, rclPt, fMaxSearchArea, true); for (ElementIndex facet : aulFacets) { - float fDist; + float fDist {}; if (clFTool.Distance(rclPt, facet, fMinDist, fDist)) { fMinDist = fDist; @@ -964,11 +960,9 @@ void MeshFacetGrid::SearchNearestFacetInHull(unsigned long ulX, int nY2 = std::min(int(_ulCtGridsY) - 1, int(ulY) + int(ulDistance)); int nZ2 = std::min(int(_ulCtGridsZ) - 1, int(ulZ) + int(ulDistance)); - int i, j; - // top plane - for (i = nX1; i <= nX2; i++) { - for (j = nY1; j <= nY2; j++) { + for (int i = nX1; i <= nX2; i++) { + for (int j = nY1; j <= nY2; j++) { SearchNearestFacetInGrid(static_cast(i), static_cast(j), static_cast(nZ1), @@ -978,8 +972,8 @@ void MeshFacetGrid::SearchNearestFacetInHull(unsigned long ulX, } } // bottom plane - for (i = nX1; i <= nX2; i++) { - for (j = nY1; j <= nY2; j++) { + for (int i = nX1; i <= nX2; i++) { + for (int j = nY1; j <= nY2; j++) { SearchNearestFacetInGrid(static_cast(i), static_cast(j), static_cast(nZ2), @@ -989,8 +983,8 @@ void MeshFacetGrid::SearchNearestFacetInHull(unsigned long ulX, } } // left plane - for (i = nY1; i <= nY2; i++) { - for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) { + for (int i = nY1; i <= nY2; i++) { + for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) { SearchNearestFacetInGrid(static_cast(nX1), static_cast(i), static_cast(j), @@ -1000,8 +994,8 @@ void MeshFacetGrid::SearchNearestFacetInHull(unsigned long ulX, } } // right plane - for (i = nY1; i <= nY2; i++) { - for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) { + for (int i = nY1; i <= nY2; i++) { + for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) { SearchNearestFacetInGrid(static_cast(nX2), static_cast(i), static_cast(j), @@ -1011,8 +1005,8 @@ void MeshFacetGrid::SearchNearestFacetInHull(unsigned long ulX, } } // front plane - for (i = (nX1 + 1); i <= (nX2 - 1); i++) { - for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) { + for (int i = (nX1 + 1); i <= (nX2 - 1); i++) { + for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) { SearchNearestFacetInGrid(static_cast(i), static_cast(nY1), static_cast(j), @@ -1022,8 +1016,8 @@ void MeshFacetGrid::SearchNearestFacetInHull(unsigned long ulX, } } // back plane - for (i = (nX1 + 1); i <= (nX2 - 1); i++) { - for (j = (nZ1 + 1); j <= (nZ2 - 1); j++) { + for (int i = (nX1 + 1); i <= (nX2 - 1); i++) { + for (int j = (nZ1 + 1); j <= (nZ2 - 1); j++) { SearchNearestFacetInGrid(static_cast(i), static_cast(nY2), static_cast(j), @@ -1056,7 +1050,7 @@ void MeshFacetGrid::SearchNearestFacetInGrid(unsigned long ulX, MeshPointGrid::MeshPointGrid(const MeshKernel& rclM) : MeshGrid(rclM) { - RebuildGrid(); + MeshPointGrid::RebuildGrid(); } MeshPointGrid::MeshPointGrid() @@ -1090,7 +1084,7 @@ MeshPointGrid::MeshPointGrid(const MeshKernel& rclM, float fGridLen) void MeshPointGrid::AddPoint(const MeshPoint& rclPt, ElementIndex ulPtIndex, float fEpsilon) { (void)fEpsilon; - unsigned long ulX, ulY, ulZ; + unsigned long ulX {}, ulY {}, ulZ {}; Pos(Base::Vector3f(rclPt.x, rclPt.y, rclPt.z), ulX, ulY, ulZ); if ((ulX < _ulCtGridsX) && (ulY < _ulCtGridsY) && (ulZ < _ulCtGridsZ)) { _aulGrid[ulX][ulY][ulZ].insert(ulPtIndex); @@ -1172,7 +1166,7 @@ void MeshPointGrid::Pos(const Base::Vector3f& rclPoint, unsigned long MeshPointGrid::FindElements(const Base::Vector3f& rclPoint, std::set& aulElements) const { - unsigned long ulX, ulY, ulZ; + unsigned long ulX {}, ulY {}, ulZ {}; Pos(rclPoint, ulX, ulY, ulZ); // check if the given point is inside the grid structure diff --git a/src/Mod/Mesh/App/Core/Grid.h b/src/Mod/Mesh/App/Core/Grid.h index ab9ebd5be9..631b3f8c30 100644 --- a/src/Mod/Mesh/App/Core/Grid.h +++ b/src/Mod/Mesh/App/Core/Grid.h @@ -61,6 +61,10 @@ protected: explicit MeshGrid(const MeshKernel& rclM); /// Construction MeshGrid(); + MeshGrid(const MeshGrid&) = default; + MeshGrid(MeshGrid&&) = default; + MeshGrid& operator=(const MeshGrid&) = default; + MeshGrid& operator=(MeshGrid&&) = default; //@} public: @@ -195,6 +199,7 @@ protected: virtual unsigned long HasElements() const = 0; protected: + // NOLINTBEGIN std::vector>>> _aulGrid; /**< Grid data structure. */ const MeshKernel* _pclMesh; /**< The mesh kernel. */ @@ -208,6 +213,7 @@ protected: float _fMinX; /**< Grid null position in x. */ float _fMinY; /**< Grid null position in y. */ float _fMinZ; /**< Grid null position in z. */ + // NOLINTEND // friends friend class MeshGridIterator; @@ -234,8 +240,12 @@ public: MeshFacetGrid(const MeshKernel& rclM, int iCtGridPerAxis); /// Construction MeshFacetGrid(const MeshKernel& rclM, float fGridLen); + MeshFacetGrid(const MeshFacetGrid&) = default; + MeshFacetGrid(MeshFacetGrid&&) = default; /// Destruction ~MeshFacetGrid() override = default; + MeshFacetGrid& operator=(const MeshFacetGrid&) = default; + MeshFacetGrid& operator=(MeshFacetGrid&&) = default; //@} /** @name Search */ @@ -314,8 +324,12 @@ public: MeshPointGrid(const MeshKernel& rclM, float fGridLen); /// Construction MeshPointGrid(const MeshKernel& rclM, unsigned long ulX, unsigned long ulY, unsigned long ulZ); + MeshPointGrid(const MeshPointGrid&) = default; + MeshPointGrid(MeshPointGrid&&) = default; /// Destruction ~MeshPointGrid() override = default; + MeshPointGrid& operator=(const MeshPointGrid&) = default; + MeshPointGrid& operator=(MeshPointGrid&&) = default; //@} /** Finds all points that lie in the same grid as the point \a rclPoint. */ @@ -427,6 +441,12 @@ public: } protected: + const MeshGrid& GetGrid() const + { + return _rclGrid; + } + +private: const MeshGrid& _rclGrid; /**< The mesh kernel. */ unsigned long _ulX {0}; /**< Number of grids in x. */ unsigned long _ulY {0}; /**< Number of grids in y. */ @@ -439,11 +459,10 @@ protected: struct GridElement { GridElement(unsigned long x, unsigned long y, unsigned long z) - { - this->x = x; - this->y = y; - this->z = z; - } + : x(x) + , y(y) + , z(z) + {} bool operator<(const GridElement& pos) const { if (x == pos.x) { @@ -470,7 +489,7 @@ protected: inline Base::BoundBox3f MeshGrid::GetBoundBox(unsigned long ulX, unsigned long ulY, unsigned long ulZ) const { - float fX, fY, fZ; + float fX {}, fY {}, fZ {}; fX = _fMinX + (float(ulX) * _fGridLenX); fY = _fMinY + (float(ulY) * _fGridLenY); @@ -558,9 +577,9 @@ inline void MeshFacetGrid::AddFacet(const MeshGeomFacet& rclFacet, ElementIndex ulFacetIndex, float /*fEpsilon*/) { - unsigned long ulX, ulY, ulZ; + unsigned long ulX {}, ulY {}, ulZ {}; - unsigned long ulX1, ulY1, ulZ1, ulX2, ulY2, ulZ2; + unsigned long ulX1 {}, ulY1 {}, ulZ1 {}, ulX2 {}, ulY2 {}, ulZ2 {}; Base::BoundBox3f clBB; diff --git a/src/Mod/Mesh/App/Core/Helpers.h b/src/Mod/Mesh/App/Core/Helpers.h index 0e7ab2f5bc..ac5e94c48e 100644 --- a/src/Mod/Mesh/App/Core/Helpers.h +++ b/src/Mod/Mesh/App/Core/Helpers.h @@ -50,7 +50,7 @@ struct MeshExport MeshHelpPoint } MeshPoint _clPt; - FacetIndex _ulInd; + FacetIndex _ulInd {FACET_INDEX_MAX}; }; /** @@ -170,7 +170,7 @@ inline bool MeshHelpBuilderEdge::operator!=(const MeshHelpBuilderEdge& rclObj) c inline void MeshEdgeBuilder::Add(PointIndex ulInd1, PointIndex ulInd2, FacetIndex ulSide, FacetIndex ulFInd) { - MeshHelpBuilderEdge clObj; + MeshHelpBuilderEdge clObj {}; clObj.Set(ulInd1, ulInd2, ulSide, ulFInd); push_back(clObj); } diff --git a/src/Mod/Mesh/App/Core/IO/ReaderOBJ.cpp b/src/Mod/Mesh/App/Core/IO/ReaderOBJ.cpp index 706442f87c..1cc2d45ef9 100644 --- a/src/Mod/Mesh/App/Core/IO/ReaderOBJ.cpp +++ b/src/Mod/Mesh/App/Core/IO/ReaderOBJ.cpp @@ -74,7 +74,7 @@ bool ReaderOBJ::Load(std::istream& str) MeshFacetArray meshFacets; std::string line; - float fX, fY, fZ; + float fX {}, fY {}, fZ {}; int i1 = 1, i2 = 1, i3 = 1, i4 = 1; MeshFacet item; diff --git a/src/Mod/Mesh/App/Core/IO/WriterOBJ.cpp b/src/Mod/Mesh/App/Core/IO/WriterOBJ.cpp index 6ae501772b..73908022bb 100644 --- a/src/Mod/Mesh/App/Core/IO/WriterOBJ.cpp +++ b/src/Mod/Mesh/App/Core/IO/WriterOBJ.cpp @@ -153,7 +153,7 @@ bool WriterOBJ::Save(std::ostream& out) } // Export normals MeshFacetIterator clIter(_kernel), clEnd(_kernel); - const MeshGeomFacet* pclFacet; + const MeshGeomFacet* pclFacet {}; clIter.Begin(); clEnd.End(); diff --git a/src/Mod/Mesh/App/Core/Info.cpp b/src/Mod/Mesh/App/Core/Info.cpp index 2269f567b5..1bde0af7a6 100644 --- a/src/Mod/Mesh/App/Core/Info.cpp +++ b/src/Mod/Mesh/App/Core/Info.cpp @@ -41,7 +41,7 @@ MeshInfo::MeshInfo(const MeshKernel& rclM) std::ostream& MeshInfo::GeneralInformation(std::ostream& rclStream) const { - unsigned long ulCtPt, ulCtEd, ulCtFc; + unsigned long ulCtPt {}, ulCtEd {}, ulCtFc {}; ulCtPt = _rclMesh.CountPoints(); ulCtFc = _rclMesh.CountFacets(); ulCtEd = _rclMesh.CountEdges(); @@ -126,7 +126,7 @@ std::ostream& MeshInfo::DetailedEdgeInfo(std::ostream& rclStream) const std::ostream& MeshInfo::DetailedFacetInfo(std::ostream& rclStream) const { // print facets - unsigned long i, j; + unsigned long i {}, j {}; rclStream << _rclMesh.CountFacets() << " Faces:" << std::endl; MeshFacetIterator pFIter(_rclMesh), pFEnd(_rclMesh); pFIter.Begin(); @@ -163,7 +163,7 @@ std::ostream& MeshInfo::DetailedInformation(std::ostream& rclStream) const std::ostream& MeshInfo::InternalPointInfo(std::ostream& rclStream) const { // print points - unsigned long i; + unsigned long i {}; rclStream << _rclMesh.CountPoints() << " Points:" << std::endl; MeshPointIterator pPIter(_rclMesh), pPEnd(_rclMesh); pPIter.Begin(); @@ -190,7 +190,7 @@ std::ostream& MeshInfo::InternalPointInfo(std::ostream& rclStream) const std::ostream& MeshInfo::InternalFacetInfo(std::ostream& rclStream) const { // print facets - unsigned long i; + unsigned long i {}; rclStream << _rclMesh.CountFacets() << " Faces:" << std::endl; const MeshFacetArray& rFacets = _rclMesh.GetFacets(); diff --git a/src/Mod/Mesh/App/Core/Info.h b/src/Mod/Mesh/App/Core/Info.h index 930c89a54e..9789596f8d 100644 --- a/src/Mod/Mesh/App/Core/Info.h +++ b/src/Mod/Mesh/App/Core/Info.h @@ -79,11 +79,15 @@ protected: std::ostream& InternalFacetInfo(std::ostream& rclStream) const; -protected: +private: const MeshKernel& _rclMesh; // const reference to mesh data structure public: MeshInfo() = delete; // not accessible default constructor + MeshInfo(const MeshInfo&) = delete; + MeshInfo(MeshInfo&&) = delete; + MeshInfo& operator=(const MeshInfo&) = delete; + MeshInfo& operator=(MeshInfo&&) = delete; }; diff --git a/src/Mod/Mesh/App/Core/Iterator.h b/src/Mod/Mesh/App/Core/Iterator.h index ec10a72bdd..607c861c6b 100644 --- a/src/Mod/Mesh/App/Core/Iterator.h +++ b/src/Mod/Mesh/App/Core/Iterator.h @@ -57,6 +57,8 @@ public: inline MeshFacetIterator(const MeshKernel& rclM, FacetIndex ulPos); /// construction inline MeshFacetIterator(const MeshFacetIterator& rclI); + inline MeshFacetIterator(MeshFacetIterator&& rclI); + ~MeshFacetIterator() = default; //@} /** @name Transformation */ @@ -105,6 +107,7 @@ public: } /// Assignment. inline MeshFacetIterator& operator=(const MeshFacetIterator& rpI); + inline MeshFacetIterator& operator=(MeshFacetIterator&& rpI); /// Compares if this iterator points to a lower element than the other one. bool operator<(const MeshFacetIterator& rclI) const { @@ -205,7 +208,7 @@ public: protected: inline const MeshGeomFacet& Dereference(); -protected: +private: const MeshKernel& _rclMesh; const MeshFacetArray& _rclFAry; const MeshPointArray& _rclPAry; @@ -230,6 +233,8 @@ public: inline explicit MeshPointIterator(const MeshKernel& rclM); inline MeshPointIterator(const MeshKernel& rclM, PointIndex ulPos); inline MeshPointIterator(const MeshPointIterator& rclI); + inline MeshPointIterator(MeshPointIterator&& rclI); + ~MeshPointIterator() = default; //@} /** @name Transformation */ @@ -266,6 +271,7 @@ public: } /// Assignment. inline MeshPointIterator& operator=(const MeshPointIterator& rpI); + inline MeshPointIterator& operator=(MeshPointIterator&& rpI); /// Compares if this iterator points to a lower element than the other one. bool operator<(const MeshPointIterator& rclI) const { @@ -345,10 +351,10 @@ public: } //@} -protected: +private: inline const MeshPoint& Dereference() const; -protected: +private: const MeshKernel& _rclMesh; const MeshPointArray& _rclPAry; mutable MeshPoint _clPoint; @@ -376,22 +382,22 @@ public: return _clIter != _rclFAry.end(); } - Base::Vector3f _afPoints[3]; + Base::Vector3f _afPoints[3]; // NOLINT -protected: - const MeshKernel& _rclMesh; +private: const MeshFacetArray& _rclFAry; const MeshPointArray& _rclPAry; MeshFacetArray::_TConstIterator _clIter; public: MeshFastFacetIterator(const MeshFastFacetIterator&) = delete; + MeshFastFacetIterator(MeshFastFacetIterator&&) = delete; void operator=(const MeshFastFacetIterator&) = delete; + void operator=(MeshFastFacetIterator&&) = delete; }; inline MeshFastFacetIterator::MeshFastFacetIterator(const MeshKernel& rclM) - : _rclMesh(rclM) - , _rclFAry(rclM._aclFacetArray) + : _rclFAry(rclM._aclFacetArray) , _rclPAry(rclM._aclPointArray) , _clIter(_rclFAry.begin()) {} @@ -430,6 +436,15 @@ inline MeshFacetIterator::MeshFacetIterator(const MeshFacetIterator& rclI) , _clTrf(rclI._clTrf) {} +inline MeshFacetIterator::MeshFacetIterator(MeshFacetIterator&& rclI) + : _rclMesh(rclI._rclMesh) + , _rclFAry(rclI._rclFAry) + , _rclPAry(rclI._rclPAry) + , _clIter(rclI._clIter) + , _bApply(rclI._bApply) + , _clTrf(rclI._clTrf) +{} + inline void MeshFacetIterator::Transform(const Base::Matrix4D& rclTrf) { _clTrf = rclTrf; @@ -477,6 +492,14 @@ inline MeshFacetIterator& MeshFacetIterator::operator=(const MeshFacetIterator& return *this; } +inline MeshFacetIterator& MeshFacetIterator::operator=(MeshFacetIterator&& rpI) +{ + _clIter = rpI._clIter; + _bApply = rpI._bApply; + _clTrf = rpI._clTrf; + return *this; +} + inline unsigned long MeshFacetIterator::GetProperty() const { return _clIter->_ulProp; @@ -542,6 +565,14 @@ inline MeshPointIterator::MeshPointIterator(const MeshPointIterator& rclI) , _clTrf(rclI._clTrf) {} +inline MeshPointIterator::MeshPointIterator(MeshPointIterator&& rclI) + : _rclMesh(rclI._rclMesh) + , _rclPAry(rclI._rclPAry) + , _clIter(rclI._clIter) + , _bApply(rclI._bApply) + , _clTrf(rclI._clTrf) +{} + inline void MeshPointIterator::Transform(const Base::Matrix4D& rclTrf) { _clTrf = rclTrf; @@ -580,6 +611,14 @@ inline MeshPointIterator& MeshPointIterator::operator=(const MeshPointIterator& return *this; } +inline MeshPointIterator& MeshPointIterator::operator=(MeshPointIterator&& rpI) +{ + _clIter = rpI._clIter; + _bApply = rpI._bApply; + _clTrf = rpI._clTrf; + return *this; +} + } // namespace MeshCore diff --git a/src/Mod/Mesh/App/Core/KDTree.h b/src/Mod/Mesh/App/Core/KDTree.h index 4116cf6915..41dec24dd9 100644 --- a/src/Mod/Mesh/App/Core/KDTree.h +++ b/src/Mod/Mesh/App/Core/KDTree.h @@ -51,13 +51,14 @@ public: PointIndex FindExact(const Base::Vector3f& p) const; void FindInRange(const Base::Vector3f&, float, std::vector&) const; + MeshKDTree(const MeshKDTree&) = delete; + MeshKDTree(MeshKDTree&&) = delete; + void operator=(const MeshKDTree&) = delete; + void operator=(MeshKDTree&&) = delete; + private: class Private; Private* d; - -public: - MeshKDTree(const MeshKDTree&) = delete; - void operator=(const MeshKDTree&) = delete; }; } // namespace MeshCore diff --git a/src/Mod/Mesh/App/Core/MeshIO.cpp b/src/Mod/Mesh/App/Core/MeshIO.cpp index 9f3319e2ad..81eb43b674 100644 --- a/src/Mod/Mesh/App/Core/MeshIO.cpp +++ b/src/Mod/Mesh/App/Core/MeshIO.cpp @@ -297,7 +297,7 @@ bool MeshInput::LoadSTL(std::istream& rstrIn) return false; } buf->pubseekoff(80, std::ios::beg, std::ios::in); - uint32_t ulCt, ulBytes = 50; + uint32_t ulCt {}, ulBytes = 50; rstrIn.read((char*)&ulCt, sizeof(ulCt)); // if we have a binary STL with a single triangle we can only read-in 50 bytes if (ulCt > 1) { @@ -393,7 +393,7 @@ bool MeshInput::LoadSMF(std::istream& rstrIn) MeshFacetArray meshFacets; std::string line; - float fX, fY, fZ; + float fX {}, fY {}, fZ {}; int i1 = 1, i2 = 1, i3 = 1; MeshFacet item; @@ -510,7 +510,7 @@ bool MeshInput::LoadOFF(std::istream& rstrIn) continue; // empty line } - float fX, fY, fZ; + float fX {}, fY {}, fZ {}; str >> fX >> std::ws >> fY >> std::ws >> fZ; if (str) { meshPoints.push_back(MeshPoint(Base::Vector3f(fX, fY, fZ))); @@ -519,7 +519,7 @@ bool MeshInput::LoadOFF(std::istream& rstrIn) if (colorPerVertex) { std::size_t pos = std::size_t(str.tellg()); if (line.size() > pos) { - float r, g, b, a; + float r {}, g {}, b {}, a {}; str >> std::ws >> r >> std::ws >> g >> std::ws >> b; if (str) { str >> std::ws >> a; @@ -552,7 +552,7 @@ bool MeshInput::LoadOFF(std::istream& rstrIn) if (str.eof()) { continue; // empty line } - int count, index; + int count {}, index {}; str >> count; if (count >= 3) { std::vector faces; @@ -572,7 +572,7 @@ bool MeshInput::LoadOFF(std::istream& rstrIn) std::size_t pos = std::size_t(str.tellg()); if (line.size() > pos) { - float r, g, b, a; + float r {}, g {}, b {}, a {}; str >> std::ws >> r >> std::ws >> g >> std::ws >> b; if (str) { str >> std::ws >> a; @@ -704,7 +704,7 @@ bool MeshInput::LoadPLY(std::istream& inp) str >> kw; if (kw == "format") { std::string format_string, version; - char space_format_string, space_format_version; + char space_format_string {}, space_format_version {}; str >> space_format_string >> std::ws >> format_string >> space_format_version >> std::ws >> version; if (/*!str || !str.eof() ||*/ @@ -731,8 +731,8 @@ bool MeshInput::LoadPLY(std::istream& inp) } else if (kw == "element") { std::string name; - std::size_t count; - char space_element_name, space_name_count; + std::size_t count {}; + char space_element_name {}, space_name_count {}; str >> space_element_name >> std::ws >> name >> space_name_count >> std::ws >> count; if (/*!str || !str.eof() ||*/ !std::isspace(space_element_name) || !std::isspace(space_name_count)) { @@ -754,11 +754,11 @@ bool MeshInput::LoadPLY(std::istream& inp) } else if (kw == "property") { std::string type, name; - char space; + char space {}; if (element == "vertex") { str >> space >> std::ws >> type >> space >> std::ws >> name >> std::ws; - Ply::Number number; + Ply::Number number {}; if (type == "char" || type == "int8") { number = int8; } @@ -803,7 +803,7 @@ bool MeshInput::LoadPLY(std::istream& inp) str >> name; } if (name != "vertex_indices" && name != "vertex_index") { - Number number; + Number number {}; if (type == "char" || type == "int8") { number = int8; } @@ -930,7 +930,7 @@ bool MeshInput::LoadPLY(std::istream& inp) case int16: case int32: { if (boost::regex_search(line, what, rx_s)) { - int v; + int v {}; v = boost::lexical_cast(what[1]); prop_values[it.first] = static_cast(v); line = line.substr(what[0].length()); @@ -943,7 +943,7 @@ bool MeshInput::LoadPLY(std::istream& inp) case uint16: case uint32: { if (boost::regex_search(line, what, rx_u)) { - int v; + int v {}; v = boost::lexical_cast(what[1]); prop_values[it.first] = static_cast(v); line = line.substr(what[0].length()); @@ -955,7 +955,7 @@ bool MeshInput::LoadPLY(std::istream& inp) case float32: case float64: { if (boost::regex_search(line, what, rx_d)) { - double v; + double v {}; v = boost::lexical_cast(what[1]); prop_values[it.first] = static_cast(v); line = line.substr(what[0].length()); @@ -983,7 +983,7 @@ bool MeshInput::LoadPLY(std::istream& inp) } } - int f1, f2, f3; + int f1 {}, f2 {}, f3 {}; for (std::size_t i = 0; i < f_count && std::getline(inp, line); i++) { if (boost::regex_search(line, what, rx_f)) { f1 = boost::lexical_cast(what[1]); @@ -1009,42 +1009,42 @@ bool MeshInput::LoadPLY(std::istream& inp) for (const auto& it : vertex_props) { switch (it.second) { case int8: { - int8_t v; + int8_t v {}; is >> v; prop_values[it.first] = static_cast(v); } break; case uint8: { - uint8_t v; + uint8_t v {}; is >> v; prop_values[it.first] = static_cast(v); } break; case int16: { - int16_t v; + int16_t v {}; is >> v; prop_values[it.first] = static_cast(v); } break; case uint16: { - uint16_t v; + uint16_t v {}; is >> v; prop_values[it.first] = static_cast(v); } break; case int32: { - int32_t v; + int32_t v {}; is >> v; prop_values[it.first] = static_cast(v); } break; case uint32: { - uint32_t v; + uint32_t v {}; is >> v; prop_values[it.first] = static_cast(v); } break; case float32: { - float v; + float v {}; is >> v; prop_values[it.first] = v; } break; case float64: { - double v; + double v {}; is >> v; prop_values[it.first] = static_cast(v); } break; @@ -1067,8 +1067,8 @@ bool MeshInput::LoadPLY(std::istream& inp) } } - unsigned char n; - uint32_t f1, f2, f3; + unsigned char n {}; + uint32_t f1 {}, f2 {}, f3 {}; for (std::size_t i = 0; i < f_count; i++) { is >> n; if (n == 3) { @@ -1079,39 +1079,39 @@ bool MeshInput::LoadPLY(std::istream& inp) for (auto it : face_props) { switch (it) { case int8: { - int8_t v; + int8_t v {}; is >> v; } break; case uint8: { - uint8_t v; + uint8_t v {}; is >> v; } break; case int16: { - int16_t v; + int16_t v {}; is >> v; } break; case uint16: { - uint16_t v; + uint16_t v {}; is >> v; } break; case int32: { - int32_t v; + int32_t v {}; is >> v; } break; case uint32: { - uint32_t v; + uint32_t v {}; is >> v; } break; case float32: { is >> n; - float v; + float v {}; for (unsigned char j = 0; j < n; j++) { is >> v; } } break; case float64: { is >> n; - double v; + double v {}; for (unsigned char j = 0; j < n; j++) { is >> v; } @@ -1151,7 +1151,7 @@ bool MeshInput::LoadMeshNode(std::istream& rstrIn) MeshFacetArray meshFacets; std::string line; - float fX, fY, fZ; + float fX {}, fY {}, fZ {}; unsigned int i1 = 1, i2 = 1, i3 = 1; MeshGeomFacet clFacet; @@ -1206,8 +1206,8 @@ bool MeshInput::LoadAsciiSTL(std::istream& rstrIn) boost::cmatch what; std::string line; - float fX, fY, fZ; - unsigned long ulVertexCt, ulFacetCt = 0; + float fX {}, fY {}, fZ {}; + unsigned long ulVertexCt {}, ulFacetCt {}; MeshGeomFacet clFacet; if (!rstrIn || rstrIn.bad()) { @@ -1296,7 +1296,7 @@ bool MeshInput::LoadBinarySTL(std::istream& rstrIn) std::streamoff ulSize = 0; std::streambuf* buf = rstrIn.rdbuf(); if (buf) { - std::streamoff ulCurr; + std::streamoff ulCurr {}; ulCurr = buf->pubseekoff(0, std::ios::cur, std::ios::in); ulSize = buf->pubseekoff(0, std::ios::end, std::ios::in); buf->pubseekoff(ulCurr, std::ios::beg, std::ios::in); @@ -1461,7 +1461,7 @@ bool MeshInput::LoadNastran(std::istream& rstrIn) MeshPointArray vVertices; MeshFacetArray vTriangle; - int index; + int index {}; std::map mNode; std::map mTria; std::map mQuad; @@ -2055,7 +2055,7 @@ bool MeshOutput::SaveAsciiSTL(std::ostream& rstrOut) const { MeshFacetIterator clIter(_rclMesh), clEnd(_rclMesh); clIter.Transform(this->_transform); - const MeshGeomFacet* pclFacet; + const MeshGeomFacet* pclFacet {}; if (!rstrOut || rstrOut.bad() || _rclMesh.CountFacets() == 0) { return false; @@ -2104,9 +2104,9 @@ bool MeshOutput::SaveBinarySTL(std::ostream& rstrOut) const { MeshFacetIterator clIter(_rclMesh), clEnd(_rclMesh); clIter.Transform(this->_transform); - const MeshGeomFacet* pclFacet; - uint32_t i; - uint16_t usAtt; + const MeshGeomFacet* pclFacet {}; + uint32_t i {}; + uint16_t usAtt {}; char szInfo[81]; if (!rstrOut || rstrOut.bad() /*|| _rclMesh.CountFacets() == 0*/) { @@ -2290,7 +2290,7 @@ bool MeshOutput::SaveAsymptote(std::ostream& out) const } std::size_t index = 0; - const MeshGeomFacet* pclFacet; + const MeshGeomFacet* pclFacet {}; while (clIter < clEnd) { pclFacet = &(*clIter); @@ -2468,7 +2468,7 @@ bool MeshOutput::SaveBinaryPLY(std::ostream& out) const } } unsigned char n = 3; - int f1, f2, f3; + int f1 {}, f2 {}, f3 {}; for (std::size_t i = 0; i < f_count; i++) { const MeshFacet& f = rFacets[i]; f1 = (int)f._aulPoints[0]; @@ -2543,7 +2543,7 @@ bool MeshOutput::SaveAsciiPLY(std::ostream& out) const } unsigned int n = 3; - int f1, f2, f3; + int f1 {}, f2 {}, f3 {}; for (std::size_t i = 0; i < f_count; i++) { const MeshFacet& f = rFacets[i]; f1 = (int)f._aulPoints[0]; @@ -2923,7 +2923,7 @@ bool MeshOutput::SaveX3DContent(std::ostream& out, bool exportViewpoints) const const Base::Vector3d& v = p.getPosition(); const Base::Rotation& r = p.getRotation(); Base::Vector3d axis; - double angle; + double angle {}; r.getValue(axis, angle); out << " supportedMeshFormats(); static MeshIO::Format getFormat(const char* FileName); -protected: +private: MeshKernel& _rclMesh; /**< reference to mesh data structure */ Material* _material; std::vector _groupNames; @@ -256,7 +256,7 @@ protected: /** Writes an X3D file. */ bool SaveX3DContent(std::ostream& rstrOut, bool exportViewpoints) const; -protected: +private: const MeshKernel& _rclMesh; /**< reference to mesh data structure */ const Material* _material; Base::Matrix4D _transform; diff --git a/src/Mod/Mesh/App/Core/MeshKernel.cpp b/src/Mod/Mesh/App/Core/MeshKernel.cpp index f760c75ad0..312cadca0d 100644 --- a/src/Mod/Mesh/App/Core/MeshKernel.cpp +++ b/src/Mod/Mesh/App/Core/MeshKernel.cpp @@ -54,6 +54,11 @@ MeshKernel::MeshKernel(const MeshKernel& rclMesh) *this = rclMesh; } +MeshKernel::MeshKernel(MeshKernel&& rclMesh) +{ + *this = rclMesh; +} + MeshKernel& MeshKernel::operator=(const MeshKernel& rclMesh) { if (this != &rclMesh) { // must be a different instance @@ -65,6 +70,17 @@ MeshKernel& MeshKernel::operator=(const MeshKernel& rclMesh) return *this; } +MeshKernel& MeshKernel::operator=(MeshKernel&& rclMesh) +{ + if (this != &rclMesh) { // must be a different instance + this->_aclPointArray = std::move(rclMesh._aclPointArray); + this->_aclFacetArray = std::move(rclMesh._aclFacetArray); + this->_clBoundBox = rclMesh._clBoundBox; + this->_bValid = rclMesh._bValid; + } + return *this; +} + MeshKernel& MeshKernel::operator=(const std::vector& rclFAry) { MeshBuilder builder(*this); @@ -441,7 +457,7 @@ void MeshKernel::Clear() bool MeshKernel::DeleteFacet(const MeshFacetIterator& rclIter) { - FacetIndex ulNFacet, ulInd; + FacetIndex ulNFacet {}, ulInd {}; if (rclIter._clIter >= _aclFacetArray.end()) { return false; @@ -539,7 +555,7 @@ bool MeshKernel::DeletePoint(const MeshPointIterator& rclIter) { MeshFacetIterator pFIter(*this), pFEnd(*this); std::vector clToDel; - PointIndex ulInd; + PointIndex ulInd {}; // index of the point to delete ulInd = rclIter._clIter - _aclPointArray.begin(); @@ -657,7 +673,7 @@ void MeshKernel::RemoveInvalids() { std::vector aulDecrements; std::vector::iterator pDIter; - unsigned long ulDec; + unsigned long ulDec {}; MeshPointArray::_TIterator pPIter, pPEnd; MeshFacetArray::_TIterator pFIter, pFEnd; @@ -784,7 +800,7 @@ std::vector MeshKernel::GetFacetPoints(const std::vector { std::vector points; for (FacetIndex it : facets) { - PointIndex p0, p1, p2; + PointIndex p0 {}, p1 {}, p2 {}; GetFacetPoints(it, p0, p1, p2); points.push_back(p0); points.push_back(p1); @@ -913,7 +929,7 @@ void MeshKernel::Read(std::istream& rclIn) Base::InputStream str(rclIn); // Read the header with a "magic number" and a version - uint32_t magic, version, swap_magic, swap_version; + uint32_t magic {}, version {}, swap_magic {}, swap_version {}; str >> magic >> version; swap_magic = magic; Base::SwapEndian(swap_magic); @@ -950,7 +966,7 @@ void MeshKernel::Read(std::istream& rclIn) MeshFacetArray facetArray; facetArray.resize(uCtFts); - uint32_t v1, v2, v3; + uint32_t v1 {}, v2 {}, v3 {}; for (auto& it : facetArray) { str >> v1 >> v2 >> v3; @@ -1048,11 +1064,11 @@ void MeshKernel::Read(std::istream& rclIn) for (auto& it : pointArray) { str >> it.x >> it.y >> it.z; } - uint32_t dummy; + uint32_t dummy {}; for (unsigned long i = 0; i < uCtEdges; i++) { str >> dummy; } - uint32_t v1, v2, v3; + uint32_t v1 {}, v2 {}, v3 {}; facetArray.resize(uCtFts); for (auto& it : facetArray) { str >> v1 >> v2 >> v3; @@ -1124,7 +1140,7 @@ std::vector MeshKernel::CalcVertexNormals() const normals.resize(CountPoints()); - PointIndex p1, p2, p3; + PointIndex p1 {}, p2 {}, p3 {}; unsigned int ct = CountFacets(); for (unsigned int pFIter = 0; pFIter < ct; pFIter++) { GetFacetPoints(pFIter, p1, p2, p3); diff --git a/src/Mod/Mesh/App/Core/MeshKernel.h b/src/Mod/Mesh/App/Core/MeshKernel.h index 390a1cf01d..003ee2a0e4 100644 --- a/src/Mod/Mesh/App/Core/MeshKernel.h +++ b/src/Mod/Mesh/App/Core/MeshKernel.h @@ -68,6 +68,7 @@ public: MeshKernel(); /// Construction MeshKernel(const MeshKernel& rclMesh); + MeshKernel(MeshKernel&& rclMesh); /// Destruction ~MeshKernel() { @@ -411,6 +412,7 @@ public: MeshKernel& operator=(const std::vector& rclFAry); /** Assignment operator. */ MeshKernel& operator=(const MeshKernel& rclMesh); + MeshKernel& operator=(MeshKernel&& rclMesh); /** This allows to assign the mesh structure directly. The caller must make sure that the point * indices are correctly set but the neighbourhood gets checked and corrected if \a * checkNeighbourHood is true. @@ -479,6 +481,7 @@ protected: /** Calculates the gravity point to the given facet. */ inline Base::Vector3f GetGravityPoint(const MeshFacet& rclFacet) const; +private: MeshPointArray _aclPointArray; /**< Holds the array of geometric points. */ MeshFacetArray _aclFacetArray; /**< Holds the array of facets. */ mutable Base::BoundBox3f _clBoundBox; /**< The current calculated bounding box. */ diff --git a/src/Mod/Mesh/App/Core/Segmentation.cpp b/src/Mod/Mesh/App/Core/Segmentation.cpp index dd4bde4e3b..9e30640d9f 100644 --- a/src/Mod/Mesh/App/Core/Segmentation.cpp +++ b/src/Mod/Mesh/App/Core/Segmentation.cpp @@ -203,10 +203,10 @@ std::vector PlaneSurfaceFit::Parameters() const // -------------------------------------------------------- CylinderSurfaceFit::CylinderSurfaceFit() - : fitter(new CylinderFit) + : radius(FLOAT_MAX) + , fitter(new CylinderFit) { axis.Set(0, 0, 0); - radius = FLOAT_MAX; } /*! @@ -311,10 +311,10 @@ std::vector CylinderSurfaceFit::Parameters() const // -------------------------------------------------------- SphereSurfaceFit::SphereSurfaceFit() - : fitter(new SphereFit) + : radius(FLOAT_MAX) + , fitter(new SphereFit) { center.Set(0, 0, 0); - radius = FLOAT_MAX; } SphereSurfaceFit::SphereSurfaceFit(const Base::Vector3f& c, float r) @@ -462,7 +462,7 @@ std::vector MeshDistanceGenericSurfaceFitSegment::Parameters() const bool MeshCurvaturePlanarSegment::TestFacet(const MeshFacet& rclFacet) const { for (PointIndex ptIndex : rclFacet._aulPoints) { - const CurvatureInfo& ci = info[ptIndex]; + const CurvatureInfo& ci = GetInfo(ptIndex); if (fabs(ci.fMinCurvature) > tolerance) { return false; } @@ -477,7 +477,7 @@ bool MeshCurvaturePlanarSegment::TestFacet(const MeshFacet& rclFacet) const bool MeshCurvatureCylindricalSegment::TestFacet(const MeshFacet& rclFacet) const { for (PointIndex ptIndex : rclFacet._aulPoints) { - const CurvatureInfo& ci = info[ptIndex]; + const CurvatureInfo& ci = GetInfo(ptIndex); float fMax = std::max(fabs(ci.fMaxCurvature), fabs(ci.fMinCurvature)); float fMin = std::min(fabs(ci.fMaxCurvature), fabs(ci.fMinCurvature)); if (fMin > toleranceMin) { @@ -494,11 +494,11 @@ bool MeshCurvatureCylindricalSegment::TestFacet(const MeshFacet& rclFacet) const bool MeshCurvatureSphericalSegment::TestFacet(const MeshFacet& rclFacet) const { for (PointIndex ptIndex : rclFacet._aulPoints) { - const CurvatureInfo& ci = info[ptIndex]; + const CurvatureInfo& ci = GetInfo(ptIndex); if (ci.fMaxCurvature * ci.fMinCurvature < 0) { return false; } - float diff; + float diff {}; diff = fabs(ci.fMinCurvature) - curvature; if (fabs(diff) > tolerance) { return false; @@ -515,7 +515,7 @@ bool MeshCurvatureSphericalSegment::TestFacet(const MeshFacet& rclFacet) const bool MeshCurvatureFreeformSegment::TestFacet(const MeshFacet& rclFacet) const { for (PointIndex ptIndex : rclFacet._aulPoints) { - const CurvatureInfo& ci = info[ptIndex]; + const CurvatureInfo& ci = GetInfo(ptIndex); if (fabs(ci.fMinCurvature - c2) > toleranceMin) { return false; } @@ -558,7 +558,7 @@ bool MeshSurfaceVisitor::Visit(const MeshFacet& face, void MeshSegmentAlgorithm::FindSegments(std::vector& segm) { // reset VISIT flags - FacetIndex startFacet; + FacetIndex startFacet {}; MeshCore::MeshAlgorithm cAlgo(myKernel); cAlgo.ResetFacetFlag(MeshCore::MeshFacet::VISIT); diff --git a/src/Mod/Mesh/App/Core/Segmentation.h b/src/Mod/Mesh/App/Core/Segmentation.h index ad7fe653e2..f02dc0eae5 100644 --- a/src/Mod/Mesh/App/Core/Segmentation.h +++ b/src/Mod/Mesh/App/Core/Segmentation.h @@ -47,6 +47,12 @@ public: : minFacets(minFacets) {} virtual ~MeshSurfaceSegment() = default; + + MeshSurfaceSegment(const MeshSurfaceSegment&) = delete; + MeshSurfaceSegment(MeshSurfaceSegment&&) = delete; + MeshSurfaceSegment& operator=(const MeshSurfaceSegment&) = delete; + MeshSurfaceSegment& operator=(MeshSurfaceSegment&&) = delete; + virtual bool TestFacet(const MeshFacet& rclFacet) const = 0; virtual const char* GetType() const = 0; virtual void Initialize(FacetIndex); @@ -59,7 +65,7 @@ public: } MeshSegment FindSegment(FacetIndex) const; -protected: +private: std::vector segments; unsigned long minFacets; }; @@ -77,8 +83,10 @@ public: {} protected: + // NOLINTBEGIN const MeshKernel& kernel; float tolerance; + // NOLINTEND }; class MeshExport MeshDistancePlanarSegment: public MeshDistanceSurfaceSegment @@ -86,6 +94,12 @@ class MeshExport MeshDistancePlanarSegment: public MeshDistanceSurfaceSegment public: MeshDistancePlanarSegment(const MeshKernel& mesh, unsigned long minFacets, float tol); ~MeshDistancePlanarSegment() override; + + MeshDistancePlanarSegment(const MeshDistancePlanarSegment&) = delete; + MeshDistancePlanarSegment(MeshDistancePlanarSegment&&) = delete; + MeshDistancePlanarSegment& operator=(const MeshDistancePlanarSegment&) = delete; + MeshDistancePlanarSegment& operator=(MeshDistancePlanarSegment&&) = delete; + bool TestFacet(const MeshFacet& rclFacet) const override; const char* GetType() const override { @@ -94,7 +108,7 @@ public: void Initialize(FacetIndex) override; void AddFacet(const MeshFacet& rclFacet) override; -protected: +private: Base::Vector3f basepoint; Base::Vector3f normal; PlaneFit* fitter; @@ -105,6 +119,12 @@ class MeshExport AbstractSurfaceFit public: AbstractSurfaceFit() = default; virtual ~AbstractSurfaceFit() = default; + + AbstractSurfaceFit(const AbstractSurfaceFit&) = delete; + AbstractSurfaceFit(AbstractSurfaceFit&&) = delete; + AbstractSurfaceFit& operator=(const AbstractSurfaceFit&) = delete; + AbstractSurfaceFit& operator=(AbstractSurfaceFit&&) = delete; + virtual const char* GetType() const = 0; virtual void Initialize(const MeshGeomFacet&) = 0; virtual bool TestTriangle(const MeshGeomFacet&) const = 0; @@ -121,6 +141,12 @@ public: PlaneSurfaceFit(); PlaneSurfaceFit(const Base::Vector3f& b, const Base::Vector3f& n); ~PlaneSurfaceFit() override; + + PlaneSurfaceFit(const PlaneSurfaceFit&) = delete; + PlaneSurfaceFit(PlaneSurfaceFit&&) = delete; + PlaneSurfaceFit& operator=(const PlaneSurfaceFit&) = delete; + PlaneSurfaceFit& operator=(PlaneSurfaceFit&&) = delete; + const char* GetType() const override { return "Plane"; @@ -145,6 +171,12 @@ public: CylinderSurfaceFit(); CylinderSurfaceFit(const Base::Vector3f& b, const Base::Vector3f& a, float r); ~CylinderSurfaceFit() override; + + CylinderSurfaceFit(const CylinderSurfaceFit&) = delete; + CylinderSurfaceFit(CylinderSurfaceFit&&) = delete; + CylinderSurfaceFit& operator=(const CylinderSurfaceFit&) = delete; + CylinderSurfaceFit& operator=(CylinderSurfaceFit&&) = delete; + const char* GetType() const override { return "Cylinder"; @@ -170,6 +202,12 @@ public: SphereSurfaceFit(); SphereSurfaceFit(const Base::Vector3f& c, float r); ~SphereSurfaceFit() override; + + SphereSurfaceFit(const SphereSurfaceFit&) = delete; + SphereSurfaceFit(SphereSurfaceFit&&) = delete; + SphereSurfaceFit& operator=(const SphereSurfaceFit&) = delete; + SphereSurfaceFit& operator=(SphereSurfaceFit&&) = delete; + const char* GetType() const override { return "Sphere"; @@ -196,6 +234,14 @@ public: unsigned long minFacets, float tol); ~MeshDistanceGenericSurfaceFitSegment() override; + + MeshDistanceGenericSurfaceFitSegment(const MeshDistanceGenericSurfaceFitSegment&) = delete; + MeshDistanceGenericSurfaceFitSegment(MeshDistanceGenericSurfaceFitSegment&&) = delete; + MeshDistanceGenericSurfaceFitSegment& + operator=(const MeshDistanceGenericSurfaceFitSegment&) = delete; + MeshDistanceGenericSurfaceFitSegment& + operator=(MeshDistanceGenericSurfaceFitSegment&&) = delete; + bool TestFacet(const MeshFacet& rclFacet) const override; const char* GetType() const override { @@ -206,7 +252,7 @@ public: void AddFacet(const MeshFacet& rclFacet) override; std::vector Parameters() const; -protected: +private: AbstractSurfaceFit* fitter; }; @@ -220,7 +266,12 @@ public: , info(ci) {} -protected: + const CurvatureInfo& GetInfo(std::size_t pos) const + { + return info.at(pos); + } + +private: const std::vector& info; }; @@ -252,11 +303,10 @@ public: float tolMax, float curv) : MeshCurvatureSurfaceSegment(ci, minFacets) + , curvature(curv) , toleranceMin(tolMin) , toleranceMax(tolMax) - { - curvature = curv; - } + {} bool TestFacet(const MeshFacet& rclFacet) const override; const char* GetType() const override { @@ -277,10 +327,9 @@ public: float tol, float curv) : MeshCurvatureSurfaceSegment(ci, minFacets) + , curvature(curv) , tolerance(tol) - { - curvature = curv; - } + {} bool TestFacet(const MeshFacet& rclFacet) const override; const char* GetType() const override { @@ -330,7 +379,7 @@ public: unsigned short neighbourIndex) override; bool Visit(const MeshFacet& face, const MeshFacet&, FacetIndex ulFInd, unsigned long) override; -protected: +private: std::vector& indices; MeshSurfaceSegment& segm; }; diff --git a/src/Mod/Mesh/App/Core/SetOperations.cpp b/src/Mod/Mesh/App/Core/SetOperations.cpp index 2819b18b81..064b4409e4 100644 --- a/src/Mod/Mesh/App/Core/SetOperations.cpp +++ b/src/Mod/Mesh/App/Core/SetOperations.cpp @@ -96,14 +96,13 @@ void SetOperations::Do() return; } - unsigned long i; - for (i = 0; i < _cutMesh0.CountFacets(); i++) { + for (auto i = 0UL; i < _cutMesh0.CountFacets(); i++) { if (facetsCuttingEdge0.find(i) == facetsCuttingEdge0.end()) { _newMeshFacets[0].push_back(_cutMesh0.GetFacet(i)); } } - for (i = 0; i < _cutMesh1.CountFacets(); i++) { + for (auto i = 0UL; i < _cutMesh1.CountFacets(); i++) { if (facetsCuttingEdge1.find(i) == facetsCuttingEdge1.end()) { _newMeshFacets[1].push_back(_cutMesh1.GetFacet(i)); } @@ -115,7 +114,7 @@ void SetOperations::Do() // Base::Sequencer().next(); TriangulateMesh(_cutMesh1, 1); - float mult0, mult1; + float mult0 {}, mult1 {}; switch (_operationType) { case Union: mult0 = -1.0f; @@ -178,15 +177,12 @@ void SetOperations::Cut(std::set& facetsCuttingEdge0, MeshFacetGrid grid1(_cutMesh0, 20); MeshFacetGrid grid2(_cutMesh1, 20); - unsigned long ctGx1, ctGy1, ctGz1; + unsigned long ctGx1 {}, ctGy1 {}, ctGz1 {}; grid1.GetCtGrids(ctGx1, ctGy1, ctGz1); - unsigned long gx1; - for (gx1 = 0; gx1 < ctGx1; gx1++) { - unsigned long gy1; - for (gy1 = 0; gy1 < ctGy1; gy1++) { - unsigned long gz1; - for (gz1 = 0; gz1 < ctGz1; gz1++) { + for (auto gx1 = 0UL; gx1 < ctGx1; gx1++) { + for (auto gy1 = 0UL; gy1 < ctGy1; gy1++) { + for (auto gz1 = 0UL; gz1 < ctGz1; gz1++) { if (grid1.GetCtElements(gx1, gy1, gz1) > 0) { std::vector vecFacets2; grid2.Inside(grid1.GetBoundBox(gx1, gy1, gz1), vecFacets2); @@ -213,8 +209,8 @@ void SetOperations::Cut(std::set& facetsCuttingEdge0, float minDist1 = _minDistanceToPoint, minDist2 = _minDistanceToPoint; MeshPoint np0 = p0, np1 = p1; - int i; - for (i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) // NOLINT + { float d1 = (f1._aclPoints[i] - p0).Length(); float d2 = (f1._aclPoints[i] - p1).Length(); if (d1 < minDist1) { @@ -228,7 +224,8 @@ void SetOperations::Cut(std::set& facetsCuttingEdge0, } // for (int i = 0; i < 3; i++) // optimize cut line if distance to nearest point is too small - for (i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) // NOLINT + { float d1 = (f2._aclPoints[i] - p0).Length(); float d2 = (f2._aclPoints[i] - p1).Length(); if (d1 < minDist1) { @@ -310,8 +307,8 @@ void SetOperations::TriangulateMesh(const MeshKernel& cutMesh, int side) // facet corner points // const MeshFacet& mf = cutMesh._aclFacetArray[fidx]; - int i; - for (i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) // NOLINT + { pointsSet.insert(f._aclPoints[i]); points.push_back(f._aclPoints[i]); } @@ -396,8 +393,7 @@ void SetOperations::TriangulateMesh(const MeshKernel& cutMesh, int side) } - int j; - for (j = 0; j < 3; j++) { + for (int j = 0; j < 3; j++) { std::map::iterator eit = _edges.find(Edge(facet._aclPoints[j], facet._aclPoints[(j + 1) % 3])); @@ -766,7 +762,7 @@ void MeshIntersection::connectLines(bool onlyclosed, // search for the next line on the begin/end of the polyline and add it std::list::iterator pFront, pEnd; - bool bFoundLine; + bool bFoundLine {}; do { float fFrontMin = fMinEps, fEndMin = fMinEps; bool bFrontFirst = false, bEndFirst = false; diff --git a/src/Mod/Mesh/App/Core/SetOperations.h b/src/Mod/Mesh/App/Core/SetOperations.h index bd7054fe4f..4c31f8cba5 100644 --- a/src/Mod/Mesh/App/Core/SetOperations.h +++ b/src/Mod/Mesh/App/Core/SetOperations.h @@ -76,7 +76,7 @@ public: */ void Do(); -protected: +private: const MeshKernel& _cutMesh0; /** Mesh for set operations source 1 */ const MeshKernel& _cutMesh1; /** Mesh for set operations source 2 */ MeshKernel& _resultMesh; /** Result mesh */ @@ -118,17 +118,9 @@ private: class EdgeInfo { public: - int fcounter[2]; // counter of facets attacted to the edge + int fcounter[2] {}; // counter of facets attacted to the edge MeshGeomFacet facets[2][2]; // Geom-Facets attached to the edge - FacetIndex facet[2]; // underlying Facet-Index - - EdgeInfo() - { - fcounter[0] = 0; - fcounter[1] = 0; - facet[0] = 0; - facet[1] = 0; - } + FacetIndex facet[2] {}; // underlying Facet-Index }; // class CollectFacetVisitor : public MeshFacetVisitor diff --git a/src/Mod/Mesh/App/Core/Smoothing.cpp b/src/Mod/Mesh/App/Core/Smoothing.cpp index ffeb67d757..9c6672e1ed 100644 --- a/src/Mod/Mesh/App/Core/Smoothing.cpp +++ b/src/Mod/Mesh/App/Core/Smoothing.cpp @@ -185,7 +185,7 @@ void LaplaceSmoothing::Umbrella(const MeshRefPointToPoints& vv_it, } size_t n_count = cv.size(); - double w; + double w {}; w = 1.0 / double(n_count); double delx = 0.0, dely = 0.0, delz = 0.0; @@ -222,7 +222,7 @@ void LaplaceSmoothing::Umbrella(const MeshRefPointToPoints& vv_it, } size_t n_count = cv.size(); - double w; + double w {}; w = 1.0 / double(n_count); double delx = 0.0, dely = 0.0, delz = 0.0; @@ -273,8 +273,8 @@ void TaubinSmoothing::Smooth(unsigned int iterations) // Theoretically Taubin does not shrink the surface iterations = (iterations + 1) / 2; // two steps per iteration for (unsigned int i = 0; i < iterations; i++) { - Umbrella(vv_it, vf_it, lambda); - Umbrella(vv_it, vf_it, -(lambda + micro)); + Umbrella(vv_it, vf_it, GetLambda()); + Umbrella(vv_it, vf_it, -(GetLambda() + micro)); } } @@ -287,8 +287,8 @@ void TaubinSmoothing::SmoothPoints(unsigned int iterations, // Theoretically Taubin does not shrink the surface iterations = (iterations + 1) / 2; // two steps per iteration for (unsigned int i = 0; i < iterations; i++) { - Umbrella(vv_it, vf_it, lambda, point_indices); - Umbrella(vv_it, vf_it, -(lambda + micro), point_indices); + Umbrella(vv_it, vf_it, GetLambda(), point_indices); + Umbrella(vv_it, vf_it, -(GetLambda() + micro), point_indices); } } diff --git a/src/Mod/Mesh/App/Core/Smoothing.h b/src/Mod/Mesh/App/Core/Smoothing.h index 05e60cc807..6f15ffad2a 100644 --- a/src/Mod/Mesh/App/Core/Smoothing.h +++ b/src/Mod/Mesh/App/Core/Smoothing.h @@ -56,6 +56,11 @@ public: explicit AbstractSmoothing(MeshKernel&); virtual ~AbstractSmoothing(); + AbstractSmoothing(const AbstractSmoothing&) = delete; + AbstractSmoothing(AbstractSmoothing&&) = delete; + AbstractSmoothing& operator=(const AbstractSmoothing&) = delete; + AbstractSmoothing& operator=(AbstractSmoothing&&) = delete; + void initialize(Component comp, Continuity cont); /** Smooth the triangle mesh. */ @@ -63,10 +68,12 @@ public: virtual void SmoothPoints(unsigned int, const std::vector&) = 0; protected: + // NOLINTBEGIN MeshKernel& kernel; Component component {Normal}; Continuity continuity {C0}; + // NOLINTEND }; class MeshExport PlaneFitSmoothing: public AbstractSmoothing @@ -94,6 +101,10 @@ public: { lambda = l; } + double GetLambda() const + { + return lambda; + } protected: void Umbrella(const MeshRefPointToPoints&, const MeshRefPointToFacets&, double); @@ -102,7 +113,7 @@ protected: double, const std::vector&); -protected: +private: double lambda {0.6307}; }; @@ -117,7 +128,7 @@ public: micro = m; } -protected: +private: double micro {0.0424}; }; diff --git a/src/Mod/Mesh/App/Core/SphereFit.cpp b/src/Mod/Mesh/App/Core/SphereFit.cpp index 310f1cca0c..c455192958 100644 --- a/src/Mod/Mesh/App/Core/SphereFit.cpp +++ b/src/Mod/Mesh/App/Core/SphereFit.cpp @@ -204,7 +204,7 @@ float SphereFit::Fit() Eigen::VectorXd atpl(4); // Iteration loop... - double sigma0; + double sigma0 {}; bool cont = true; while (cont && (_numIter < _maxIter)) { ++_numIter; @@ -228,7 +228,7 @@ float SphereFit::Fit() // Before updating the unknowns, compute the residuals and sigma0 and check the residual // convergence - bool vConverged; + bool vConverged {}; if (!computeResiduals(x, residuals, sigma0, _vConvLimit, vConverged)) { return FLOAT_MAX; } @@ -267,8 +267,8 @@ void SphereFit::setupNormalEquationMatrices(const std::vector& r // For each point, setup the observation equation coefficients and add their // contribution into the normal equation matrices - double a[4], b[3]; - double f0, qw; + double a[4] {}, b[3] {}; + double f0 {}, qw {}; std::vector::const_iterator vIt = residuals.begin(); std::list::const_iterator cIt; for (cIt = _vPoints.begin(); cIt != _vPoints.end(); ++cIt, ++vIt) { @@ -377,8 +377,8 @@ bool SphereFit::computeResiduals(const Eigen::VectorXd& x, vConverged = true; int nPtsUsed = 0; sigma0 = 0.0; - double a[4], b[3]; - double f0, qw; + double a[4] {}, b[3] {}; + double f0 {}, qw {}; // double maxdVx = 0.0; // double maxdVy = 0.0; // double maxdVz = 0.0; diff --git a/src/Mod/Mesh/App/Core/SphereFit.h b/src/Mod/Mesh/App/Core/SphereFit.h index f392c66226..5b44156789 100644 --- a/src/Mod/Mesh/App/Core/SphereFit.h +++ b/src/Mod/Mesh/App/Core/SphereFit.h @@ -128,7 +128,7 @@ protected: double vConvLimit, bool& vConverged) const; -protected: +private: Base::Vector3d _vCenter; /**< Center of sphere. */ double _dRadius {0}; /**< Radius of the sphere. */ int _numIter {0}; /**< Number of iterations for solution to converge. */ diff --git a/src/Mod/Mesh/App/Core/Tools.h b/src/Mod/Mesh/App/Core/Tools.h index 84eb95bbcc..17f6d790c2 100644 --- a/src/Mod/Mesh/App/Core/Tools.h +++ b/src/Mod/Mesh/App/Core/Tools.h @@ -89,7 +89,7 @@ protected: Base::Vector3f _clCenter; }; -protected: +private: const MeshKernel& _rclMesh; const MeshFacetArray& _rclFAry; const MeshPointArray& _rclPAry; @@ -102,11 +102,12 @@ protected: std::vector> _aclSampledFacets; // sample points from each facet float _fSampleDistance; // distance between two sampled points Wm4::Sphere3 _akSphere; - bool _bTooFewPoints {false}; public: MeshSearchNeighbours(const MeshSearchNeighbours&) = delete; + MeshSearchNeighbours(MeshSearchNeighbours&&) = delete; void operator=(const MeshSearchNeighbours&) = delete; + void operator=(MeshSearchNeighbours&&) = delete; }; inline bool MeshSearchNeighbours::CheckDistToFacet(const MeshFacet& rclF) @@ -177,7 +178,7 @@ public: Base::Vector3f operator()(PointIndex index) { it.Set(index); - return *it; + return Base::Vector3f(it->x, it->y, it->z); } private: @@ -206,8 +207,10 @@ public: } } + // NOLINTBEGIN Index nearest_index; float nearest_dist {FLOAT_MAX}; + // NOLINTEND private: T it; diff --git a/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp b/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp index f09ad7c596..8985138aa2 100644 --- a/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp +++ b/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp @@ -381,7 +381,7 @@ void MeshTopoAlgorithm::DelaunayFlip(float fMaxAngle) const MeshFacet& face_1 = _rclMesh._aclFacetArray[edge.first]; const MeshFacet& face_2 = _rclMesh._aclFacetArray[edge.second]; unsigned short side = face_2.Side(edge.first); - Base::Vector3f vertex = _rclMesh.GetPoint(face_2._aulPoints[(side + 1) % 3]); + MeshPoint vertex = _rclMesh.GetPoint(face_2._aulPoints[(side + 1) % 3]); if (Base::DistanceP2(center, vertex) < radius) { SwapEdge(edge.first, edge.second); for (int i = 0; i < 3; i++) { @@ -504,14 +504,14 @@ void MeshTopoAlgorithm::AdjustEdgesToCurvatureDirection() continue; } - PointIndex uPt3, uPt4; + PointIndex uPt3 {}, uPt4 {}; unsigned short side = rFace1.Side(uPt1, uPt2); uPt3 = rFace1._aulPoints[(side + 2) % 3]; side = rFace2.Side(uPt1, uPt2); uPt4 = rFace2._aulPoints[(side + 2) % 3]; Wm4::Vector3 dir; - float fActCurvature; + float fActCurvature {}; if (fabs(aMinCurv[uPt1]) > fabs(aMaxCurv[uPt1])) { fActCurvature = aMinCurv[uPt1]; dir = aMaxCurvDir[uPt1]; @@ -1838,7 +1838,7 @@ void MeshComponents::SearchForComponents(TMode tMode, const std::vector& aSegment, std::vector>& aclT) const { - FacetIndex ulStartFacet; + FacetIndex ulStartFacet {}; if (_rclMesh.CountFacets() == 0) { return; diff --git a/src/Mod/Mesh/App/Core/TopoAlgorithm.h b/src/Mod/Mesh/App/Core/TopoAlgorithm.h index 02d140ac23..108ff01917 100644 --- a/src/Mod/Mesh/App/Core/TopoAlgorithm.h +++ b/src/Mod/Mesh/App/Core/TopoAlgorithm.h @@ -50,6 +50,11 @@ public: explicit MeshTopoAlgorithm(MeshKernel& rclM); ~MeshTopoAlgorithm(); + MeshTopoAlgorithm(const MeshTopoAlgorithm&) = delete; + MeshTopoAlgorithm(MeshTopoAlgorithm&&) = delete; + MeshTopoAlgorithm& operator=(const MeshTopoAlgorithm&) = delete; + MeshTopoAlgorithm& operator=(MeshTopoAlgorithm&&) = delete; + public: /** @name Topological Operations */ //@{ @@ -360,7 +365,7 @@ protected: } }; -protected: +private: const MeshKernel& _rclMesh; }; diff --git a/src/Mod/Mesh/App/Core/Triangulation.cpp b/src/Mod/Mesh/App/Core/Triangulation.cpp index 20049971b3..11c6c144ca 100644 --- a/src/Mod/Mesh/App/Core/Triangulation.cpp +++ b/src/Mod/Mesh/App/Core/Triangulation.cpp @@ -74,10 +74,9 @@ bool TriangulationVerifierV2::MustFlip(const Base::Vector3f& n1, const Base::Vec // ---------------------------------------------------------------------------- AbstractPolygonTriangulator::AbstractPolygonTriangulator() -{ - _discard = false; - _verifier = new TriangulationVerifier(); -} + : _discard {false} + , _verifier {new TriangulationVerifier()} +{} AbstractPolygonTriangulator::~AbstractPolygonTriangulator() { @@ -358,8 +357,8 @@ bool EarClippingTriangulator::Triangulate::InsideTriangle(float Ax, float Px, float Py) { - float ax, ay, bx, by, cx, cy, apx, apy, bpx, bpy, cpx, cpy; - float cCROSSap, bCROSScp, aCROSSbp; + float ax {}, ay {}, bx {}, by {}, cx {}, cy {}, apx {}, apy {}, bpx {}, bpy {}, cpx {}, cpy {}; + float cCROSSap {}, bCROSScp {}, aCROSSbp {}; ax = Cx - Bx; ay = Cy - By; @@ -388,8 +387,8 @@ bool EarClippingTriangulator::Triangulate::Snip(const std::vector& raclPoints); void SetIndices(const std::vector& d) @@ -139,6 +149,7 @@ protected: void Done(); protected: + // NOLINTBEGIN bool _discard; Base::Matrix4D _inverse; std::vector _indices; @@ -148,6 +159,7 @@ protected: std::vector _facets; std::vector _info; TriangulationVerifier* _verifier; + // NOLINTEND }; /** diff --git a/src/Mod/Mesh/App/Core/Trim.cpp b/src/Mod/Mesh/App/Core/Trim.cpp index 00c1b58a4f..f48aa64bf0 100644 --- a/src/Mod/Mesh/App/Core/Trim.cpp +++ b/src/Mod/Mesh/App/Core/Trim.cpp @@ -165,7 +165,7 @@ bool MeshTrimming::PolygonContainsCompleteFacet(bool bInner, FacetIndex ulIndex) bool MeshTrimming::IsPolygonPointInFacet(FacetIndex ulIndex, Base::Vector3f& clPoint) { Base::Vector2d A, B, C, P; - float u, v, w, fDetPAC, fDetPBC, fDetPAB, fDetABC; + float u {}, v {}, w {}, fDetPAC {}, fDetPBC {}, fDetPAB {}, fDetABC {}; Base::Polygon2d clFacPoly; const MeshGeomFacet& rclFacet = myMesh.GetFacet(ulIndex); @@ -346,7 +346,7 @@ bool MeshTrimming::GetIntersectionPointsOfPolygonAndFacet( void MeshTrimming::AdjustFacet(MeshFacet& facet, int iInd) { - unsigned long tmp; + unsigned long tmp {}; if (iInd == 1) { tmp = facet._aulPoints[0]; @@ -774,7 +774,7 @@ void MeshTrimming::TrimFacets(const std::vector& raulFacets, { Base::Vector3f clP; std::vector clIntsct; - int iSide; + int iSide {}; Base::SequencerLauncher seq("trimming facets...", raulFacets.size()); for (FacetIndex index : raulFacets) { diff --git a/src/Mod/Mesh/App/Core/Visitor.cpp b/src/Mod/Mesh/App/Core/Visitor.cpp index 77927794fd..2c9992d3d1 100644 --- a/src/Mod/Mesh/App/Core/Visitor.cpp +++ b/src/Mod/Mesh/App/Core/Visitor.cpp @@ -34,7 +34,7 @@ using namespace MeshCore; unsigned long MeshKernel::VisitNeighbourFacets(MeshFacetVisitor& rclFVisitor, FacetIndex ulStartFacet) const { - unsigned long ulVisited = 0, j, ulLevel = 0; + unsigned long ulVisited = 0, ulLevel = 0; unsigned long ulCount = _aclFacetArray.size(); std::vector clCurrentLevel, clNextLevel; std::vector::iterator clCurrIter; @@ -52,7 +52,7 @@ unsigned long MeshKernel::VisitNeighbourFacets(MeshFacetVisitor& rclFVisitor, // visit all neighbours of the current level if not yet done for (unsigned short i = 0; i < 3; i++) { - j = clCurrFacet->_aulNeighbours[i]; // index to neighbour facet + auto j = clCurrFacet->_aulNeighbours[i]; // index to neighbour facet if (j == FACET_INDEX_MAX) { continue; // no neighbour facet } diff --git a/src/Mod/Mesh/App/Core/tritritest.h b/src/Mod/Mesh/App/Core/tritritest.h index ce65c67553..f92379a600 100644 --- a/src/Mod/Mesh/App/Core/tritritest.h +++ b/src/Mod/Mesh/App/Core/tritritest.h @@ -41,7 +41,7 @@ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHE OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - +//NOLINTBEGIN #include #define FABS(x) ((float)fabs(x)) /* implement as is fastest on your machine */ @@ -722,5 +722,5 @@ int tri_tri_intersect_with_isectline(float V0[3],float V1[3],float V2[3], } return 1; } - +//NOLINTEND // clang-format on diff --git a/src/Mod/Mesh/App/Edge.cpp b/src/Mod/Mesh/App/Edge.cpp index 1fa3ff4d75..35deaaf83d 100644 --- a/src/Mod/Mesh/App/Edge.cpp +++ b/src/Mod/Mesh/App/Edge.cpp @@ -40,7 +40,18 @@ Edge::Edge() // NOLINT } } -Edge::Edge(const Edge& e) +Edge::Edge(const Edge& e) // NOLINT + : MeshCore::MeshGeomEdge(e) + , Index(e.Index) + , Mesh(e.Mesh) +{ + for (int i = 0; i < 2; i++) { + PIndex[i] = e.PIndex[i]; + NIndex[i] = e.NIndex[i]; + } +} + +Edge::Edge(Edge&& e) // NOLINT : MeshCore::MeshGeomEdge(e) , Index(e.Index) , Mesh(e.Mesh) @@ -53,7 +64,7 @@ Edge::Edge(const Edge& e) Edge::~Edge() = default; -void Edge::operator=(const Edge& e) +Edge& Edge::operator=(const Edge& e) { MeshCore::MeshGeomEdge::operator=(e); Mesh = e.Mesh; @@ -62,6 +73,21 @@ void Edge::operator=(const Edge& e) PIndex[i] = e.PIndex[i]; NIndex[i] = e.NIndex[i]; } + + return *this; +} + +Edge& Edge::operator=(Edge&& e) +{ + MeshCore::MeshGeomEdge::operator=(e); + Mesh = e.Mesh; + Index = e.Index; + for (int i = 0; i < 2; i++) { + PIndex[i] = e.PIndex[i]; + NIndex[i] = e.NIndex[i]; + } + + return *this; } void Edge::unbound() diff --git a/src/Mod/Mesh/App/Edge.h b/src/Mod/Mesh/App/Edge.h index 27e7167160..dfc2cf8c33 100644 --- a/src/Mod/Mesh/App/Edge.h +++ b/src/Mod/Mesh/App/Edge.h @@ -43,6 +43,7 @@ class MeshExport Edge: public MeshCore::MeshGeomEdge public: Edge(); Edge(const Edge& f); + Edge(Edge&& f); ~Edge(); bool isBound() const @@ -50,7 +51,8 @@ public: return Index != -1; } void unbound(); - void operator=(const Edge& f); + Edge& operator=(const Edge& f); + Edge& operator=(Edge&& f); int Index {-1}; MeshCore::PointIndex PIndex[2]; diff --git a/src/Mod/Mesh/App/EdgePyImp.cpp b/src/Mod/Mesh/App/EdgePyImp.cpp index bfed97e7b6..a2bfd60669 100644 --- a/src/Mod/Mesh/App/EdgePyImp.cpp +++ b/src/Mod/Mesh/App/EdgePyImp.cpp @@ -26,11 +26,9 @@ #include #include -// clang-format off #include "Edge.h" #include "EdgePy.h" #include "EdgePy.cpp" -// clang-format on using namespace Mesh; @@ -125,7 +123,7 @@ PyObject* EdgePy::intersectWithEdge(PyObject* args) PyObject* EdgePy::isParallel(PyObject* args) { - PyObject* object; + PyObject* object {}; if (!PyArg_ParseTuple(args, "O!", &EdgePy::Type, &object)) { return nullptr; } @@ -138,7 +136,7 @@ PyObject* EdgePy::isParallel(PyObject* args) PyObject* EdgePy::isCollinear(PyObject* args) { - PyObject* object; + PyObject* object {}; if (!PyArg_ParseTuple(args, "O!", &EdgePy::Type, &object)) { return nullptr; } diff --git a/src/Mod/Mesh/App/Exporter.cpp b/src/Mod/Mesh/App/Exporter.cpp index 00f9a8f57a..f59c6395c8 100644 --- a/src/Mod/Mesh/App/Exporter.cpp +++ b/src/Mod/Mesh/App/Exporter.cpp @@ -28,8 +28,6 @@ #include #endif -#include "Core/IO/Writer3MF.h" -#include "Core/Iterator.h" #include #include #include @@ -40,6 +38,8 @@ #include #include #include +#include "Core/Iterator.h" +#include "Core/IO/Writer3MF.h" #include #include "Exporter.h" @@ -159,7 +159,7 @@ void Exporter::throwIfNoPermission(const std::string& filename) // ---------------------------------------------------------------------------- MergeExporter::MergeExporter(std::string fileName, MeshIO::Format) - : fName(fileName) + : fName(std::move(fileName)) {} MergeExporter::~MergeExporter() @@ -281,9 +281,9 @@ std::vector Extension3MFFactory::producer; class Exporter3MF::Private { public: - explicit Private(const std::string& filename, const std::vector& ext) + explicit Private(const std::string& filename, std::vector ext) : writer3mf(filename) - , ext(ext) + , ext(std::move(ext)) {} MeshCore::Writer3MF writer3mf; std::vector ext; @@ -428,7 +428,7 @@ bool ExporterAMF::addMesh(const char* name, const MeshObject& mesh) *outputStreamPtr << "\t\t\n" << "\t\t\t\n"; - const MeshCore::MeshGeomFacet* facet; + const MeshCore::MeshGeomFacet* facet {}; // Iterate through all facets of the mesh, and construct a: // * Cache (map) of used vertices, outputting each new unique vertex to diff --git a/src/Mod/Mesh/App/Exporter.h b/src/Mod/Mesh/App/Exporter.h index ad49921d2c..005fc5ed5b 100644 --- a/src/Mod/Mesh/App/Exporter.h +++ b/src/Mod/Mesh/App/Exporter.h @@ -27,9 +27,9 @@ #include #include -#include "Core/IO/Writer3MF.h" -#include "Core/MeshIO.h" #include "MeshFeature.h" +#include "Core/MeshIO.h" +#include "Core/IO/Writer3MF.h" namespace Mesh @@ -61,6 +61,11 @@ public: virtual bool addMesh(const char* name, const MeshObject& mesh) = 0; + Exporter(const Exporter&) = delete; + Exporter(Exporter&&) = delete; + Exporter& operator=(const Exporter&) = delete; + Exporter& operator=(Exporter&&) = delete; + protected: /// Does some simple escaping of characters for XML-type exports static std::string xmlEscape(const std::string& input); @@ -77,6 +82,11 @@ public: MergeExporter(std::string fileName, MeshCore::MeshIO::Format fmt); ~MergeExporter() override; + MergeExporter(const MergeExporter&) = delete; + MergeExporter(MergeExporter&&) = delete; + MergeExporter& operator=(const MergeExporter&) = delete; + MergeExporter& operator=(MergeExporter&&) = delete; + bool addMesh(const char* name, const MeshObject& mesh) override; private: @@ -84,8 +94,10 @@ private: void write(); protected: + // NOLINTBEGIN MeshObject mergingMesh; std::string fName; + // NOLINTEND }; // ------------------------------------------------------------------------------------------------ @@ -101,6 +113,11 @@ protected: public: virtual ~AbstractFormatExtension() = default; + + AbstractFormatExtension(const AbstractFormatExtension&) = delete; + AbstractFormatExtension(AbstractFormatExtension&&) = delete; + AbstractFormatExtension& operator=(const AbstractFormatExtension&) = delete; + AbstractFormatExtension& operator=(AbstractFormatExtension&&) = delete; }; using AbstractFormatExtensionPtr = std::shared_ptr; @@ -129,6 +146,11 @@ public: AbstractExtensionProducer() = default; virtual ~AbstractExtensionProducer() = default; virtual AbstractFormatExtensionPtr create() const = 0; + + AbstractExtensionProducer(const AbstractExtensionProducer&) = delete; + AbstractExtensionProducer(AbstractExtensionProducer&&) = delete; + AbstractExtensionProducer& operator=(const AbstractExtensionProducer&) = delete; + AbstractExtensionProducer& operator=(AbstractExtensionProducer&&) = delete; }; using AbstractExtensionProducerPtr = std::shared_ptr; @@ -186,6 +208,11 @@ public: Exporter3MF(std::string fileName, const std::vector& = {}); ~Exporter3MF() override; + Exporter3MF(const Exporter3MF&) = delete; + Exporter3MF(Exporter3MF&&) = delete; + Exporter3MF& operator=(const Exporter3MF&) = delete; + Exporter3MF& operator=(Exporter3MF&&) = delete; + bool addMesh(const char* name, const MeshObject& mesh) override; /*! * \brief SetForceModel @@ -222,6 +249,11 @@ public: /// Writes AMF footer ~ExporterAMF() override; + ExporterAMF(const ExporterAMF&) = delete; + ExporterAMF(ExporterAMF&&) = delete; + ExporterAMF& operator=(const ExporterAMF&) = delete; + ExporterAMF& operator=(ExporterAMF&&) = delete; + bool addMesh(const char* name, const MeshObject& mesh) override; private: diff --git a/src/Mod/Mesh/App/Facet.cpp b/src/Mod/Mesh/App/Facet.cpp index c4535f1edc..bcbf6f8c49 100644 --- a/src/Mod/Mesh/App/Facet.cpp +++ b/src/Mod/Mesh/App/Facet.cpp @@ -31,7 +31,9 @@ using namespace Mesh; -Facet::Facet(const MeshCore::MeshFacet& face, const MeshObject* obj, MeshCore::FacetIndex index) +Facet::Facet(const MeshCore::MeshFacet& face, // NOLINT + const MeshObject* obj, + MeshCore::FacetIndex index) : Index(index) , Mesh(obj) { @@ -47,7 +49,18 @@ Facet::Facet(const MeshCore::MeshFacet& face, const MeshObject* obj, MeshCore::F } } -Facet::Facet(const Facet& f) +Facet::Facet(const Facet& f) // NOLINT + : MeshCore::MeshGeomFacet(f) + , Index(f.Index) + , Mesh(f.Mesh) +{ + for (int i = 0; i < 3; i++) { + PIndex[i] = f.PIndex[i]; + NIndex[i] = f.NIndex[i]; + } +} + +Facet::Facet(Facet&& f) // NOLINT : MeshCore::MeshGeomFacet(f) , Index(f.Index) , Mesh(f.Mesh) @@ -60,7 +73,7 @@ Facet::Facet(const Facet& f) Facet::~Facet() = default; -void Facet::operator=(const Facet& f) +Facet& Facet::operator=(const Facet& f) { MeshCore::MeshGeomFacet::operator=(f); Mesh = f.Mesh; @@ -69,6 +82,21 @@ void Facet::operator=(const Facet& f) PIndex[i] = f.PIndex[i]; NIndex[i] = f.NIndex[i]; } + + return *this; +} + +Facet& Facet::operator=(Facet&& f) +{ + MeshCore::MeshGeomFacet::operator=(f); + Mesh = f.Mesh; + Index = f.Index; + for (int i = 0; i < 3; i++) { + PIndex[i] = f.PIndex[i]; + NIndex[i] = f.NIndex[i]; + } + + return *this; } Edge Facet::getEdge(int index) const diff --git a/src/Mod/Mesh/App/Facet.h b/src/Mod/Mesh/App/Facet.h index 2ca4ca038a..fd850fe0f8 100644 --- a/src/Mod/Mesh/App/Facet.h +++ b/src/Mod/Mesh/App/Facet.h @@ -43,13 +43,15 @@ public: const MeshObject* obj = nullptr, MeshCore::FacetIndex index = MeshCore::FACET_INDEX_MAX); Facet(const Facet& f); + Facet(Facet&& f); ~Facet(); bool isBound() const { return Index != MeshCore::FACET_INDEX_MAX; } - void operator=(const Facet& f); + Facet& operator=(const Facet& f); + Facet& operator=(Facet&& f); Edge getEdge(int) const; MeshCore::FacetIndex Index; diff --git a/src/Mod/Mesh/App/FacetPyImp.cpp b/src/Mod/Mesh/App/FacetPyImp.cpp index eb8ca46032..61d85a6e65 100644 --- a/src/Mod/Mesh/App/FacetPyImp.cpp +++ b/src/Mod/Mesh/App/FacetPyImp.cpp @@ -25,13 +25,11 @@ #include #include -// clang-format off #include "Facet.h" #include "FacetPy.h" #include "FacetPy.cpp" #include "EdgePy.h" #include "Mesh.h" -// clang-format on using namespace Mesh; diff --git a/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp b/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp index 7ba08f5c84..a764763d0c 100644 --- a/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp +++ b/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp @@ -69,7 +69,7 @@ App::DocumentObjectExecReturn* SetOperations::execute() std::unique_ptr pcKernel(new MeshObject()); // Result Meshkernel - MeshCore::SetOperations::OperationType type; + MeshCore::SetOperations::OperationType type {}; string ot(OperationType.getValue()); if (ot == "union") { type = MeshCore::SetOperations::Union; diff --git a/src/Mod/Mesh/App/Mesh.cpp b/src/Mod/Mesh/App/Mesh.cpp index 65e65dd4aa..6c3df65f05 100644 --- a/src/Mod/Mesh/App/Mesh.cpp +++ b/src/Mod/Mesh/App/Mesh.cpp @@ -63,13 +63,13 @@ TYPESYSTEM_SOURCE(Mesh::MeshSegment, Data::Segment) MeshObject::MeshObject() = default; -MeshObject::MeshObject(const MeshCore::MeshKernel& Kernel) +MeshObject::MeshObject(const MeshCore::MeshKernel& Kernel) // NOLINT : _kernel(Kernel) { // copy the mesh structure } -MeshObject::MeshObject(const MeshCore::MeshKernel& Kernel, const Base::Matrix4D& Mtrx) +MeshObject::MeshObject(const MeshCore::MeshKernel& Kernel, const Base::Matrix4D& Mtrx) // NOLINT : _Mtrx(Mtrx) , _kernel(Kernel) { @@ -84,6 +84,14 @@ MeshObject::MeshObject(const MeshObject& mesh) copySegments(mesh); } +MeshObject::MeshObject(MeshObject&& mesh) + : _Mtrx(mesh._Mtrx) + , _kernel(mesh._kernel) +{ + // copy the mesh structure + copySegments(mesh); +} + MeshObject::~MeshObject() = default; std::vector MeshObject::getElementTypes() const @@ -207,7 +215,7 @@ void MeshObject::swapSegments(MeshObject& mesh) }); } -void MeshObject::operator=(const MeshObject& mesh) +MeshObject& MeshObject::operator=(const MeshObject& mesh) { if (this != &mesh) { // copy the mesh structure @@ -215,6 +223,20 @@ void MeshObject::operator=(const MeshObject& mesh) this->_kernel = mesh._kernel; copySegments(mesh); } + + return *this; +} + +MeshObject& MeshObject::operator=(MeshObject&& mesh) +{ + if (this != &mesh) { + // copy the mesh structure + setTransform(mesh._Mtrx); + this->_kernel = mesh._kernel; + copySegments(mesh); + } + + return *this; } void MeshObject::setKernel(const MeshCore::MeshKernel& m) @@ -294,7 +316,7 @@ double MeshObject::getVolume() const Base::Vector3d MeshObject::getPoint(PointIndex index) const { - Base::Vector3f vertf = _kernel.GetPoint(index); + MeshCore::MeshPoint vertf = _kernel.GetPoint(index); Base::Vector3d vertd(vertf.x, vertf.y, vertf.z); vertd = _Mtrx * vertd; return vertd; @@ -337,7 +359,7 @@ void MeshObject::getFaces(std::vector& Points, const MeshCore::MeshFacetArray& ary = _kernel.GetFacets(); Topo.reserve(ctfacets); for (unsigned long i = 0; i < ctfacets; i++) { - Facet face; + Facet face {}; face.I1 = (unsigned int)ary[i]._aulPoints[0]; face.I2 = (unsigned int)ary[i]._aulPoints[1]; face.I3 = (unsigned int)ary[i]._aulPoints[2]; @@ -1002,7 +1024,7 @@ void MeshObject::offsetSpecial(float fSize, float zmax, float zmin) // go through all the vertex normals for (std::vector::iterator It = normals.begin(); It != normals.end(); ++It, i++) { - Base::Vector3f Pnt = _kernel.GetPoint(i); + auto Pnt = _kernel.GetPoint(i); if (Pnt.z < zmax && Pnt.z > zmin) { Pnt.z = 0; _kernel.MovePoint(i, Pnt.Normalize() * fSize); @@ -1116,7 +1138,7 @@ void MeshObject::cut(const Base::Polygon2d& polygon2d, MeshCore::MeshAlgorithm meshAlg(kernel); std::vector check; - bool inner; + bool inner {}; switch (type) { case INNER: inner = true; @@ -2124,11 +2146,17 @@ MeshObject::const_point_iterator::const_point_iterator(const MeshObject* mesh, P MeshObject::const_point_iterator::const_point_iterator(const MeshObject::const_point_iterator& fi) = default; +MeshObject::const_point_iterator::const_point_iterator(MeshObject::const_point_iterator&& fi) = + default; + MeshObject::const_point_iterator::~const_point_iterator() = default; MeshObject::const_point_iterator& MeshObject::const_point_iterator::operator=(const MeshObject::const_point_iterator& pi) = default; +MeshObject::const_point_iterator& +MeshObject::const_point_iterator::operator=(MeshObject::const_point_iterator&& pi) = default; + void MeshObject::const_point_iterator::dereference() { this->_point.x = _p_it->x; @@ -2185,11 +2213,17 @@ MeshObject::const_facet_iterator::const_facet_iterator(const MeshObject* mesh, F MeshObject::const_facet_iterator::const_facet_iterator(const MeshObject::const_facet_iterator& fi) = default; +MeshObject::const_facet_iterator::const_facet_iterator(MeshObject::const_facet_iterator&& fi) = + default; + MeshObject::const_facet_iterator::~const_facet_iterator() = default; MeshObject::const_facet_iterator& MeshObject::const_facet_iterator::operator=(const MeshObject::const_facet_iterator& fi) = default; +MeshObject::const_facet_iterator& +MeshObject::const_facet_iterator::operator=(MeshObject::const_facet_iterator&& fi) = default; + void MeshObject::const_facet_iterator::dereference() { this->_facet.MeshCore::MeshGeomFacet::operator=(*_f_it); diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h index 3e68073de8..66bbb678c3 100644 --- a/src/Mod/Mesh/App/Mesh.h +++ b/src/Mod/Mesh/App/Mesh.h @@ -114,9 +114,11 @@ public: explicit MeshObject(const MeshCore::MeshKernel& Kernel); explicit MeshObject(const MeshCore::MeshKernel& Kernel, const Base::Matrix4D& Mtrx); MeshObject(const MeshObject&); + MeshObject(MeshObject&&); ~MeshObject() override; - void operator=(const MeshObject&); + MeshObject& operator=(const MeshObject&); + MeshObject& operator=(MeshObject&&); /** @name Subelement management */ //@{ @@ -380,9 +382,11 @@ public: public: const_point_iterator(const MeshObject*, PointIndex index); const_point_iterator(const const_point_iterator& pi); + const_point_iterator(const_point_iterator&& pi); ~const_point_iterator(); const_point_iterator& operator=(const const_point_iterator& fi); + const_point_iterator& operator=(const_point_iterator&& fi); const MeshPoint& operator*(); const MeshPoint* operator->(); bool operator==(const const_point_iterator& fi) const; @@ -402,9 +406,11 @@ public: public: const_facet_iterator(const MeshObject*, FacetIndex index); const_facet_iterator(const const_facet_iterator& fi); + const_facet_iterator(const_facet_iterator&& fi); ~const_facet_iterator(); const_facet_iterator& operator=(const const_facet_iterator& fi); + const_facet_iterator& operator=(const_facet_iterator&& fi); Mesh::Facet& operator*(); Mesh::Facet* operator->(); bool operator==(const const_facet_iterator& fi) const; diff --git a/src/Mod/Mesh/App/MeshPointPyImp.cpp b/src/Mod/Mesh/App/MeshPointPyImp.cpp index 966483c7f3..00f0509655 100644 --- a/src/Mod/Mesh/App/MeshPointPyImp.cpp +++ b/src/Mod/Mesh/App/MeshPointPyImp.cpp @@ -41,7 +41,7 @@ using namespace Mesh; std::string MeshPointPy::representation() const { MeshPointPy::PointerType ptr = getMeshPointPtr(); - Base::Vector3d vec = *ptr; + Base::Vector3d vec = *ptr; // NOLINT std::stringstream str; str << "MeshPoint ("; diff --git a/src/Mod/Mesh/App/MeshProperties.cpp b/src/Mod/Mesh/App/MeshProperties.cpp index 761827f579..bcfa6cbb87 100644 --- a/src/Mod/Mesh/App/MeshProperties.cpp +++ b/src/Mod/Mesh/App/MeshProperties.cpp @@ -30,11 +30,11 @@ #include #include "Core/Iterator.h" -#include "Core/MeshIO.h" #include "Core/MeshKernel.h" +#include "Core/MeshIO.h" -#include "Mesh.h" #include "MeshProperties.h" +#include "Mesh.h" #include "MeshPy.h" @@ -645,7 +645,7 @@ void PropertyMaterial::RestoreDocFile(Base::Reader& reader) str >> count; color.resize(count); for (auto& it : color) { - uint32_t value; // must be 32 bit long + uint32_t value {}; // must be 32 bit long str >> value; it.setPackedValue(value); } @@ -656,7 +656,7 @@ void PropertyMaterial::RestoreDocFile(Base::Reader& reader) str >> count; value.resize(count); for (auto& it : value) { - float valueF; + float valueF {}; str >> valueF; it = valueF; } diff --git a/src/Mod/Mesh/App/MeshProperties.h b/src/Mod/Mesh/App/MeshProperties.h index 123312e8e7..d30048f24f 100644 --- a/src/Mod/Mesh/App/MeshProperties.h +++ b/src/Mod/Mesh/App/MeshProperties.h @@ -100,8 +100,10 @@ private: /** Curvature information. */ struct MeshExport CurvatureInfo { - float fMaxCurvature, fMinCurvature; - Base::Vector3f cMaxCurvDir, cMinCurvDir; + float fMaxCurvature {0.0F}; + float fMinCurvature {0.0F}; + Base::Vector3f cMaxCurvDir; + Base::Vector3f cMinCurvDir; }; /** The Curvature property class. @@ -236,6 +238,11 @@ public: PropertyMeshKernel(); ~PropertyMeshKernel() override; + PropertyMeshKernel(const PropertyMeshKernel&) = delete; + PropertyMeshKernel(PropertyMeshKernel&&) = delete; + PropertyMeshKernel& operator=(const PropertyMeshKernel&) = delete; + PropertyMeshKernel& operator=(PropertyMeshKernel&&) = delete; + /** @name Getter/setter */ //@{ /** This method references the passed mesh object and takes possession of it, diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp index 7fb3bfdae0..7082c2ef30 100644 --- a/src/Mod/Mesh/App/MeshPyImp.cpp +++ b/src/Mod/Mesh/App/MeshPyImp.cpp @@ -37,14 +37,12 @@ #include "Core/Smoothing.h" #include "Core/Triangulation.h" -// clang-format off #include "Mesh.h" #include "MeshPy.h" #include "MeshPointPy.h" #include "FacetPy.h" #include "MeshPy.cpp" #include "MeshProperties.h" -// clang-format on using namespace Mesh; @@ -150,7 +148,7 @@ PyObject* MeshPy::copy(PyObject* args) PyObject* MeshPy::read(PyObject* args, PyObject* kwds) { - char* Name; + char* Name {}; static const std::array keywords_path {"Filename", nullptr}; if (Base::Wrapped_ParseTupleAndKeywords(args, kwds, "et", keywords_path, "utf-8", &Name)) { getMeshObjectPtr()->load(Name); @@ -180,8 +178,8 @@ PyObject* MeshPy::read(PyObject* args, PyObject* kwds) ext["APLY"] = MeshCore::MeshIO::APLY; ext["PY"] = MeshCore::MeshIO::PY; - PyObject* input; - char* Ext; + PyObject* input {}; + char* Ext {}; static const std::array keywords_stream {"Stream", "Format", nullptr}; if (Base::Wrapped_ParseTupleAndKeywords(args, kwds, "Os", keywords_stream, &input, &Ext)) { std::string fmt(Ext); @@ -205,7 +203,7 @@ PyObject* MeshPy::read(PyObject* args, PyObject* kwds) PyObject* MeshPy::write(PyObject* args, PyObject* kwds) { - char* Name; + char* Name = nullptr; char* Ext = nullptr; char* ObjName = nullptr; PyObject* List = nullptr; @@ -360,7 +358,7 @@ PyObject* MeshPy::writeInventor(PyObject* args) PyObject* MeshPy::offset(PyObject* args) { - float Float; + float Float {}; if (!PyArg_ParseTuple(args, "f", &Float)) { return nullptr; } @@ -376,7 +374,7 @@ PyObject* MeshPy::offset(PyObject* args) PyObject* MeshPy::offsetSpecial(PyObject* args) { - float Float, zmin, zmax; + float Float {}, zmin {}, zmax {}; if (!PyArg_ParseTuple(args, "fff", &Float, &zmin, &zmax)) { return nullptr; } @@ -392,7 +390,7 @@ PyObject* MeshPy::offsetSpecial(PyObject* args) PyObject* MeshPy::crossSections(PyObject* args) { - PyObject* obj; + PyObject* obj {}; PyObject* poly = Py_False; float min_eps = 1.0e-2f; if (!PyArg_ParseTuple(args, "O|fO!", &obj, &min_eps, &PyBool_Type, &poly)) { @@ -454,8 +452,8 @@ PyObject* MeshPy::crossSections(PyObject* args) PyObject* MeshPy::unite(PyObject* args) { - MeshPy* pcObject; - PyObject* pcObj; + MeshPy* pcObject {}; + PyObject* pcObj {}; if (!PyArg_ParseTuple(args, "O!", &(MeshPy::Type), &pcObj)) { return nullptr; } @@ -474,8 +472,8 @@ PyObject* MeshPy::unite(PyObject* args) PyObject* MeshPy::intersect(PyObject* args) { - MeshPy* pcObject; - PyObject* pcObj; + MeshPy* pcObject {}; + PyObject* pcObj {}; if (!PyArg_ParseTuple(args, "O!", &(MeshPy::Type), &pcObj)) { return nullptr; } @@ -494,8 +492,8 @@ PyObject* MeshPy::intersect(PyObject* args) PyObject* MeshPy::difference(PyObject* args) { - MeshPy* pcObject; - PyObject* pcObj; + MeshPy* pcObject {}; + PyObject* pcObj {}; if (!PyArg_ParseTuple(args, "O!", &(MeshPy::Type), &pcObj)) { return nullptr; } @@ -514,8 +512,8 @@ PyObject* MeshPy::difference(PyObject* args) PyObject* MeshPy::inner(PyObject* args) { - MeshPy* pcObject; - PyObject* pcObj; + MeshPy* pcObject {}; + PyObject* pcObj {}; if (!PyArg_ParseTuple(args, "O!", &(MeshPy::Type), &pcObj)) { return nullptr; } @@ -534,8 +532,8 @@ PyObject* MeshPy::inner(PyObject* args) PyObject* MeshPy::outer(PyObject* args) { - MeshPy* pcObject; - PyObject* pcObj; + MeshPy* pcObject {}; + PyObject* pcObj {}; if (!PyArg_ParseTuple(args, "O!", &(MeshPy::Type), &pcObj)) { return nullptr; } @@ -554,7 +552,7 @@ PyObject* MeshPy::outer(PyObject* args) PyObject* MeshPy::section(PyObject* args, PyObject* kwds) { - PyObject* pcObj; + PyObject* pcObj {}; PyObject* connectLines = Py_True; float fMinDist = 0.0001f; @@ -603,7 +601,7 @@ PyObject* MeshPy::coarsen(PyObject* args) PyObject* MeshPy::translate(PyObject* args) { - float x, y, z; + float x {}, y {}, z {}; if (!PyArg_ParseTuple(args, "fff", &x, &y, &z)) { return nullptr; } @@ -621,7 +619,7 @@ PyObject* MeshPy::translate(PyObject* args) PyObject* MeshPy::rotate(PyObject* args) { - double x, y, z; + double x {}, y {}, z {}; if (!PyArg_ParseTuple(args, "ddd", &x, &y, &z)) { return nullptr; } @@ -641,7 +639,7 @@ PyObject* MeshPy::rotate(PyObject* args) PyObject* MeshPy::transform(PyObject* args) { - PyObject* mat; + PyObject* mat {}; if (!PyArg_ParseTuple(args, "O!", &(Base::MatrixPy::Type), &mat)) { return nullptr; } @@ -679,7 +677,7 @@ PyObject* MeshPy::getEigenSystem(PyObject* args) PyObject* MeshPy::addFacet(PyObject* args) { - double x1, y1, z1, x2, y2, z2, x3, y3, z3; + double x1 {}, y1 {}, z1 {}, x2 {}, y2 {}, z2 {}, x3 {}, y3 {}, z3 {}; if (PyArg_ParseTuple(args, "ddddddddd", &x1, &y1, &z1, &x2, &y2, &z2, &x3, &y3, &z3)) { getMeshObjectPtr()->addFacet( MeshCore::MeshGeomFacet(Base::Vector3f((float)x1, (float)y1, (float)z1), @@ -689,7 +687,7 @@ PyObject* MeshPy::addFacet(PyObject* args) } PyErr_Clear(); - PyObject *v1, *v2, *v3; + PyObject *v1 {}, *v2 {}, *v3 {}; if (PyArg_ParseTuple(args, "O!O!O!", &(Base::VectorPy::Type), @@ -709,7 +707,7 @@ PyObject* MeshPy::addFacet(PyObject* args) } PyErr_Clear(); - PyObject* f; + PyObject* f {}; if (PyArg_ParseTuple(args, "O!", &(Mesh::FacetPy::Type), &f)) { Mesh::FacetPy* face = static_cast(f); getMeshObjectPtr()->addFacet(*face->getFacetPtr()); @@ -722,7 +720,7 @@ PyObject* MeshPy::addFacet(PyObject* args) PyObject* MeshPy::addFacets(PyObject* args) { - PyObject* list; + PyObject* list {}; if (PyArg_ParseTuple(args, "O!", &PyList_Type, &list)) { Py::List list_f(list); Py::Type vVType(Base::getTypeAsObject(&Base::VectorPy::Type)); @@ -824,7 +822,7 @@ PyObject* MeshPy::addFacets(PyObject* args) PyObject* MeshPy::removeFacets(PyObject* args) { - PyObject* list; + PyObject* list {}; if (!PyArg_ParseTuple(args, "O", &list)) { return nullptr; } @@ -873,7 +871,7 @@ PyObject* MeshPy::rebuildNeighbourHood(PyObject* args) PyObject* MeshPy::addMesh(PyObject* args) { - PyObject* mesh; + PyObject* mesh {}; if (!PyArg_ParseTuple(args, "O!", &(MeshPy::Type), &mesh)) { return nullptr; } @@ -889,8 +887,8 @@ PyObject* MeshPy::addMesh(PyObject* args) PyObject* MeshPy::setPoint(PyObject* args) { - unsigned long index; - PyObject* pnt; + unsigned long index {}; + PyObject* pnt {}; if (!PyArg_ParseTuple(args, "kO!", &index, &(Base::VectorPy::Type), &pnt)) { return nullptr; } @@ -906,7 +904,7 @@ PyObject* MeshPy::setPoint(PyObject* args) PyObject* MeshPy::movePoint(PyObject* args) { - unsigned long index; + unsigned long index {}; Base::Vector3d vec; do { @@ -917,7 +915,7 @@ PyObject* MeshPy::movePoint(PyObject* args) } PyErr_Clear(); // set by PyArg_ParseTuple() - PyObject* object; + PyObject* object {}; if (PyArg_ParseTuple(args, "kO!", &index, &(Base::VectorPy::Type), &object)) { vec = *(static_cast(object)->getVectorPtr()); break; @@ -952,7 +950,7 @@ PyObject* MeshPy::getPointNormals(PyObject* args) PyObject* MeshPy::addSegment(PyObject* args) { - PyObject* pylist; + PyObject* pylist {}; if (!PyArg_ParseTuple(args, "O", &pylist)) { return nullptr; } @@ -985,7 +983,7 @@ PyObject* MeshPy::countSegments(PyObject* args) PyObject* MeshPy::getSegment(PyObject* args) { - unsigned long index; + unsigned long index {}; if (!PyArg_ParseTuple(args, "k", &index)) { return nullptr; } @@ -1055,7 +1053,7 @@ PyObject* MeshPy::getPointSelection(PyObject* args) PyObject* MeshPy::meshFromSegment(PyObject* args) { - PyObject* list; + PyObject* list {}; if (!PyArg_ParseTuple(args, "O", &list)) { return nullptr; } @@ -1353,7 +1351,7 @@ PyObject* MeshPy::countComponents(PyObject* args) PyObject* MeshPy::removeComponents(PyObject* args) { - unsigned long count; + unsigned long count {}; if (!PyArg_ParseTuple(args, "k", &count)) { return nullptr; } @@ -1371,7 +1369,7 @@ PyObject* MeshPy::removeComponents(PyObject* args) PyObject* MeshPy::fillupHoles(PyObject* args) { - unsigned long len; + unsigned long len {}; int level = 0; float max_area = 0.0f; if (!PyArg_ParseTuple(args, "k|if", &len, &level, &max_area)) { @@ -1434,7 +1432,7 @@ PyObject* MeshPy::fixCaps(PyObject* args) PyObject* MeshPy::fixDeformations(PyObject* args) { - float fMaxAngle; + float fMaxAngle {}; float fEpsilon = MeshCore::MeshDefinitions::_fMinPointDistanceP2; if (!PyArg_ParseTuple(args, "f|f", &fMaxAngle, &fEpsilon)) { return nullptr; @@ -1512,7 +1510,7 @@ PyObject* MeshPy::refine(PyObject* args) PyObject* MeshPy::removeNeedles(PyObject* args) { - float length; + float length {}; if (!PyArg_ParseTuple(args, "f", &length)) { return nullptr; } @@ -1609,8 +1607,8 @@ PyObject* MeshPy::splitEdges(PyObject* args) PyObject* MeshPy::splitEdge(PyObject* args) { - unsigned long facet, neighbour; - PyObject* vertex; + unsigned long facet {}, neighbour {}; + PyObject* vertex {}; if (!PyArg_ParseTuple(args, "kkO!", &facet, &neighbour, &Base::VectorPy::Type, &vertex)) { return nullptr; } @@ -1647,9 +1645,9 @@ PyObject* MeshPy::splitEdge(PyObject* args) PyObject* MeshPy::splitFacet(PyObject* args) { - unsigned long facet; - PyObject* vertex1; - PyObject* vertex2; + unsigned long facet {}; + PyObject* vertex1 {}; + PyObject* vertex2 {}; if (!PyArg_ParseTuple(args, "kO!O!", &facet, @@ -1685,7 +1683,7 @@ PyObject* MeshPy::splitFacet(PyObject* args) PyObject* MeshPy::swapEdge(PyObject* args) { - unsigned long facet, neighbour; + unsigned long facet {}, neighbour {}; if (!PyArg_ParseTuple(args, "kk", &facet, &neighbour)) { return nullptr; } @@ -1718,7 +1716,7 @@ PyObject* MeshPy::swapEdge(PyObject* args) PyObject* MeshPy::collapseEdge(PyObject* args) { - unsigned long facet, neighbour; + unsigned long facet {}, neighbour {}; if (!PyArg_ParseTuple(args, "kk", &facet, &neighbour)) { return nullptr; } @@ -1751,7 +1749,7 @@ PyObject* MeshPy::collapseEdge(PyObject* args) PyObject* MeshPy::collapseFacet(PyObject* args) { - unsigned long facet; + unsigned long facet {}; if (!PyArg_ParseTuple(args, "k", &facet)) { return nullptr; } @@ -1772,8 +1770,8 @@ PyObject* MeshPy::collapseFacet(PyObject* args) PyObject* MeshPy::insertVertex(PyObject* args) { - unsigned long facet; - PyObject* vertex; + unsigned long facet {}; + PyObject* vertex {}; if (!PyArg_ParseTuple(args, "kO!", &facet, &Base::VectorPy::Type, &vertex)) { return nullptr; } @@ -1798,8 +1796,8 @@ PyObject* MeshPy::insertVertex(PyObject* args) PyObject* MeshPy::snapVertex(PyObject* args) { - unsigned long facet; - PyObject* vertex; + unsigned long facet {}; + PyObject* vertex {}; if (!PyArg_ParseTuple(args, "kO!", &facet, &Base::VectorPy::Type, &vertex)) { return nullptr; } @@ -1858,8 +1856,8 @@ PyObject* MeshPy::collapseFacets(PyObject* args) PyObject* MeshPy::foraminate(PyObject* args) { - PyObject* pnt_p; - PyObject* dir_p; + PyObject* pnt_p {}; + PyObject* dir_p {}; double maxAngle = MeshCore::Mathd::PI; if (!PyArg_ParseTuple(args, "OO|d", &pnt_p, &dir_p, &maxAngle)) { return nullptr; @@ -1890,8 +1888,8 @@ PyObject* MeshPy::foraminate(PyObject* args) PyObject* MeshPy::cut(PyObject* args) { - PyObject* poly; - int mode; + PyObject* poly {}; + int mode {}; if (!PyArg_ParseTuple(args, "Oi", &poly, &mode)) { return nullptr; } @@ -1926,8 +1924,8 @@ PyObject* MeshPy::cut(PyObject* args) PyObject* MeshPy::trim(PyObject* args) { - PyObject* poly; - int mode; + PyObject* poly {}; + int mode {}; if (!PyArg_ParseTuple(args, "Oi", &poly, &mode)) { return nullptr; } @@ -1962,7 +1960,7 @@ PyObject* MeshPy::trim(PyObject* args) PyObject* MeshPy::trimByPlane(PyObject* args) { - PyObject *base, *norm; + PyObject *base {}, *norm {}; if (!PyArg_ParseTuple(args, "O!O!", &Base::VectorPy::Type, @@ -2046,7 +2044,7 @@ PyObject* MeshPy::smooth(PyObject* args, PyObject* kwds) PyObject* MeshPy::decimate(PyObject* args) { - float fTol, fRed; + float fTol {}, fRed {}; if (PyArg_ParseTuple(args, "ff", &fTol, &fRed)) { PY_TRY { @@ -2058,7 +2056,7 @@ PyObject* MeshPy::decimate(PyObject* args) } PyErr_Clear(); - int targetSize; + int targetSize {}; if (PyArg_ParseTuple(args, "i", &targetSize)) { PY_TRY { @@ -2076,8 +2074,8 @@ PyObject* MeshPy::decimate(PyObject* args) PyObject* MeshPy::nearestFacetOnRay(PyObject* args) { - PyObject* pnt_p; - PyObject* dir_p; + PyObject* pnt_p {}; + PyObject* dir_p {}; double maxAngle = MeshCore::Mathd::PI; if (!PyArg_ParseTuple(args, "OO|d", &pnt_p, &dir_p, &maxAngle)) { return nullptr; @@ -2107,7 +2105,7 @@ PyObject* MeshPy::nearestFacetOnRay(PyObject* args) PyObject* MeshPy::getPlanarSegments(PyObject* args) { - float dev; + float dev {}; unsigned long minFacets = 0; if (!PyArg_ParseTuple(args, "f|k", &dev, &minFacets)) { return nullptr; @@ -2132,14 +2130,14 @@ PyObject* MeshPy::getPlanarSegments(PyObject* args) PyObject* MeshPy::getSegmentsOfType(PyObject* args) { - char* type; - float dev; + char* type {}; + float dev {}; unsigned long minFacets = 0; if (!PyArg_ParseTuple(args, "sf|k", &type, &dev, &minFacets)) { return nullptr; } - Mesh::MeshObject::GeometryType geoType; + Mesh::MeshObject::GeometryType geoType {}; if (strcmp(type, "Plane") == 0) { geoType = Mesh::MeshObject::PLANE; } @@ -2172,7 +2170,7 @@ PyObject* MeshPy::getSegmentsOfType(PyObject* args) PyObject* MeshPy::getSegmentsByCurvature(PyObject* args) { - PyObject* l; + PyObject* l {}; if (!PyArg_ParseTuple(args, "O", &l)) { return nullptr; } diff --git a/src/Mod/Mesh/App/MeshTexture.cpp b/src/Mod/Mesh/App/MeshTexture.cpp index 3e657388c9..607131613f 100644 --- a/src/Mod/Mesh/App/MeshTexture.cpp +++ b/src/Mod/Mesh/App/MeshTexture.cpp @@ -29,8 +29,8 @@ using namespace Mesh; MeshTexture::MeshTexture(const Mesh::MeshObject& mesh, const MeshCore::Material& material) : materialRefMesh(material) + , countPointsRefMesh {mesh.countPoints()} { - countPointsRefMesh = mesh.countPoints(); unsigned long countFacets = mesh.countFacets(); if (material.binding == MeshCore::MeshIO::PER_VERTEX diff --git a/src/Mod/Mesh/App/MeshTexture.h b/src/Mod/Mesh/App/MeshTexture.h index bcc5dfc35b..88ebd0374f 100644 --- a/src/Mod/Mesh/App/MeshTexture.h +++ b/src/Mod/Mesh/App/MeshTexture.h @@ -90,7 +90,7 @@ private: } else { Base::Vector3f n; - float dist; + float dist {}; return kdTree->FindNearest(p, max_dist, n, dist); } } diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp index c871bde735..1f338f8ae0 100644 --- a/src/Mod/Mesh/Gui/AppMeshGui.cpp +++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp @@ -83,8 +83,8 @@ public: private: Py::Object convertToSTL(const Py::Tuple& args) { - char* inname; - char* outname; + char* inname {}; + char* outname {}; if (!PyArg_ParseTuple(args.ptr(), "etet", "utf-8", &inname, "utf-8", &outname)) { throw Py::Exception(); } @@ -108,7 +108,7 @@ private: } } - return Py::Boolean(ok); + return Py::Boolean(ok); // NOLINT } }; @@ -147,6 +147,7 @@ PyMOD_INIT_FUNC(MeshGui) (void)new MeshGui::CleanupHandler; } + // NOLINTBEGIN // try to instantiate flat-mesh commands try { Base::Interpreter().runString("import MeshFlatteningCommand"); @@ -162,6 +163,7 @@ PyMOD_INIT_FUNC(MeshGui) QT_TRANSLATE_NOOP("QObject", "Import-Export")); Mesh::Extension3MFFactory::addProducer(new MeshGui::ThumbnailExtensionProducer); + // NOLINTEND // clang-format off MeshGui::SoFCMeshObjectElement ::initClass(); diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index 0e28afe321..8cb74d9422 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -465,7 +465,7 @@ CmdMeshFromGeometry::CmdMeshFromGeometry() void CmdMeshFromGeometry::activated(int) { - bool ok; + bool ok {}; double tol = QInputDialog::getDouble(Gui::getMainWindow(), QObject::tr("Meshing Tolerance"), QObject::tr("Enter tolerance for meshing geometry:"), @@ -1532,7 +1532,7 @@ void CmdMeshFillupHoles::activated(int) { std::vector meshes = getSelection().getObjectsOfType(Mesh::Feature::getClassTypeId()); - bool ok; + bool ok {}; int FillupHolesOfLength = QInputDialog::getInt(Gui::getMainWindow(), QObject::tr("Fill holes"), @@ -1797,7 +1797,7 @@ void CmdMeshScale::activated(int) return; } - bool ok; + bool ok {}; double factor = QInputDialog::getDouble(Gui::getMainWindow(), QObject::tr("Scaling"), QObject::tr("Enter scaling factor:"), diff --git a/src/Mod/Mesh/Gui/DlgDecimating.cpp b/src/Mod/Mesh/Gui/DlgDecimating.cpp index f5a5020df7..1cbf2d8f96 100644 --- a/src/Mod/Mesh/Gui/DlgDecimating.cpp +++ b/src/Mod/Mesh/Gui/DlgDecimating.cpp @@ -37,7 +37,6 @@ using namespace MeshGui; DlgDecimating::DlgDecimating(QWidget* parent, Qt::WindowFlags fl) : QWidget(parent, fl) - , numberOfTriangles(0) , ui(new Ui_DlgDecimating) { ui->setupUi(this); @@ -135,7 +134,7 @@ double DlgDecimating::reduction() const TaskDecimating::TaskDecimating() { - widget = new DlgDecimating(); + widget = new DlgDecimating(); // NOLINT Gui::TaskView::TaskBox* taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr); taskbox->groupLayout()->addWidget(widget); diff --git a/src/Mod/Mesh/Gui/DlgDecimating.h b/src/Mod/Mesh/Gui/DlgDecimating.h index 94616ae5e6..58efb56f42 100644 --- a/src/Mod/Mesh/Gui/DlgDecimating.h +++ b/src/Mod/Mesh/Gui/DlgDecimating.h @@ -24,9 +24,9 @@ #ifndef MESHGUI_DLGDECIMATING_H #define MESHGUI_DLGDECIMATING_H +#include #include #include -#include #include namespace MeshGui @@ -49,7 +49,7 @@ private: void onCheckAbsoluteNumberToggled(bool); private: - int numberOfTriangles; + int numberOfTriangles {0}; std::unique_ptr ui; }; diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp index 5439943b03..24ef560230 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp @@ -30,20 +30,20 @@ #include #include -#include #include +#include #include +#include #include #include -#include -#include -#include #include +#include +#include #include "DlgEvaluateMeshImp.h" +#include "ui_DlgEvaluateMesh.h" #include "DlgEvaluateSettings.h" #include "ViewProviderDefects.h" -#include "ui_DlgEvaluateMesh.h" using namespace MeshCore; @@ -551,7 +551,7 @@ void DlgEvaluateMeshImp::onRepairOrientationButtonClicked() doc->openCommand(QT_TRANSLATE_NOOP("Command", "Harmonize normals")); try { Gui::Command::doCommand(Gui::Command::App, - "App.getDocument(\"%s\").getObject(\"%s\").harmonizeNormals()", + R"(App.getDocument("%s").getObject("%s").harmonizeNormals())", docName, objName); } @@ -661,16 +661,15 @@ void DlgEvaluateMeshImp::onRepairNonmanifoldsButtonClicked() Gui::Document* doc = Gui::Application::Instance->getDocument(docName); doc->openCommand(QT_TRANSLATE_NOOP("Command", "Remove non-manifolds")); try { - Gui::Command::doCommand( - Gui::Command::App, - "App.getDocument(\"%s\").getObject(\"%s\").removeNonManifolds()", - docName, - objName); + Gui::Command::doCommand(Gui::Command::App, + R"(App.getDocument("%s").getObject("%s").removeNonManifolds())", + docName, + objName); if (d->checkNonManfoldPoints) { Gui::Command::doCommand( Gui::Command::App, - "App.getDocument(\"%s\").getObject(\"%s\").removeNonManifoldPoints()", + R"(App.getDocument("%s").getObject("%s").removeNonManifoldPoints())", docName, objName); } @@ -768,7 +767,7 @@ void DlgEvaluateMeshImp::onRepairIndicesButtonClicked() doc->openCommand(QT_TRANSLATE_NOOP("Command", "Fix indices")); try { Gui::Command::doCommand(Gui::Command::App, - "App.getDocument(\"%s\").getObject(\"%s\").fixIndices()", + R"(App.getDocument("%s").getObject("%s").fixIndices())", docName, objName); } @@ -837,12 +836,11 @@ void DlgEvaluateMeshImp::onRepairDegeneratedButtonClicked() Gui::Document* doc = Gui::Application::Instance->getDocument(docName); doc->openCommand(QT_TRANSLATE_NOOP("Command", "Remove degenerated faces")); try { - Gui::Command::doCommand( - Gui::Command::App, - "App.getDocument(\"%s\").getObject(\"%s\").fixDegenerations(%f)", - docName, - objName, - d->epsilonDegenerated); + Gui::Command::doCommand(Gui::Command::App, + R"(App.getDocument("%s").getObject("%s").fixDegenerations(%f))", + docName, + objName, + d->epsilonDegenerated); } catch (const Base::Exception& e) { QMessageBox::warning(this, tr("Degenerations"), QString::fromLatin1(e.what())); @@ -912,7 +910,7 @@ void DlgEvaluateMeshImp::onRepairDuplicatedFacesButtonClicked() try { Gui::Command::doCommand( Gui::Command::App, - "App.getDocument(\"%s\").getObject(\"%s\").removeDuplicatedFacets()", + R"(App.getDocument("%s").getObject("%s").removeDuplicatedFacets())", docName, objName); } @@ -982,7 +980,7 @@ void DlgEvaluateMeshImp::onRepairDuplicatedPointsButtonClicked() try { Gui::Command::doCommand( Gui::Command::App, - "App.getDocument(\"%s\").getObject(\"%s\").removeDuplicatedPoints()", + R"(App.getDocument("%s").getObject("%s").removeDuplicatedPoints())", docName, objName); } @@ -1147,7 +1145,7 @@ void DlgEvaluateMeshImp::onRepairFoldsButtonClicked() try { Gui::Command::doCommand( Gui::Command::App, - "App.getDocument(\"%s\").getObject(\"%s\").removeFoldsOnSurface()", + R"(App.getDocument("%s").getObject("%s").removeFoldsOnSurface())", docName, objName); } @@ -1191,7 +1189,7 @@ void DlgEvaluateMeshImp::onRepairAllTogetherClicked() bool run = false; bool self = true; - int max_iter=10; + int max_iter = 10; const MeshKernel& rMesh = d->meshFeature->Mesh.getValue().getKernel(); try { do { @@ -1373,7 +1371,7 @@ bool DockEvaluateMeshImp::hasInstance() DockEvaluateMeshImp::DockEvaluateMeshImp(QWidget* parent, Qt::WindowFlags fl) : DlgEvaluateMeshImp(parent, fl) { - scrollArea = new QScrollArea(); + scrollArea = new QScrollArea(); // NOLINT scrollArea->setObjectName(QLatin1String("scrollArea")); scrollArea->setFrameShape(QFrame::NoFrame); scrollArea->setFrameShadow(QFrame::Plain); diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h index 02b99d07fc..fb43bdf3f1 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h @@ -146,7 +146,7 @@ private: * The DockEvaluateMeshImp class creates a single instance and embeds it into a dock window. * \author Werner Mayer */ -class DockEvaluateMeshImp: public DlgEvaluateMeshImp +class DockEvaluateMeshImp: public DlgEvaluateMeshImp // NOLINT { Q_OBJECT diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp index 3ffcabc003..a250b46b4f 100644 --- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp +++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp @@ -46,8 +46,8 @@ using namespace MeshGui; // clang-format off DlgRegularSolidImp::DlgRegularSolidImp(QWidget* parent, Qt::WindowFlags fl) - : QDialog( parent, fl ) - , ui(new Ui_DlgRegularSolid) + : QDialog(parent, fl) + , ui(new Ui_DlgRegularSolid) { ui->setupUi(this); connect(ui->createSolidButton, &QPushButton::clicked, diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.cpp b/src/Mod/Mesh/Gui/DlgSmoothing.cpp index ae3f4f8252..70422e8ba2 100644 --- a/src/Mod/Mesh/Gui/DlgSmoothing.cpp +++ b/src/Mod/Mesh/Gui/DlgSmoothing.cpp @@ -29,12 +29,12 @@ #include #include #include -#include #include +#include #include "DlgSmoothing.h" -#include "Selection.h" #include "ui_DlgSmoothing.h" +#include "Selection.h" using namespace MeshGui; @@ -47,7 +47,7 @@ DlgSmoothing::DlgSmoothing(QWidget* parent) { // clang-format off ui->setupUi(this); - bg = new QButtonGroup(this); + bg = new QButtonGroup(this); //NOLINT bg->addButton(ui->radioButtonTaubin, 0); bg->addButton(ui->radioButtonLaplace, 1); @@ -151,13 +151,13 @@ SmoothingDialog::~SmoothingDialog() = default; TaskSmoothing::TaskSmoothing() { - widget = new DlgSmoothing(); + widget = new DlgSmoothing(); // NOLINT Gui::TaskView::TaskBox* taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); - selection = new Selection(); + selection = new Selection(); // NOLINT selection->setObjects( Gui::Selection().getSelectionEx(nullptr, Mesh::Feature::getClassTypeId())); Gui::Selection().clearSelection(); diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.h b/src/Mod/Mesh/Gui/DlgSmoothing.h index a1051e997f..371173f60e 100644 --- a/src/Mod/Mesh/Gui/DlgSmoothing.h +++ b/src/Mod/Mesh/Gui/DlgSmoothing.h @@ -24,9 +24,9 @@ #ifndef MESHGUI_DLGSMOOTHING_H #define MESHGUI_DLGSMOOTHING_H +#include #include #include -#include #ifndef MESH_GLOBAL_H #include #endif diff --git a/src/Mod/Mesh/Gui/MeshEditor.cpp b/src/Mod/Mesh/Gui/MeshEditor.cpp index 678af06186..e478c3d431 100644 --- a/src/Mod/Mesh/Gui/MeshEditor.cpp +++ b/src/Mod/Mesh/Gui/MeshEditor.cpp @@ -23,10 +23,10 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include -#include #include #include +#include +#include #include #include @@ -52,8 +52,8 @@ #include #include -#include #include +#include #include "MeshEditor.h" #include "SoFCMeshObject.h" @@ -66,9 +66,8 @@ namespace sp = std::placeholders; PROPERTY_SOURCE(MeshGui::ViewProviderFace, Gui::ViewProviderDocumentObject) ViewProviderFace::ViewProviderFace() - : mesh(nullptr) - , current_index(-1) { + // NOLINTBEGIN pcCoords = new SoCoordinate3(); pcCoords->ref(); pcCoords->point.setNum(0); @@ -76,6 +75,7 @@ ViewProviderFace::ViewProviderFace() pcFaces->ref(); pcMeshPick = new SoFCMeshPickNode(); pcMeshPick->ref(); + // NOLINTEND } ViewProviderFace::~ViewProviderFace() @@ -449,12 +449,9 @@ struct NofFacetsCompare MeshFillHole::MeshFillHole(MeshHoleFiller& hf, Gui::View3DInventor* parent) : QObject(parent) - , myMesh(nullptr) - , myNumPoints(0) - , myVertex1(0) - , myVertex2(0) , myHoleFiller(hf) { + // NOLINTBEGIN myBoundariesRoot = new SoSeparator; myBoundariesRoot->ref(); myBoundaryRoot = new SoSeparator; @@ -476,6 +473,7 @@ MeshFillHole::MeshFillHole(MeshHoleFiller& hf, Gui::View3DInventor* parent) myVertex = new SoCoordinate3(); myBridgeRoot->addChild(myVertex); myBridgeRoot->addChild(new SoPointSet); + // NOLINTEND } MeshFillHole::~MeshFillHole() @@ -700,7 +698,7 @@ void MeshFillHole::fileHoleCallback(void* ud, SoEventCallback* n) std::map::iterator it = self->myPolygons.find(node); if (it != self->myPolygons.end()) { // now check which vertex of the polygon is closest to the ray - Mesh::PointIndex vertex_index; + Mesh::PointIndex vertex_index {}; SbVec3f closestPoint; float minDist = self->findClosestPoint(rp.getLine(), it->second, vertex_index, closestPoint); @@ -737,7 +735,7 @@ void MeshFillHole::fileHoleCallback(void* ud, SoEventCallback* n) std::map::iterator it = self->myPolygons.find(node); if (it != self->myPolygons.end()) { // now check which vertex of the polygon is closest to the ray - Mesh::PointIndex vertex_index; + Mesh::PointIndex vertex_index {}; SbVec3f closestPoint; float minDist = self->findClosestPoint(rp.getLine(), it->second, diff --git a/src/Mod/Mesh/Gui/MeshEditor.h b/src/Mod/Mesh/Gui/MeshEditor.h index a7a6ee4c62..aa06a010e2 100644 --- a/src/Mod/Mesh/Gui/MeshEditor.h +++ b/src/Mod/Mesh/Gui/MeshEditor.h @@ -74,9 +74,9 @@ public: SoPickedPoint* getPickedPoint(const SbVec2s& pos, const Gui::View3DInventorViewer* viewer) const; - ViewProviderMesh* mesh; + ViewProviderMesh* mesh {nullptr}; std::vector index; - int current_index; + int current_index {-1}; SoCoordinate3* pcCoords; SoFaceSet* pcFaces; @@ -172,10 +172,10 @@ private: SoSeparator* myBridgeRoot; SoCoordinate3* myVertex; std::map myPolygons; - Mesh::Feature* myMesh; - int myNumPoints; - Mesh::PointIndex myVertex1; - Mesh::PointIndex myVertex2; + Mesh::Feature* myMesh {nullptr}; + int myNumPoints {0}; + Mesh::PointIndex myVertex1 {0}; + Mesh::PointIndex myVertex2 {0}; TBoundary myPolygon; MeshHoleFiller& myHoleFiller; Connection myConnection; diff --git a/src/Mod/Mesh/Gui/MeshSelection.cpp b/src/Mod/Mesh/Gui/MeshSelection.cpp index cbc56352ec..ab50940821 100644 --- a/src/Mod/Mesh/Gui/MeshSelection.cpp +++ b/src/Mod/Mesh/Gui/MeshSelection.cpp @@ -22,9 +22,9 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include #include #include +#include #include #include @@ -493,7 +493,7 @@ void MeshSelection::selectGLCallback(void* ud, SoEventCallback* n) if (self->onlyVisibleTriangles) { const SbVec2s& sz = view->getSoRenderManager()->getViewportRegion().getWindowSize(); - short width, height; + short width {}, height {}; sz.getValue(width, height); std::vector pixelPoly = view->getPolygon(); SbBox2s rect; diff --git a/src/Mod/Mesh/Gui/MeshSelection.h b/src/Mod/Mesh/Gui/MeshSelection.h index a8703a4406..8ef2ad677a 100644 --- a/src/Mod/Mesh/Gui/MeshSelection.h +++ b/src/Mod/Mesh/Gui/MeshSelection.h @@ -23,8 +23,8 @@ #ifndef MESHGUI_MESHSELECTION_H #define MESHGUI_MESHSELECTION_H -#include #include +#include #include #include @@ -49,6 +49,11 @@ public: MeshSelection(); ~MeshSelection(); + MeshSelection(const MeshSelection&) = delete; + MeshSelection(MeshSelection&&) = delete; + MeshSelection& operator=(const MeshSelection&) = delete; + MeshSelection& operator=(MeshSelection&&) = delete; + void setEnabledViewerSelection(bool); void startSelection(); diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp b/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp index 11dffcf3f1..9d0e4198c4 100644 --- a/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp +++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp @@ -35,6 +35,7 @@ PROPERTYITEM_SOURCE(MeshGui::PropertyMeshKernelItem) PropertyMeshKernelItem::PropertyMeshKernelItem() { + // NOLINTBEGIN m_p = static_cast( Gui::PropertyEditor::PropertyIntegerItem::create()); m_p->setParent(this); @@ -50,6 +51,7 @@ PropertyMeshKernelItem::PropertyMeshKernelItem() m_f->setParent(this); m_f->setPropertyName(QLatin1String("Faces")); this->appendChild(m_f); + // NOLINTEND } void PropertyMeshKernelItem::initialize() diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.cpp b/src/Mod/Mesh/Gui/RemeshGmsh.cpp index 7632035553..21144686e2 100644 --- a/src/Mod/Mesh/Gui/RemeshGmsh.cpp +++ b/src/Mod/Mesh/Gui/RemeshGmsh.cpp @@ -65,7 +65,7 @@ public: } public: - Ui_RemeshGmsh ui; + Ui_RemeshGmsh ui {}; QPointer label; QPointer syntax; QProcess gmsh; @@ -176,19 +176,25 @@ void GmshWidget::accept() return; } + // clang-format off QString inpFile; QString outFile; if (writeProject(inpFile, outFile)) { // ./gmsh - -bin -2 /tmp/mesh.geo -o /tmp/best.stl QString proc = d->ui.fileChooser->fileName(); QStringList args; - args << QLatin1String("-") << QLatin1String("-bin") << QLatin1String("-2") << inpFile - << QLatin1String("-o") << outFile; + args << QLatin1String("-") + << QLatin1String("-bin") + << QLatin1String("-2") + << inpFile + << QLatin1String("-o") + << outFile; d->gmsh.start(proc, args); d->time.start(); d->ui.labelTime->setText(tr("Time:")); } + // clang-format on } void GmshWidget::readyReadStandardError() diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.h b/src/Mod/Mesh/Gui/RemeshGmsh.h index c00c7fc833..be1f9d8e17 100644 --- a/src/Mod/Mesh/Gui/RemeshGmsh.h +++ b/src/Mod/Mesh/Gui/RemeshGmsh.h @@ -23,9 +23,9 @@ #ifndef MESHGUI_REMESHGMSH_H #define MESHGUI_REMESHGMSH_H +#include #include #include -#include #include #include diff --git a/src/Mod/Mesh/Gui/RemoveComponents.cpp b/src/Mod/Mesh/Gui/RemoveComponents.cpp index 3857897640..685715e2f3 100644 --- a/src/Mod/Mesh/Gui/RemoveComponents.cpp +++ b/src/Mod/Mesh/Gui/RemoveComponents.cpp @@ -37,8 +37,8 @@ using namespace MeshGui; RemoveComponents::RemoveComponents(QWidget* parent, Qt::WindowFlags fl) : QWidget(parent, fl) + , ui(new Ui_RemoveComponents) { - ui = new Ui_RemoveComponents; ui->setupUi(this); setupConnections(); ui->spSelectComp->setRange(1, INT_MAX); @@ -198,7 +198,7 @@ void RemoveComponents::reject() RemoveComponentsDialog::RemoveComponentsDialog(QWidget* parent, Qt::WindowFlags fl) : QDialog(parent, fl) { - widget = new RemoveComponents(this); + widget = new RemoveComponents(this); // NOLINT this->setWindowTitle(widget->windowTitle()); QVBoxLayout* hboxLayout = new QVBoxLayout(this); @@ -243,7 +243,7 @@ void RemoveComponentsDialog::clicked(QAbstractButton* btn) TaskRemoveComponents::TaskRemoveComponents() { - widget = new RemoveComponents(); + widget = new RemoveComponents(); // NOLINT taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); diff --git a/src/Mod/Mesh/Gui/RemoveComponents.h b/src/Mod/Mesh/Gui/RemoveComponents.h index f71c52ef31..58635b5bc4 100644 --- a/src/Mod/Mesh/Gui/RemoveComponents.h +++ b/src/Mod/Mesh/Gui/RemoveComponents.h @@ -24,11 +24,11 @@ #ifndef MESHGUI_REMOVECOMPONENTS_H #define MESHGUI_REMOVECOMPONENTS_H -#include "MeshSelection.h" +#include #include #include #include -#include +#include "MeshSelection.h" namespace MeshGui { diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh.ts index b8db5c2d38..f2ddbd238f 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh - + Add triangle - - + + Add triangle manually to a mesh @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh - + Boundings info... - - + + Shows the boundings of the selected mesh @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh - + Regular solid... - - + + Builds a regular solid @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh - + Cross-sections... - - + + Cross-sections @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh - + Decimation... - - - + + + Decimates a mesh @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh - + Difference @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh - + Face info - - + + Information about face @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh - + Check solid mesh - - + + Checks whether the mesh is a solid @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh - + Evaluate and repair mesh... - - + + Opens a dialog to analyze and repair a mesh @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh - + Export mesh... - - + + Exports a mesh to file @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh - + Close hole - - + + Close holes interactively @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh - + Fill holes... - - + + Fill holes of the mesh @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh - + Flip normals - - + + Flips the normals of the mesh @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh - + Create mesh from geometry... - - + + Create mesh from the selected geometry @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh - + Create mesh from shape... - + Tessellate shape @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh - + Harmonize normals - - + + Harmonizes the normals of the mesh @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh - + Import mesh... - - + + Imports a mesh from file @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh - + Intersection @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh - + Merge - + Merges selected meshes into one @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh - + Cut mesh - - + + Cuts a mesh with a picked polygon @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh - + Make segment - - + + Creates a mesh segment @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh - + Split mesh - - + + Splits a mesh into two meshes @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh - + Trim mesh - - + + Trims a mesh with a picked polygon @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh - + Refinement... - - + + Refine existing mesh @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh - + Remove components by hand... - - + + Mark a component to remove it from the mesh @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh - + Remove components... - - + + Remove topologic independent components from the mesh @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh - + Scale... - + Scale selected meshes @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh - + Create section from mesh and plane - - + + Section from mesh and plane @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh - + Create mesh segments... - - + + Create mesh segments @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh - + Create mesh segments from best-fit surfaces... - - + + Create mesh segments from best-fit surfaces @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh - + Smooth... - - + + Smooth the selected meshes @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh - + Split by components - + Split selected mesh into its components @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh - + Trim mesh with a plane - - + + Trims a mesh with a plane @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh - + Union @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh - + Curvature plot - - + + Calculates the curvature of the vertices of a mesh @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh - + Curvature info - - + + Information about curvature @@ -672,144 +672,144 @@ - + Mesh difference - + Mesh intersection - + Import Mesh - + Mesh VertexCurvature - + Mesh Smoothing - + Harmonize mesh normals - + Flip mesh normals - + Fill up holes - + Mesh merge - + Mesh split - + Mesh scale - + Mesh Decimating - + Harmonize normals - + Remove non-manifolds - + Fix indices - + Remove degenerated faces - + Remove duplicated faces - + Remove duplicated points - + Fix self-intersections - + Remove folds - + Repair mesh - + Delete selection - - + + Cut - - + + Trim - + Split - + Segment - + Delete - + Fill hole @@ -838,7 +838,7 @@ - + Absolute number @@ -848,7 +848,7 @@ - + Absolute number (Maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... - - + + No selection - - - - - - - - - - - + + + + + + + + + + + No information - + Orientation - + No flipped normals - + %1 flipped normals - + No non-manifolds - + %1 non-manifolds - - + + Non-manifolds - + Cannot remove non-manifolds - + Invalid face indices - + Invalid point indices - + Multiple point indices - + Invalid neighbour indices - + No invalid indices - + Indices - + No degenerations - + %1 degenerated faces - + Degenerations - + No duplicated faces - + %1 duplicated faces - + Duplicated faces - + No duplicated points - - + + Duplicated points - + No self-intersections - + Self-intersections - + No folds on surface - + %1 folds on surface - + Folds - - + + Mesh repair @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 - + No active document @@ -1366,7 +1366,7 @@ - + This parameter indicates whether ZIP compression is used when writing a file in AMF format @@ -1538,48 +1538,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic - + Adaptive - + Frontal - + Frontal Quad - + Parallelograms - - + + Time: - + Running gmsh... - + Failed to start - + Error @@ -1587,22 +1587,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle - + Flip normal - + Clear - + Finish @@ -1610,7 +1610,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish @@ -1618,47 +1618,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit - + Parameters - + Selection - + Region - + Triangle - + Clear - + Compute - + No selection - + Before fitting the surface select an area. @@ -1917,29 +1917,29 @@ to a smoother appearance. - - + + Base - + Normal - + Axis - - + + Radius - + Center @@ -1973,12 +1973,12 @@ to a smoother appearance. - + Use a brush tool to select the area - + Clears completely the selected area @@ -1986,14 +1986,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete - - + + Invert @@ -2001,38 +2001,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: - + Number of facets: - + Minimum bound: - + Maximum bound: - + Mesh info box - + Mesh info - - + + X: %1 Y: %2 Z: %3 @@ -2040,7 +2040,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: @@ -2048,26 +2048,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. @@ -2076,7 +2076,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh @@ -2084,241 +2084,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display - + Import-Export - + All Mesh Files - - + + Binary STL - - - + + + ASCII STL - - + + Binary Mesh - - + + Alias Mesh - - + + Object File Format - + Inventor V2.1 ASCII - - + + Stanford Polygon - + NASTRAN - - + + All Files - + Import mesh - + Simple Model Format - + Inventor V2.1 ascii - + X3D Extensible 3D - + Compressed X3D - + WebGL/X3D - + VRML V2.0 - + Compressed VRML 2.0 - + Nastran - + Python module def - + Asymptote Format - + 3D Manufacturing Format - + Export mesh - + Meshing Tolerance - + Enter tolerance for meshing geometry: - + The mesh '%1' is not a solid. - + The mesh '%1' is a solid. - + Solid Mesh - + Boundings - + Fill holes - + Fill holes with maximum number of edges: - + Scaling - + Enter scaling factor: - + [Points: %1, Edges: %2, Faces: %3] - + Display components - + Display segments - + Display colors - - + + Leave info mode - + Index: %1 - + Leave hole-filling mode - + Leave removal mode - + Delete selected faces - + Clear selected faces - + Annotation diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_be.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_be.ts index 4d47e5f009..4a123db8b0 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_be.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_be.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Дадаць трыкутнік - - + + Add triangle manually to a mesh Дадаць трыкутнік у паліганальную сетку ўручную @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh - Mesh + Паліганальная сетка - + Boundings info... Інфармацыя аб габарытах... - - + + Shows the boundings of the selected mesh Адлюстроўвае габарыты абранай паліганальнай сеткі @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Паліганальная сетка - + Regular solid... Правільнае суцэльнае цела... - - + + Builds a regular solid Пабудова правільнага суцэльнага цела @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Паліганальная сетка - + Cross-sections... Папярочныя перасекі... - - + + Cross-sections Папярочныя перасекі @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Паліганальная сетка - + Decimation... Спрасціць... - - - + + + Decimates a mesh Спрашчэнне паліганальнай сеткі @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Паліганальная сетка - + Difference Розніца @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Паліганальная сетка - + Face info Інфармацыя аб грані - - + + Information about face Інфармацыя аб грані @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Паліганальная сетка - + Check solid mesh Праверыць суцэльнасць паліганальнай сеткі - - + + Checks whether the mesh is a solid Правярае, ці з'яўляецца паліганальная сетка суцэльным целам @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Паліганальная сетка - + Evaluate and repair mesh... Ацаніць і аднавіць паліганальную сетку... - - + + Opens a dialog to analyze and repair a mesh Адчыняе дыялогавае акно для даследавання і аднаўлення паліганальнай сеткі @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Паліганальная сетка - + Export mesh... Экспартаваць паліганальную сетку... - - + + Exports a mesh to file Экспартуе паліганальную сетку ў файл @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Паліганальная сетка - + Close hole Зачыніць адтуліну - - + + Close holes interactively Інтэрактыўна зачыняе адтуліну @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Паліганальная сетка - + Fill holes... Запоўніць адтуліну... - - + + Fill holes of the mesh Запаўняе адтуліны паліганальнай сеткі @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Паліганальная сетка - + Flip normals Павярнуць вектары нармалі - - + + Flips the normals of the mesh Паварочвае вектары нармалі паліганальнай сеткі @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Паліганальная сетка - + Create mesh from geometry... Стварыць паліганальную сетку па геаметрыі... - - + + Create mesh from the selected geometry Стварае паліганальную сетку з абранай геаметрыі @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Паліганальная сетка - + Create mesh from shape... Стварыць паліганальную сетку з фігуры... - + Tessellate shape Мазаічная фігура @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Паліганальная сетка - + Harmonize normals Узгадніць вектары нармалі - - + + Harmonizes the normals of the mesh Узгадняе вектары нармалі паліганальнай сеткі @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Паліганальная сетка - + Import mesh... Імпартаваць паліганальную сетку... - - + + Imports a mesh from file Імпартуе паліганальную сетку з файла @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Паліганальная сетка - + Intersection Перасячэнне @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Паліганальная сетка - + Merge Аб'яднаць - + Merges selected meshes into one Аб'яднае абраныя паліганальныя сеткі ў адну @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Паліганальная сетка - + Cut mesh Рэзаць паліганальную сетку - - + + Cuts a mesh with a picked polygon Выразае паліганальную сетку, якая абмежавана абраным шматкутнікам @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Паліганальная сетка - + Make segment Зрабіць сегмент - - + + Creates a mesh segment Стварае сегмент паліганальнай сеткі @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Паліганальная сетка - + Split mesh Падзяліць паліганальную сетку - - + + Splits a mesh into two meshes Падзяляе паліганальную сетку ў дзве паліганальныя сеткі @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Паліганальная сетка - + Trim mesh Абрэзаць паліганальную сетку - - + + Trims a mesh with a picked polygon Абразае паліганальную сетку, якая абмежавана абраным шматкутнікам @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Паліганальная сетка - + Refinement... Удасканаліць... - - + + Refine existing mesh Удасканальвае бягучую паліганальную сетку @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Паліганальная сетка - + Remove components by hand... Выдаліць кампаненты ўручную... - - + + Mark a component to remove it from the mesh Адзначыць кампанент да выдалення з паліганальнай сеткі @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Паліганальная сетка - + Remove components... Выдаліць кампаненты... - - + + Remove topologic independent components from the mesh Выдаліць тапалагічныя незалежныя кампаненты з паліганальнай сеткі @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Паліганальная сетка - + Scale... Маштаб... - + Scale selected meshes Маштаб абраных паліганальных сетак @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Паліганальная сетка - + Create section from mesh and plane Стварыць перасек з паліганальнай сеткі і плоскасці - - + + Section from mesh and plane Перасек з паліганальнай сеткі і плоскасці @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Паліганальная сетка - + Create mesh segments... Стварыць адрэзкі паліганальнай сеткі... - - + + Create mesh segments Стварыць адрэзкі паліганальнай сеткі @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Паліганальная сетка - + Create mesh segments from best-fit surfaces... Стварае адрэзкі паліганальнай сеткі з найлепшай адпаведнасцю паверхні... - - + + Create mesh segments from best-fit surfaces Стварае адрэзкі паліганальнай сеткі з найлепшай адпаведнасцю паверхні @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Паліганальная сетка - + Smooth... Згладзіць... - - + + Smooth the selected meshes Згладжвае абраныя паліганальныя сеткі @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Паліганальная сетка - + Split by components Падзяліць па кампанентах - + Split selected mesh into its components Падзяляе абраныя паліганальныя сеткі па кампанентах @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Паліганальная сетка - + Trim mesh with a plane Абрэзаць паліганальную сетку плоскасцю - - + + Trims a mesh with a plane Абразае паліганальную сетку плоскасцю @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Паліганальная сетка - + Union Аб'яднанне @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Паліганальная сетка - + Curvature plot Графік крывізны - - + + Calculates the curvature of the vertices of a mesh Вылічае крывізну вяршыні паліганальнай сеткі @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh - Паліганальная сетка + Mesh - + Curvature info Інфармацыя па крывізне - - + + Information about curvature Інфармацыя аб крывізне @@ -672,144 +672,144 @@ Аб'яднаць паліганальную сетку - + Mesh difference Розніца паліганальнай сеткі - + Mesh intersection Перакрыжаванне паліганальнай сеткі - + Import Mesh Імпартаваць паліганальную сетку - + Mesh VertexCurvature Крывізна вяршыні паліганальнай сеткі - + Mesh Smoothing Згладзіць паліганальную сетку - + Harmonize mesh normals Узгадніць вектары нармалі паліганальнай сеткі - + Flip mesh normals Павярнуць вектары нармалі паліганальнай сеткі - + Fill up holes Запоўніць адтуліны - + Mesh merge Зліць паліганальныя сеткі - + Mesh split Падзяліць паліганальную сетку - + Mesh scale Маштабаваць паліганальную сетку - + Mesh Decimating Спрасціць паліганальную сетку - + Harmonize normals Узгадніць вектары нармалі - + Remove non-manifolds Выдаліць неаднавобразныя - + Fix indices Выправіць індыкатары - + Remove degenerated faces Выдаліць выраджаныя грані - + Remove duplicated faces Выдаліць паўторныя грані - + Remove duplicated points Выдаліць паўторныя кропкі - + Fix self-intersections Выправіць самаперакрыжаванне - + Remove folds Выдаліць зморшчыны - + Repair mesh Аднавіць паліганальную сетку - + Delete selection Выдаліць абраныя - - + + Cut Разрэзаць - - + + Trim Абрэзка - + Split Падзяліць - + Segment Сегмент - + Delete Выдаліць - + Fill hole Запоўніць адтуліну @@ -838,7 +838,7 @@ - + Absolute number Абсалютны нумар @@ -848,7 +848,7 @@ Дакладнасць - + Absolute number (Maximum: %1) Абсалютны нумар (Найбольшае значэнне: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Налады... - - + + No selection Не абрана - - - - - - - - - - - + + + + + + + + + + + No information Без інфармацыі - + Orientation Арыентацыя - + No flipped normals Без павернутых вектараў нармалей - + %1 flipped normals %1 павернутых вектараў нармалі - + No non-manifolds Без аднастайнасці - + %1 non-manifolds %1 аднастайнасцяў - - + + Non-manifolds Аднастайныя - + Cannot remove non-manifolds Не атрымалася выдаліць аднастайнасць - + Invalid face indices Хібныя індэксы грані - + Invalid point indices Хібныя індэксы кропкі - + Multiple point indices Множныя індэксы кропкі - + Invalid neighbour indices Хібныя суседнія індэксы - + No invalid indices Без хібных індэксаў - + Indices Індэксы - + No degenerations Без скажэнняў - + %1 degenerated faces %1 скажоных граняў - + Degenerations Скажэнні - + No duplicated faces Без паўторных граняў - + %1 duplicated faces %1 паўторных граняў - + Duplicated faces Паўторныя грані - + No duplicated points Без паўторных кропак - - + + Duplicated points Паўторныя кропкі - + No self-intersections Без самаперакрыжаванняў - + Self-intersections Самаперакрыжаванні - + No folds on surface Без зморшчын на паверхні - + %1 folds on surface %1 зморшчын на паверхні - + Folds Зморшчыны - - + + Mesh repair Аднавіць паліганальную сетку @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Стварыць %1 - + No active document Без бягучага дакумента @@ -1366,7 +1366,7 @@ Вышыня: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Налада паказвае, ці ўжываецца сціск ZIP пры запісу файла ў фармаце AMF @@ -1548,48 +1548,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Аўтаматычна - + Adaptive Адаптыўны - + Frontal Пярэдні - + Frontal Quad Пярэдні чатырохкутнік - + Parallelograms Паралелаграмы - - + + Time: Час: - + Running gmsh... Запуск Gmsh... - + Failed to start Не атрымалася запусціць - + Error Памылка @@ -1597,22 +1597,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Дадаць трыкутнік - + Flip normal Павярнуць вектар нармалі - + Clear Ачысціць - + Finish Скончыць @@ -1620,7 +1620,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Скончыць @@ -1628,47 +1628,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Запаўненне паверхні - + Parameters Налады - + Selection Выдзяленне - + Region Вобласць - + Triangle Трыкутнік - + Clear Ачысціць - + Compute Вылічыць - + No selection Не абрана - + Before fitting the surface select an area. Перад запаўненнем паверхні абярыце вобласць. @@ -1927,29 +1927,29 @@ to a smoother appearance. Сфера - - + + Base Асноўныя - + Normal Звычайны - + Axis Вось - - + + Radius Радыус - + Center Па цэнтры @@ -1983,12 +1983,12 @@ to a smoother appearance. Прымаць толькі трыкутнікі з павернутымі вектарамі нармалі да экрану - + Use a brush tool to select the area Ужываць інструмент пэндзля, каб абраць вобласць - + Clears completely the selected area Цалкам ачысціць абраную вобласць @@ -1996,14 +1996,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Выдаліць - - + + Invert Інвертаваць @@ -2011,38 +2011,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Колькасць кропак: - + Number of facets: Колькасць граняў: - + Minimum bound: Найменшая мяжа: - + Maximum bound: Найбольшая мяжа: - + Mesh info box Інфармацыйнае акно аб паліганальнай сеткі - + Mesh info Інфармацыя аб паліганальнай сеткі - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2050,7 +2050,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Прывязкі %1: @@ -2058,26 +2058,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Пры запуску OpenSCAD адбылася невядомая памылка. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD не знойдзена ў вашай сістэме. @@ -2087,7 +2087,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Ацаніць і аднавіць паліганальную сетку @@ -2095,241 +2095,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Праецыраванне - + Import-Export Імпарт-Экспарт - + All Mesh Files Усе файлы паліганальнай сеткі - - + + Binary STL Двайковы STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Двайковая паліганальная сетка - - + + Alias Mesh Псеўданім паліганальнай сеткі - - + + Object File Format Фармат файла аб'екту - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files Усе файлы - + Import mesh Імпартаваць паліганальную сетку - + Simple Model Format Просты фармат мадэлі - + Inventor V2.1 ascii Inventor V2.1 у ASCII - + X3D Extensible 3D X3D Extensible 3D (*. x3d) - + Compressed X3D Сціснуты X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Сціснуты VRML 2.0 - + Nastran Nastran - + Python module def Вызначэнне модуля Python - + Asymptote Format Фармат асімптоты - + 3D Manufacturing Format Фармат 3D-вытворчасці - + Export mesh Экспартаваць паліганальную сетку - + Meshing Tolerance Дакладнасць паліганальнай сеткі - + Enter tolerance for meshing geometry: Увядзіце дакладнасць для геаметрыі паліганальнай сеткі: - + The mesh '%1' is not a solid. Паліганальная сетка '%1' не з'яўляецца суцэльным целам. - + The mesh '%1' is a solid. Паліганальная сетка '%1' з'яўляецца суцэльным целам. - + Solid Mesh Паліганальная сетка суцэльнага цела - + Boundings Прывязкі - + Fill holes Запоўніць адтуліны - + Fill holes with maximum number of edges: Запаўняе адтуліны з найбольшай колькасцю рэбраў: - + Scaling Маштабаванне - + Enter scaling factor: Увядзіце каэфіцыент маштабавання: - + [Points: %1, Edges: %2, Faces: %3] [Кропак: %1, рэбраў: %2, граняў: %3] - + Display components Адлюстраваць кампаненты - + Display segments Адлюстраваць адрэзкі - + Display colors Адлюстраваць колеры - - + + Leave info mode Выйсці з інфармацыйнага рэжыму - + Index: %1 Індэкс: %1 - + Leave hole-filling mode Выйсці з рэжыму запаўнення адтулін - + Leave removal mode Выйсці з рэжыму выдалення - + Delete selected faces Выдаліць абраныя грані - + Clear selected faces Зныць выбар з абраных граняў - + Annotation Заметка diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ca.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ca.ts index bf510bab2e..40e048d6ec 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ca.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ca.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Afegeix un triangle - - + + Add triangle manually to a mesh Afegeix manualment un triangle a una malla @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Informació dels vincles... - - + + Shows the boundings of the selected mesh Mostra els vincles de la malla seleccionada @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Sòlid regular... - - + + Builds a regular solid Construeix un sòlid regular @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Interseccions... - - + + Cross-sections Interseccions @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Simplificació... - - - + + + Decimates a mesh Simplifica una malla @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Diferència @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Informació de la cara - - + + Information about face Informació sobre la cara @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Comprova si la malla és un sòlid - - + + Checks whether the mesh is a solid Comprova si la malla és un sòlid @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Avalua i repara la malla... - - + + Opens a dialog to analyze and repair a mesh Obri un diàleg per a analitzar i reparar una malla @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Exporta la malla... - - + + Exports a mesh to file Exporta una malla a un fitxer @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Tanca el forat - - + + Close holes interactively Tanca forats interactivament @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Ompli els forats... - - + + Fill holes of the mesh Ompli els forats de la malla @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Inverteix les normals - - + + Flips the normals of the mesh Inverteix les normals de la malla @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Crea una malla a partir de la geometria... - - + + Create mesh from the selected geometry Crea una malla a partir de la geometria seleccionada @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Crea una malla a partir d'una forma... - + Tessellate shape Tesel·la la forma @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Harmonitza les normals - - + + Harmonizes the normals of the mesh Harmonitza les normals de la malla @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Importa la malla... - - + + Imports a mesh from file Importa una malla des d'un fitxer @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Intersecció @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Fusiona - + Merges selected meshes into one Fusiona les malles seleccionades en una @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Retalla la malla - - + + Cuts a mesh with a picked polygon Retalla una malla amb un polígon seleccionat @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Fes un segment - - + + Creates a mesh segment Crea un segment de malla @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Divideix la malla - - + + Splits a mesh into two meshes Divideix una malla en dues malles @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Retalla la malla - - + + Trims a mesh with a picked polygon Retalla una malla amb un polígon seleccionat @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Millora... - - + + Refine existing mesh Millora la malla existent @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Elimina components manualment... - - + + Mark a component to remove it from the mesh Marca un component per a eliminar-lo de la malla @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Elimina components... - - + + Remove topologic independent components from the mesh Suprimeix els components topològics independents de la malla @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Escala... - + Scale selected meshes Escala malles seleccionades @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Crea una secció a partir d'una malla i un pla - - + + Section from mesh and plane Secció a partir d'una malla i un pla @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Crea segments de malla... - - + + Create mesh segments Crea segments de malla @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Crea segments de malla a partir de les superfícies que s'ajusten millor... - - + + Create mesh segments from best-fit surfaces Crea segments de malla a partir de les superfícies que s'ajusten millor @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Suavitza... - - + + Smooth the selected meshes Suavitza les malles seleccionades @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Especejament en components - + Split selected mesh into its components Divideix la malla seleccionades en els seus components @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Retalla la malla amb un pla - - + + Trims a mesh with a plane Retalla una malla amb un pla @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Unió @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Gràfic de Curvatura - - + + Calculates the curvature of the vertices of a mesh Calcula la curvatura dels vèrtexs d'una malla @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Info de la curvatura - - + + Information about curvature Informació de la curvatura @@ -672,144 +672,144 @@ Unir malla - + Mesh difference Diferencia de Malla - + Mesh intersection Intersecció de malla - + Import Mesh Importa la malla - + Mesh VertexCurvature Corbatura de vèrtex de la malla - + Mesh Smoothing Suavitzat de malla - + Harmonize mesh normals Harmonitza les normals de la malla - + Flip mesh normals Inverteix les normals de la malla - + Fill up holes Omplir els forats - + Mesh merge Unir malla - + Mesh split Partir malla - + Mesh scale Escalar Malla - + Mesh Decimating Simplificació de la malla - + Harmonize normals Harmonitza les normals - + Remove non-manifolds Esborra els no desplegables - + Fix indices Arreglar índexs - + Remove degenerated faces Elimina les cares degenerades - + Remove duplicated faces Elimina les cares duplicades - + Remove duplicated points Elimina els punts duplicats - + Fix self-intersections Corregeix auto-interseccions - + Remove folds Eliminar plegs - + Repair mesh Reparar malla - + Delete selection Suprimeix selecció - - + + Cut Talla - - + + Trim Retallar - + Split Dividir - + Segment Segment - + Delete Elimina - + Fill hole Omplir forat @@ -838,7 +838,7 @@ - + Absolute number Nombre absolut @@ -848,7 +848,7 @@ Tolerància - + Absolute number (Maximum: %1) Nombre absolut (Màxim: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Paràmetres... - - + + No selection No s'ha seleccionat - - - - - - - - - - - + + + + + + + + + + + No information Sense informació - + Orientation Orientació - + No flipped normals No hi ha cap normal invertida. - + %1 flipped normals %1 normals invertides - + No non-manifolds No hi ha no desplegables - + %1 non-manifolds %1 no desplefable - - + + Non-manifolds No desplegables - + Cannot remove non-manifolds No es poden suprimir no desplegables - + Invalid face indices Els índexs de cara no són vàlids. - + Invalid point indices Els índexs de punt no són vàlids. - + Multiple point indices Índexs de punt múltiples - + Invalid neighbour indices Els índexs veïns no són vàlids. - + No invalid indices No hi ha cap índex invàlid. - + Indices Índexs - + No degenerations No hi ha cap degeneració. - + %1 degenerated faces %1 cares degenerades - + Degenerations Degeneracions - + No duplicated faces No hi ha cap cara duplicada. - + %1 duplicated faces %1 cares duplicades - + Duplicated faces Cares duplicades - + No duplicated points No hi ha cap punt duplicat. - - + + Duplicated points Punts duplicats - + No self-intersections No hi ha cap autointersecció. - + Self-intersections Autointerseccions - + No folds on surface No hi ha cap plec en la superfície. - + %1 folds on surface %1 plecs en la superfície - + Folds Plecs - - + + Mesh repair Reparació de malla @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Creat %1 - + No active document Document no Actiu @@ -1366,7 +1366,7 @@ Alçada: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Aquest paràmetre indica si la compressió ZIP s'utilitza en escriure un fitxer en format AMF @@ -1544,48 +1544,48 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::GmshWidget - + Automatic Automàtica - + Adaptive Adaptatiu - + Frontal Frontal - + Frontal Quad Quadrilàter frontal - + Parallelograms Paral·lelograms - - + + Time: Temps: - + Running gmsh... S'està executant el Gmsh... - + Failed to start No s'ha pogut iniciar - + Error Error @@ -1593,22 +1593,22 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::MeshFaceAddition - + Add triangle Afegeix un triangle - + Flip normal Inverteix les normals - + Clear Neteja - + Finish Finalitza @@ -1616,7 +1616,7 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::MeshFillHole - + Finish Finalitza @@ -1624,47 +1624,47 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::ParametersDialog - + Surface fit Ajustament de la superfície - + Parameters Paràmetres - + Selection Selecció - + Region Regió - + Triangle Triangle - + Clear Neteja - + Compute Calcula - + No selection No s'ha seleccionat - + Before fitting the surface select an area. Abans d'ajustar la superfície, seleccioneu una àrea. @@ -1923,29 +1923,29 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suauEsfera - - + + Base Base - + Normal Normal - + Axis Eix - - + + Radius Radi - + Center Centre @@ -1979,12 +1979,12 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suauRespecta només els triangles amb les normals mirant la pantalla - + Use a brush tool to select the area Utilitza un pinzell per a seleccionar l'àrea - + Clears completely the selected area Esborra completament l'àrea seleccionada @@ -1992,14 +1992,14 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::TaskRemoveComponents - - + + Delete Elimina - - + + Invert Inverteix @@ -2007,38 +2007,38 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshInfoWatcher - + Number of points: Nombre de punts: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Info de la malla - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2046,7 +2046,7 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau Mesh_BoundingBox - + Boundings of %1: Vincles de %1: @@ -2054,26 +2054,26 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. S'ha produït un error mentre s'executava l'OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. No s'ha trobat l'OpenSCAD al sistema. @@ -2083,7 +2083,7 @@ Visiteu http://www.openscad.org/index.html per a instal·lar-lo. QDockWidget - + Evaluate & Repair Mesh Avalua i repara una malla @@ -2091,241 +2091,241 @@ Visiteu http://www.openscad.org/index.html per a instal·lar-lo. QObject - + Display Visualització - + Import-Export Importació-exportació - + All Mesh Files Tots els fitxers de malla - - + + Binary STL STL binari - - - + + + ASCII STL STL ASCII - - + + Binary Mesh Malla en binari - - + + Alias Mesh Malla d'àlies - - + + Object File Format Format del fitxer d'objecte - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Polígon Stanford - + NASTRAN NASTRAN - - + + All Files Tots els fitxers - + Import mesh Importa la malla - + Simple Model Format Format de Model Únic - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D X3D Comprimit - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 VRML 2.0 comprimit - + Nastran Nastran - + Python module def Mòdul def de Python - + Asymptote Format Format de l'asímptota - + 3D Manufacturing Format Format de fabricació 3D - + Export mesh Exporta la malla - + Meshing Tolerance Tolerància del mallat - + Enter tolerance for meshing geometry: Introdueix la tolerància per a la geometria de mallat: - + The mesh '%1' is not a solid. La malla «%1» no és un sòlid. - + The mesh '%1' is a solid. La malla «%1» és un sòlid. - + Solid Mesh Malla sòlida - + Boundings Vincles - + Fill holes Emplena els forats - + Fill holes with maximum number of edges: Emplena els forats amb un nombre màxim d'arestes: - + Scaling Escalat - + Enter scaling factor: Introduïu el factor d'escala: - + [Points: %1, Edges: %2, Faces: %3] [Punts: %1, Arestes: %2, Cares: %3] - + Display components Mostra els components - + Display segments Mostra els segments - + Display colors Mostra els colors - - + + Leave info mode Surt del mode d'informació - + Index: %1 Índex: %1 - + Leave hole-filling mode Surt del mode d'emplenament de forats - + Leave removal mode Surt del mode de supressió - + Delete selected faces Elimina les cares seleccionades - + Clear selected faces Esborra les cares seleccionades - + Annotation Anotació diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_cs.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_cs.ts index 3100d092e9..aa76653783 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_cs.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_cs.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Přidat trojúhelník - - + + Add triangle manually to a mesh Přidat ručně trojúhelník do tvaru @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Informace o hranicích... - - + + Shows the boundings of the selected mesh Zobrazuje hranici vybrané sítě @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Pravidelné těleso... - - + + Builds a regular solid Vytvoří pravidelné těleso @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Řezy... - - + + Cross-sections Řezy @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Decimation... - - - + + + Decimates a mesh Decimates a mesh @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Rozdíl @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Informace o stěně - - + + Information about face Informace o stěně @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Zkontrolovat síť dílu - - + + Checks whether the mesh is a solid Kontroluje, zda síť je těleso @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Vyhodnotit a opravit síť... - - + + Opens a dialog to analyze and repair a mesh Otevře dialog pro analýzu a opravu sítě @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Exportovat síť... - - + + Exports a mesh to file Exportovat síť do souboru @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Uzavřít díru - - + + Close holes interactively Uzavřít otvory interaktivně @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Výplně otvorů... - - + + Fill holes of the mesh Vyplnit otvory v síti @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Překlopit normály - - + + Flips the normals of the mesh Otočit normálu sítě @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Vytvořit síť z geometrie... - - + + Create mesh from the selected geometry Vytvořit síť z vybrané geometrie @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Vytvoř síť z útvaru... - + Tessellate shape Plátování útvaru @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Uspořádat normály - - + + Harmonizes the normals of the mesh Uspořádá normály sítě @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Importovat síť... - - + + Imports a mesh from file Importuje síť ze souboru @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Průnik @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Sloučit - + Merges selected meshes into one Sloučí vybrané sítě do jedné @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Vyjmout síť - - + + Cuts a mesh with a picked polygon Řez sítí vybraným mnohoúhelníkem @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Vytvořit segment - - + + Creates a mesh segment Vytvoří segment sítě @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Rozdělit síť - - + + Splits a mesh into two meshes Rozdělí síť na dvě @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Oříznout síť - - + + Trims a mesh with a picked polygon Oříznout síť vybraným mnohoúhelníkem @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Refinement... - - + + Refine existing mesh Refine existing mesh @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Ručně odeberte součásti... - - + + Mark a component to remove it from the mesh Označte komponentu k odstranění ze sítě @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Odebrat součásti... - - + + Remove topologic independent components from the mesh Odebrat ze sítě topologicky nezávislé součásti @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Měřítko... - + Scale selected meshes Škálovat vybrané sítě @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Vytvořit průřez ze sítě a roviny - - + + Section from mesh and plane Průřez ze sítě a roviny @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Vytvoření segmentů sítě... - - + + Create mesh segments Vytvoření segmentů sítě @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Vytvořit segmenty sítě z nejlépe odpovídajících ploch... - - + + Create mesh segments from best-fit surfaces Vytvořit segmenty sítě z nejlépe odpovídajících ploch @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Hladké... - - + + Smooth the selected meshes Vyhladit vybrané sítě @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Split by components - + Split selected mesh into its components Split selected mesh into its components @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Oříznout síť pomocí roviny - - + + Trims a mesh with a plane Ořízne síť pomocí roviny @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Sjednocení @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Křivkový graf - - + + Calculates the curvature of the vertices of a mesh Vypočte zakřivení vrcholů sítě @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Informace o zakřivení - - + + Information about curvature Informace o zakřivení @@ -672,144 +672,144 @@ Spojit síť - + Mesh difference Mesh difference - + Mesh intersection Mesh intersection - + Import Mesh Importovat síť - + Mesh VertexCurvature Mesh VertexCurvature - + Mesh Smoothing Vyhlazení sítě - + Harmonize mesh normals Harmonize mesh normals - + Flip mesh normals Flip mesh normals - + Fill up holes Vyplnit otvory - + Mesh merge Mesh merge - + Mesh split Mesh split - + Mesh scale Mesh scale - + Mesh Decimating Mesh Decimating - + Harmonize normals Uspořádat normály - + Remove non-manifolds Remove non-manifolds - + Fix indices Fix indices - + Remove degenerated faces Remove degenerated faces - + Remove duplicated faces Remove duplicated faces - + Remove duplicated points Odstranit duplikované body - + Fix self-intersections Opravit vlastní průsečíky - + Remove folds Odstranit přehyby - + Repair mesh Opravit síť - + Delete selection Smazat výběr - - + + Cut Řezat - - + + Trim Oříznout - + Split Rozdělit - + Segment Segment - + Delete Odstranit - + Fill hole Vyplnit otvor @@ -838,7 +838,7 @@ - + Absolute number Absolutní číslo @@ -848,7 +848,7 @@ Odchylka - + Absolute number (Maximum: %1) Absolutní číslo (maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Nastavení... - - + + No selection Žádný výběr - - - - - - - - - - - + + + + + + + + + + + No information Žádné informace - + Orientation Orientace - + No flipped normals Žádné převrácené normály - + %1 flipped normals %1 převrácených normál - + No non-manifolds Nejsou non-mainfolds - + %1 non-manifolds %1 non-mainfolds - - + + Non-manifolds Non-mainfolds - + Cannot remove non-manifolds Nemohu odstranit non-mainfolds - + Invalid face indices Neplatné indexy povrchů - + Invalid point indices Neplatné indexy bodů - + Multiple point indices Indexy vícenásobných bodů - + Invalid neighbour indices Neplatné sousední indexy - + No invalid indices Žádné neplatné indexy - + Indices Indexy - + No degenerations Žádná degenerace - + %1 degenerated faces %1 degenerovaných ploch - + Degenerations Degenerace - + No duplicated faces Žádné duplicitní plochy - + %1 duplicated faces %1 duplikovaných ploch - + Duplicated faces Duplikované plochy - + No duplicated points Žádné duplicitní body - - + + Duplicated points Duplikované body - + No self-intersections Nesebeprotínající - + Self-intersections Samoprotnutí - + No folds on surface Žádné záhyby na ploše - + %1 folds on surface %1 záhybů na ploše - + Folds Záhyb - - + + Mesh repair Oprava sítě @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Vytvořit %1 - + No active document Žádný aktivní dokument @@ -1366,7 +1366,7 @@ Výška: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Tento parametr udává, jestli je použita komprese ZIP při zapisování souboru do formátu AMF @@ -1550,48 +1550,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Automaticky - + Adaptive Adaptivní - + Frontal Frontal - + Frontal Quad Frontal Quad - + Parallelograms Parallelograms - - + + Time: Čas: - + Running gmsh... Spuštění gmsh... - + Failed to start Nepodařilo se spustit - + Error Chyba @@ -1599,22 +1599,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Přidat trojúhelník - + Flip normal Převrátit normály - + Clear Vyčistit - + Finish Dokončit @@ -1622,7 +1622,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Dokončit @@ -1630,47 +1630,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Proložení povrchu - + Parameters Parametry - + Selection Výběr - + Region Region - + Triangle Trojúhelník - + Clear Vyčistit - + Compute Vypočítat - + No selection Žádný výběr - + Before fitting the surface select an area. Vyberte oblast před proložením plochy. @@ -1929,29 +1929,29 @@ to a smoother appearance. Koule - - + + Base Základna - + Normal Normála - + Axis Osa - - + + Radius Poloměr - + Center Na střed @@ -1985,12 +1985,12 @@ to a smoother appearance. Respektovat pouze trojúhelníky s normály ploch z obrazovky - + Use a brush tool to select the area Použít nástroj štětec pro výběr oblasti - + Clears completely the selected area Zcela vymaže vybranou oblast @@ -1998,14 +1998,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Odstranit - - + + Invert Převrátit @@ -2013,38 +2013,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Počet bodů: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Mesh info - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2052,7 +2052,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Hranice %1: @@ -2060,26 +2060,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Při běhu OpenSCADu došlo k neznámé chybě. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD nelze najít ve Vašem systému. @@ -2089,7 +2089,7 @@ Prosím navštivte http://www.openscad.org/index.html a nainstalujte ho. QDockWidget - + Evaluate & Repair Mesh Vyhodnotit & Opravit síť @@ -2097,241 +2097,241 @@ Prosím navštivte http://www.openscad.org/index.html a nainstalujte ho. QObject - + Display Zobrazení - + Import-Export Import-Export - + All Mesh Files Všechny soubory sítí - - + + Binary STL Binární STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binární síť - - + + Alias Mesh Alias sítě - - + + Object File Format Formát souboru objektu - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Mnohoúhelník Stanford - + NASTRAN NASTRAN - - + + All Files Všechny soubory - + Import mesh Importovat síť - + Simple Model Format Jednoduchá formát modelu - + Inventor V2.1 ascii Inventor V2.1 ASCII - + X3D Extensible 3D X3D rozšířitelné 3D - + Compressed X3D Komprimované X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Komprimované VRML 2.0 - + Nastran Nastran - + Python module def Definice Python modulu - + Asymptote Format Asymptotický formát - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh Exportovat síť - + Meshing Tolerance Tolerance sítě - + Enter tolerance for meshing geometry: Vložit toleranci pro síťovou geometrii: - + The mesh '%1' is not a solid. Síť '%1' netvoří těleso. - + The mesh '%1' is a solid. Síť '%1' je pevná. - + Solid Mesh Síť tělesa - + Boundings Hraniční - + Fill holes Výplně otvorů - + Fill holes with maximum number of edges: Výplně otvorů s největším počtem hran: - + Scaling Škálování - + Enter scaling factor: Vložte měřítko: - + [Points: %1, Edges: %2, Faces: %3] [Body: %1, Hrany: %2, Plochy: %3] - + Display components Zobrazit součásti - + Display segments Zobrazit segmenty - + Display colors Display colors - - + + Leave info mode Opustit info režim - + Index: %1 Index: %1 - + Leave hole-filling mode Opustit režim výplně děr - + Leave removal mode Opustit režim odstranění - + Delete selected faces Odstranit vybrané plochy - + Clear selected faces Smazat vybrané plochy - + Annotation Poznámka diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_de.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_de.ts index 87416bb52b..46a95c7efe 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_de.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_de.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Netz - + Add triangle Dreieck hinzufügen - - + + Add triangle manually to a mesh Dreieck manuell zu einem Netz hinzufügen @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Netz - + Boundings info... Abmessungen... - - + + Shows the boundings of the selected mesh Anzeigen der Abmessungen des gewählten Netzes @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Netz - + Regular solid... Regelgeometrie... - - + + Builds a regular solid Erstellen einer Regelgeometrie @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Netz - + Cross-sections... Schnitte... - - + + Cross-sections Schnitte @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Netz - + Decimation... Dezimierung... - - - + + + Decimates a mesh Dezimiert ein Netz (die Anzahl der Knoten) @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Netz - + Difference Differenz @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Netz - + Face info Dreiecksinformation - - + + Information about face Information über Dreieck @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Netz - + Check solid mesh Netz auf Solid überprüfen - - + + Checks whether the mesh is a solid Überprüft, ob das Netz ein Solid ist @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Netz - + Evaluate and repair mesh... Netz untersuchen und reparieren... - - + + Opens a dialog to analyze and repair a mesh Öffnet einen Dialog zum Analysieren und Reparieren eines Netzes @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Netz - + Export mesh... Netz exportieren... - - + + Exports a mesh to file Netz in eine Datei exportieren @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Netz - + Close hole Loch schließen - - + + Close holes interactively Löcher interaktiv schließen @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Netz - + Fill holes... Löcher schließen... - - + + Fill holes of the mesh Schließt Löcher in dem Netz @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Netz - + Flip normals Normalen umdrehen - - + + Flips the normals of the mesh Dreht die Dreiecksnormalen des Netzes um @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Netz - + Create mesh from geometry... Netz aus Geometrie erstellen... - - + + Create mesh from the selected geometry Erzeuge Netz aus selektierter Geometrie @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Netz - + Create mesh from shape... Netz aus Form erstellen... - + Tessellate shape Form tessellieren @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Netz - + Harmonize normals Normalen ausrichten - - + + Harmonizes the normals of the mesh Richtet die Normalen des Netzes aus @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Netz - + Import mesh... Netz importieren... - - + + Imports a mesh from file Importiert Netz aus einer Datei @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Netz - + Intersection Schnitt @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Netz - + Merge Zusammenführen - + Merges selected meshes into one Ausgewählte Netze zu Einem zusammenführen @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Netz - + Cut mesh Netz schneiden - - + + Cuts a mesh with a picked polygon Schneidet ein Netz mit einem ausgewählten Polygon @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Netz - + Make segment Segment erzeugen - - + + Creates a mesh segment Erzeuge Netz-Segment @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Netz - + Split mesh Netz auftrennen - - + + Splits a mesh into two meshes Netz in zwei Teile trennen @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Netz - + Trim mesh Netz trimmen - - + + Trims a mesh with a picked polygon Ein Netz mit einem gewählten Polygon trimmen @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Netz - + Refinement... Aufbereitung... - - + + Refine existing mesh Vorhandenes Netz aufbereiten @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Netz - + Remove components by hand... Komponente von Hand entfernen... - - + + Mark a component to remove it from the mesh Markiere Komponente um von Hand zu entfernen @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Netz - + Remove components... Komponenten entfernen... - - + + Remove topologic independent components from the mesh Entfernt topologisch unabhängige Komponenten aus dem Netz @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Netz - + Scale... Skalieren... - + Scale selected meshes Skalieren ausgewählter Netze @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Netz - + Create section from mesh and plane Schnittlinie aus Netz und Ebene erstellen - - + + Section from mesh and plane Schnitt aus Netz und Ebene @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Netz - + Create mesh segments... Netz-Segmente erstellen... - - + + Create mesh segments Netz-Segmente erstellen @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Netz - + Create mesh segments from best-fit surfaces... Erstelle Netzsegmente aus angenäherten Oberflächen... - - + + Create mesh segments from best-fit surfaces Erstelle Netzsegmente aus angenäherten Oberflächen @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Netz - + Smooth... Glätten... - - + + Smooth the selected meshes Selektierte Netze glätten @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Netz - + Split by components In Komponenten auftrennen - + Split selected mesh into its components Teilt das ausgewählte Netz in seine Komponenten auf @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Netz - + Trim mesh with a plane Netz mit Ebene trimmen - - + + Trims a mesh with a plane Ein Netz mit einer Ebene trimmen @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Netz - + Union Vereinigung @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Netz - + Curvature plot Krümmungsplot - - + + Calculates the curvature of the vertices of a mesh Berechnet die Krümmungen in den Vertexen eines Netzes @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Netz - + Curvature info Krümmungsinformation - - + + Information about curvature Informationen über Krümmung @@ -672,144 +672,144 @@ Netze Vereinigen - + Mesh difference Netz Differenz - + Mesh intersection Netz Schnittmenge - + Import Mesh Netz importieren - + Mesh VertexCurvature Netzscheitelpunktkrümmung - + Mesh Smoothing Netz glätten - + Harmonize mesh normals Netz-Normalen harmonisieren - + Flip mesh normals Netz-Normalen umdrehen - + Fill up holes Löcher füllen - + Mesh merge Netze zusammenführen - + Mesh split Netz teilen - + Mesh scale Netz skalieren - + Mesh Decimating Netzausdünnung - + Harmonize normals Normalen ausrichten - + Remove non-manifolds Nichtmannigfaltigkeiten entfernen - + Fix indices Indizes reparieren - + Remove degenerated faces Degenerierte Flächen entfernen - + Remove duplicated faces Doppelte Flächen entfernen - + Remove duplicated points Doppelte Punkte entfernen - + Fix self-intersections Selbstdurchdringung korrigieren - + Remove folds Falten entfernen - + Repair mesh Netz reparieren - + Delete selection Auswahl löschen - - + + Cut Schneiden - - + + Trim Zuschneiden - + Split Teilen - + Segment Segment - + Delete Löschen - + Fill hole Loch füllen @@ -838,7 +838,7 @@ - + Absolute number Absolute Anzahl @@ -848,7 +848,7 @@ Toleranz - + Absolute number (Maximum: %1) Absolute Anzahl (Maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Einstellungen... - - + + No selection Keine Auswahl - - - - - - - - - - - + + + + + + + + + + + No information Keine Informationen - + Orientation Orientierung - + No flipped normals Keine verdrehten Normalen - + %1 flipped normals %1 verdrehte Normalen - + No non-manifolds Keine Nichtmannigfaltigkeiten - + %1 non-manifolds %1 Nichtmannigfaltigkeiten - - + + Non-manifolds Nichtmannigfaltigkeiten - + Cannot remove non-manifolds Nichtmannigfaltigkeiten können nicht entfernt werden - + Invalid face indices Ungültige Facettenindexe - + Invalid point indices Ungültige Punktindexe - + Multiple point indices Mehrfache Punktindexe - + Invalid neighbour indices Ungültige Nachbarindexe - + No invalid indices Keine ungültige Indexe - + Indices Indexe - + No degenerations Keine Entartungen - + %1 degenerated faces %1 entartete Facetten - + Degenerations Degenerierungen - + No duplicated faces Keine doppelten Facetten - + %1 duplicated faces %1 doppelte Facetten - + Duplicated faces Doppelte Dreiecke - + No duplicated points Keine doppelten Punkte - - + + Duplicated points Doppelte Punkte - + No self-intersections Keine Selbstdurchdringungen - + Self-intersections Selbstdurchdringungen - + No folds on surface Keine Oberflächenfalten - + %1 folds on surface %1 Oberflächenfalten - + Folds Falten - - + + Mesh repair Netz reparieren @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Erstelle %1 - + No active document Kein aktives Dokument @@ -1366,7 +1366,7 @@ Höhe: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Dieser Parameter zeigt an, ob ZIP-Komprimierung @@ -1547,48 +1547,48 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet MeshGui::GmshWidget - + Automatic Automatisch - + Adaptive Adaptiv - + Frontal Frontal - + Frontal Quad Frontales Quad - + Parallelograms Parallelogramme - - + + Time: Zeit: - + Running gmsh... Gmsh ausführen... - + Failed to start Start fehlgeschlagen - + Error Fehler @@ -1596,22 +1596,22 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet MeshGui::MeshFaceAddition - + Add triangle Dreieck hinzufügen - + Flip normal Normalen umdrehen - + Clear Löschen - + Finish Fertig @@ -1619,7 +1619,7 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet MeshGui::MeshFillHole - + Finish Fertig @@ -1627,47 +1627,47 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet MeshGui::ParametersDialog - + Surface fit Flächen-Annäherung - + Parameters Parameter - + Selection Auswahl - + Region Bereich - + Triangle Dreieck - + Clear Leeren - + Compute Berechnen - + No selection Keine Auswahl - + Before fitting the surface select an area. Bevor Sie die Oberfläche annähern, wählen Sie einen Bereich aus. @@ -1727,7 +1727,7 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet Clear - Leeren + Löschen @@ -1892,7 +1892,7 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet Plane - Ebene + Fläche @@ -1926,29 +1926,29 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendetKugel - - + + Base Basis - + Normal Normal - + Axis Achse - - + + Radius Radius - + Center Zentrum @@ -1969,7 +1969,7 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet Clear - Löschen + Leeren @@ -1982,12 +1982,12 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendetNur Dreiecke mit Normalen beachten, die zum Bildschirm zeigen - + Use a brush tool to select the area Verwenden Sie einen Pinsel, um den Bereich auszuwählen - + Clears completely the selected area Löscht den ausgewählten Bereich vollständig @@ -1995,14 +1995,14 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet MeshGui::TaskRemoveComponents - - + + Delete Löschen - - + + Invert Umkehren @@ -2010,38 +2010,38 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet MeshInfoWatcher - + Number of points: Anzahl Punkte: - + Number of facets: Dreiecksanzahl: - + Minimum bound: Untergrenze: - + Maximum bound: Obergrenze: - + Mesh info box Netz-Infobox - + Mesh info Netz-Informationen - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2049,7 +2049,7 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet Mesh_BoundingBox - + Boundings of %1: Abmessungen von %1: @@ -2057,26 +2057,26 @@ Flächenwinkel < SickenWinkel, wird glattes Schattieren angewendet Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Beim Ausführen von OpenSCAD ist ein unbekannter Fehler aufgetreten. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD kann auf Ihrem System nicht gefunden werden. @@ -2086,7 +2086,7 @@ Bitte besuchen Sie http://www.openscad.org/index.html, um es zu installieren. QDockWidget - + Evaluate & Repair Mesh Netz auswerten & reparieren @@ -2094,241 +2094,241 @@ Bitte besuchen Sie http://www.openscad.org/index.html, um es zu installieren. QObject - + Display Anzeige - + Import-Export Import / Export - + All Mesh Files Alle Netzdateien - - + + Binary STL Binäres STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binäres Mesh - - + + Alias Mesh Alias-Mesh - - + + Object File Format OFF-Dateiformat - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford-Polygon - + NASTRAN NASTRAN - - + + All Files Alle Dateien - + Import mesh Netz importieren - + Simple Model Format Einfaches Modellformat - + Inventor V2.1 ascii Inventor V2.1 ASCII - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Komprimierte X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2. 0 - + Compressed VRML 2.0 Komprimiertes VRML 2.0 - + Nastran NASTRAN - + Python module def Python-Modul Definition - + Asymptote Format Asymptote-Format - + 3D Manufacturing Format 3D-Fertigungsformat - + Export mesh Netz exportieren - + Meshing Tolerance Toleranz - + Enter tolerance for meshing geometry: Toleranz zum Erzeugen von Dreiecksnetz eingeben: - + The mesh '%1' is not a solid. Das Netz '%1' ist kein Solid. - + The mesh '%1' is a solid. Das Netz '%1' ist ein Solid. - + Solid Mesh Fester Körper - + Boundings Abmessungen - + Fill holes Löcher schließen - + Fill holes with maximum number of edges: Löcher schließen mit maximaler Anzahl Kanten: - + Scaling Skalieren - + Enter scaling factor: Geben Sie den Skalierungsfaktor an: - + [Points: %1, Edges: %2, Faces: %3] [Punkte: %1, Kanten: %2, Flächen: %3] - + Display components Komponenten anzeigen - + Display segments Segmente anzeigen - + Display colors Farben anzeigen - - + + Leave info mode Info-Modus verlassen - + Index: %1 Index: %1 - + Leave hole-filling mode Löcher-Schließen-Modus verlassen - + Leave removal mode Entfernen-Modus verlassen - + Delete selected faces Selektierte Dreiecke löschen - + Clear selected faces Auswahl aufheben - + Annotation Anmerkung diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_el.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_el.ts index b40be3d35e..0b57a3b78e 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_el.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_el.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Προσθέστε τρίγωνο - - + + Add triangle manually to a mesh Προσθέστε τρίγωνο σε κάποιο πλέγμα χειροκίνητα @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh - Mesh + Πλέγμα - + Boundings info... Πληροφορίες οριοθετήσεων... - - + + Shows the boundings of the selected mesh Εμφανίζει τις οριοθετήσεις του επιλεγμένου πλέγματος @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh - Mesh + Πλέγμα - + Regular solid... Κανονικό στερεό... - - + + Builds a regular solid Χτίζει ένα κανονικό στερεό @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh - Mesh + Πλέγμα - + Cross-sections... Ορθογώνιες διατομές... - - + + Cross-sections Ορθογώνιες διατομές @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh - Mesh + Πλέγμα - + Decimation... Απλοποιήσει πλέγματος... - - - + + + Decimates a mesh Μείωση Δεκαδικών πλέγματος @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh - Mesh + Πλέγμα - + Difference Αφαίρεση @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh - Mesh + Πλέγμα - + Face info Πληροφορίες όψης - - + + Information about face Πληροφορίες σχετικά με την όψη @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh - Mesh + Πλέγμα - + Check solid mesh Έλεγχος στερεού πλέγματος - - + + Checks whether the mesh is a solid Ελέγχει αν το πλέγμα είναι στερεό @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh - Mesh + Πλέγμα - + Evaluate and repair mesh... Αξιολόγηση και επισκευή πλέγματος... - - + + Opens a dialog to analyze and repair a mesh Ανοίγει ένα παράθυρο διαλόγου για την ανάλυση και την επισκευή ενός πλέγματος @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh - Mesh + Πλέγμα - + Export mesh... Εξαγωγή πλέγματος... - - + + Exports a mesh to file Εξαγάγει ένα πλέγμα σε αρχείο @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh - Mesh + Πλέγμα - + Close hole Κλείσιμο οπής - - + + Close holes interactively Κλείστε τις οπές διαδραστικά @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh - Mesh + Πλέγμα - + Fill holes... Γέμισμα οπών... - - + + Fill holes of the mesh Γεμίστε τις οπές του πλέγματος @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh - Mesh + Πλέγμα - + Flip normals Αντιστροφή καθέτων διανυσμάτων - - + + Flips the normals of the mesh Αντιστρέφει τα κάθετα διανύσματα του πλέγματος @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh - Mesh + Πλέγμα - + Create mesh from geometry... Δημιουργήστε πλέγμα από γεωμετρικό σχήμα... - - + + Create mesh from the selected geometry Δημιουργήστε πλέγμα από το επιλεγμένο γεωμετρικό σχήμα @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh - Mesh + Πλέγμα - + Create mesh from shape... Δημιουργήστε πλέγμα από σχήμα... - + Tessellate shape Ψηφίδωση σχήματος @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh - Mesh + Πλέγμα - + Harmonize normals Εναρμόνιση καθέτων διανυσμάτων - - + + Harmonizes the normals of the mesh Εναρμονίζει τα κάθετα διανύσματα του πλέγματος @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh - Mesh + Πλέγμα - + Import mesh... Εισαγωγή πλέγματος... - - + + Imports a mesh from file Εισάγει ένα πλέγμα από αρχείο @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh - Mesh + Πλέγμα - + Intersection Σημείο τομής @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh - Mesh + Πλέγμα - + Merge Συγχώνευση - + Merges selected meshes into one Συγχωνεύει επιλεγμένα πλέγματα σε ένα @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh - Mesh + Πλέγμα - + Cut mesh Περικοπή πλέγματος - - + + Cuts a mesh with a picked polygon Περικόπτει ένα πλέγμα με ένα επιλεγμένο πολύγωνο @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh - Mesh + Πλέγμα - + Make segment Δημιουργήστε τμήμα - - + + Creates a mesh segment Δημιουργεί ένα τμήμα πλέγματος @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh - Mesh + Πλέγμα - + Split mesh Διαιρέστε πλέγμα - - + + Splits a mesh into two meshes Διαιρεί ένα πλέγμα σε δύο πλέγματα @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh - Mesh + Πλέγμα - + Trim mesh Περικοπή ακμών πλέγματος - - + + Trims a mesh with a picked polygon Περικόπτει τις ακμές ενός πλέγματος με ένα επιλεγμένο αντικείμενο @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh - Mesh + Πλέγμα - + Refinement... Βελτίωση, διόρθωση... - - + + Refine existing mesh Βελτίωση υπάρχοντος πλέγματος @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh - Mesh + Πλέγμα - + Remove components by hand... Αφαιρέστε στοιχεία χειροκίνητα... - - + + Mark a component to remove it from the mesh Επισημάνετε ένα στοιχείο για να το αφαιρέσετε από το πλέγμα @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh - Mesh + Πλέγμα - + Remove components... Αφαιρέστε στοιχεία... - - + + Remove topologic independent components from the mesh Αφαιρέστε τοπολογικά ανεξάρτητα στοιχεία από το πλέγμα @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh - Mesh + Πλέγμα - + Scale... Κλιμακοποίηση... - + Scale selected meshes Κλιμακοποίηση επιλεγμένων πλεγμάτων @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh - Mesh + Πλέγμα - + Create section from mesh and plane Δημιουργήστε τομή από πλέγμα και επίπεδο - - + + Section from mesh and plane Τομή από πλέγμα και επίπεδο @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh - Mesh + Πλέγμα - + Create mesh segments... Δημιουργήστε τμήματα πλέγματος... - - + + Create mesh segments Δημιουργήστε τμήματα πλέγματος @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh - Mesh + Πλέγμα - + Create mesh segments from best-fit surfaces... Δημιουργήστε τμήματα πλέγματος από τις βέλτιστες επιφάνειες... - - + + Create mesh segments from best-fit surfaces Δημιουργήστε τμήματα πλέγματος από τις βέλτιστες επιφάνειες @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh - Mesh + Πλέγμα - + Smooth... Εξομάλυνση... - - + + Smooth the selected meshes Εξομαλύνετε τα επιλεγμένα πλέγματα @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh - Mesh + Πλέγμα - + Split by components Διαχωρισμός ανά εξαρτήματα - + Split selected mesh into its components Διαίρεση του επιλεγμένου πλέγματος στα εξαρτήματά του @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh - Mesh + Πλέγμα - + Trim mesh with a plane Περικοπή ακμών πλέγματος με επίπεδο - - + + Trims a mesh with a plane Περικόπτει τις ακμές ενός πλέγματος με ένα επίπεδο @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh - Mesh + Πλέγμα - + Union Ένωση @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh - Mesh + Πλέγμα - + Curvature plot Γράφημα καμπυλότητας - - + + Calculates the curvature of the vertices of a mesh Υπολογίζει την καμπυλότητα των κορυφών ενός πλέγματος @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Πληροφορίες καμπυλότητας - - + + Information about curvature Πληροφορίες σχετικά με την καμπυλότητα @@ -672,144 +672,144 @@ Ένωση πλέγματος - + Mesh difference Διαφορά πλέγματος - + Mesh intersection Διατομή πλέγματος - + Import Mesh Εισαγωγή πλέγματος - + Mesh VertexCurvature Καμπυλότητα κορυφής πλέγματος - + Mesh Smoothing Εξομάλυνση πλέγματος - + Harmonize mesh normals Εναρμόνιση των κανονικών πλεγμάτων - + Flip mesh normals Αναδιπλούμενο πλέγμα - + Fill up holes Γέμισμα οπών - + Mesh merge Συγχώνευση πλεγμάτων - + Mesh split Διαχωρισμός πλεγμάτων - + Mesh scale Κλίμακα πλέγματος - + Mesh Decimating Μειώσει αριθμό κορυφών, ακμών και τριγώνων στο πλέγμα - + Harmonize normals Εναρμόνιση καθέτων διανυσμάτων - + Remove non-manifolds Αφαιρέστε τα μη πολλαπλάσια - + Fix indices Διόρθωση δεικτών - + Remove degenerated faces Αφαίρεση εκφυλισμένων όψεων - + Remove duplicated faces Αφαίρεση διπλών όψεων - + Remove duplicated points Αφαίρεση διπλότυπων σημείων - + Fix self-intersections Διόρθωση Αυτό - διασταυρώσεων - + Remove folds Αφαίρεση πτυχών - + Repair mesh Επισκευή πλέγματος - + Delete selection Διαγραφή επιλογής - - + + Cut Περικοπή - - + + Trim Περικοπή - + Split Χωρισμός - + Segment Τμήμα - + Delete Διαγραφή - + Fill hole Γέμισμα οπής @@ -838,7 +838,7 @@ - + Absolute number Απόλυτος αριθμός @@ -848,7 +848,7 @@ Ανοχή - + Absolute number (Maximum: %1) Απόλυτος αριθμός (Μέγιστο: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Ρυθμίσεις... - - + + No selection Καμία επιλογή - - - - - - - - - - - + + + + + + + + + + + No information Καμία πληροφορία - + Orientation Προσανατολισμός - + No flipped normals Κανένα αντεστραμμένο κάθετο διάνυσμα - + %1 flipped normals %1 αντεστραμμένα κάθετα διανύσματα - + No non-manifolds Κανένα μη-πολλαπλό - + %1 non-manifolds %1 μη-πολλαπλά - - + + Non-manifolds Μη-πολλαπλά - + Cannot remove non-manifolds Αδυναμία αφαίρεσης των μη-πολλαπλών - + Invalid face indices Μη έγκυροι δείκτες όψεων - + Invalid point indices Μη έγκυροι δείκτες σημείων - + Multiple point indices Πολλαπλοί δείκτες σημείων - + Invalid neighbour indices Μη έγκυροι γειτονικοί δείκτες - + No invalid indices Κανένας μη έγκυρος δείκτης - + Indices Δείκτες - + No degenerations Κανένας εκφυλισμός - + %1 degenerated faces %1 εκφυλισμένες όψεις - + Degenerations Εκφυλισμοί - + No duplicated faces Καμία διπλή όψη - + %1 duplicated faces %1 διπλές όψεις - + Duplicated faces Διπλές όψεις - + No duplicated points Κανένα διπλό σημείο - - + + Duplicated points Διπλά σημεία - + No self-intersections Χωρίς αυτοτομές - + Self-intersections Αυτοτομές - + No folds on surface Καμία πτύχωση στην επιφάνεια - + %1 folds on surface %1 πτυχώσεις στην επιφάνεια - + Folds Πτυχώσεις - - + + Mesh repair Επισκευή πλέγματος @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Δημιουργία %1 - + No active document Κανένα ενεργό έγγραφο @@ -1366,7 +1366,7 @@ Ύψος: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Αυτή η παράμετρος υποδεικνύει αν χρησιμοποιείται η συμπίεση ZIP όταν γράφετε ένα αρχείο σε μορφή AMF @@ -1550,48 +1550,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Αυτόματη - + Adaptive Προσαρμοσμένο - + Frontal Μετωπικό - + Frontal Quad Μετωπικό Τετράγωνο - + Parallelograms Παραλληλόγραμμα - - + + Time: Ώρα: - + Running gmsh... Εκτέλεση gmsh... - + Failed to start Αποτυχία εκκίνησης - + Error Σφάλμα @@ -1599,22 +1599,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Προσθέστε τρίγωνο - + Flip normal Αντιστροφή κάθετου διανύσματος - + Clear Εκκαθάριση - + Finish Ολοκλήρωση @@ -1622,7 +1622,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Ολοκλήρωση @@ -1630,47 +1630,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Εφαρμογή επιφάνειας - + Parameters Παράμετροι - + Selection Επιλογή - + Region Περιοχή - + Triangle Τρίγωνο - + Clear Εκκαθάριση - + Compute Υπολογισμός - + No selection Καμία επιλογή - + Before fitting the surface select an area. Πριν την τοποθέτηση της επιφάνειας επιλέξτε μια περιοχή. @@ -1929,29 +1929,29 @@ to a smoother appearance. Σφαίρα - - + + Base Βάση - + Normal Κανονικό - + Axis Άξονας - - + + Radius Ακτίνα - + Center Κέντρο @@ -1985,12 +1985,12 @@ to a smoother appearance. Διατήρηση μόνο των τριγώνων των οποίων τα κάθετα διανύσματα τείνουν προς την οθόνη - + Use a brush tool to select the area Χρησιμοποιήστε ένα εργαλείο πινέλου για να επιλέξετε την περιοχή - + Clears completely the selected area Καθαρίζει εντελώς την επιλεγμένη περιοχή @@ -1998,14 +1998,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Διαγραφή - - + + Invert Αντιστροφή @@ -2013,38 +2013,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Αριθμός σημείων: - + Number of facets: Αριθμός όψεων: - + Minimum bound: Ελάχιστο όριο: - + Maximum bound: Μέγιστο όριο: - + Mesh info box Πλαίσιο πληροφοριών πλέγματος - + Mesh info Πληροφορίες πλέγματος - - + + X: %1 Y: %2 Z: %3 Άξονες X: %1 "Y: %2 "Z: %3 @@ -2052,7 +2052,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Ορεοθέτηση του %1: @@ -2060,26 +2060,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Προέκυψε άγνωστο σφάλμα κατά την εκτέλεση του OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. To OpenSCAD δεν δύναται να βρεθεί στον υπολογιστή σας. @@ -2089,7 +2089,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Αξιολόγηση & Επισκευή Πλέγματος @@ -2097,241 +2097,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Απεικόνιση - + Import-Export Εισαγωγή-Εξαγωγή - + All Mesh Files Όλα τα Αρχεία Πλεγμάτων - - + + Binary STL Δυαδικό STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Πλέγμα Δυαδικού Συστήματος - - + + Alias Mesh Πλέγμα Alias - - + + Object File Format Μορφή Αρχείου Αντικειμένου - + Inventor V2.1 ASCII Εφευρέτης V2.1 ASCII - - + + Stanford Polygon Πολύγωνο Stanford - + NASTRAN NASTRAN - - + + All Files Όλα τα Αρχεία - + Import mesh Εισαγωγή πλέγματος - + Simple Model Format Απλή μορφή μοντέλου - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Επεκτάσιμο 3D - + Compressed X3D Συμπιεσμένο X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Συμπιεσμένο VRML 2.0 - + Nastran Nastran - + Python module def Ορισμός λειτουργικής μονάδας Python - + Asymptote Format Ασύμπτωτη Μορφή - + 3D Manufacturing Format Μορφή Παραγωγής 3D - + Export mesh Εξαγωγή πλέγματος - + Meshing Tolerance Ανοχή Πλεγματοποίησης - + Enter tolerance for meshing geometry: Εισάγετε ανοχή για την γεωμετρία πλεγματοποίησης: - + The mesh '%1' is not a solid. Το πλέγμα '%1' δεν είναι στερεό. - + The mesh '%1' is a solid. Το πλέγμα '%1' είναι στερεό. - + Solid Mesh Στερεό Πλέγμα - + Boundings Οριοθετήσεις - + Fill holes Γέμισμα οπών - + Fill holes with maximum number of edges: Γέμισμα οπών με μέγιστο αριθμό ακμών: - + Scaling Κλίμακα - + Enter scaling factor: Εισάγετε συντελεστή κλίμακας: - + [Points: %1, Edges: %2, Faces: %3] [Σημεία: %1, Ακμές: %2, Όψεις: %3] - + Display components Απεικόνιση στοιχείων - + Display segments Εμφάνιση τμημάτων - + Display colors Εμφάνιση χρωμάτων - - + + Leave info mode Έξοδος από τη λειτουργία πληροφοριών - + Index: %1 Δείκτης: %1 - + Leave hole-filling mode Έξοδος από την λειτουργία γεμίσματος οπών - + Leave removal mode Έξοδος από την λειτουργία αφαίρεσης - + Delete selected faces Διαγραφή επιλεγμένων όψεων - + Clear selected faces Καθαρισμός επιλεγμένων όψεων - + Annotation Σχολιασμός diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_es-AR.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_es-AR.ts index 35fc996a4a..7fa67d9eea 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_es-AR.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_es-AR.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Malla - + Add triangle Agregar triángulo - - + + Add triangle manually to a mesh Agregar triángulo manualmente en una malla @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Malla - + Boundings info... Información de límites... - - + + Shows the boundings of the selected mesh Muestra los límites de la malla seleccionada @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Malla - + Regular solid... Sólido regular... - - + + Builds a regular solid Construye un sólido regular @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Malla - + Cross-sections... Cortes transversales... - - + + Cross-sections Cortes transversales @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Malla - + Decimation... Simplificar... - - - + + + Decimates a mesh Simplificar una malla @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Malla - + Difference Diferencia @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Malla - + Face info Información de cara - - + + Information about face Información sobre la cara @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Malla - + Check solid mesh Comprobar la malla del sólido - - + + Checks whether the mesh is a solid Comprueba si la malla es un sólido @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Malla - + Evaluate and repair mesh... Evaluar y reparar malla... - - + + Opens a dialog to analyze and repair a mesh Abre un diálogo para analizar y reparar una malla @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Malla - + Export mesh... Exportar malla... - - + + Exports a mesh to file Exporta la malla a un archivo @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Malla - + Close hole Cerrar agujero - - + + Close holes interactively Cerrar agujeros de forma interactiva @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Malla - + Fill holes... Rellenar agujeros... - - + + Fill holes of the mesh Rellenar agujeros de la malla @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Malla - + Flip normals Invertir normales - - + + Flips the normals of the mesh Invierte las normales de la malla @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Malla - + Create mesh from geometry... Crea una malla a partir de la geometría... - - + + Create mesh from the selected geometry Crea una malla a partir de la geometría seleccionada @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Malla - + Create mesh from shape... Crear malla desde la forma... - + Tessellate shape Forma de Tessellate @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Malla - + Harmonize normals Armoniza las normales - - + + Harmonizes the normals of the mesh Armoniza las normales de la malla @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Malla - + Import mesh... Importar malla... - - + + Imports a mesh from file Importa una malla desde un archivo @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Malla - + Intersection Intersección @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Malla - + Merge Fusionar - + Merges selected meshes into one Fusionar las mallas seleccionadas en una sola @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Malla - + Cut mesh Cortar malla - - + + Cuts a mesh with a picked polygon Corta una malla con un polígono designado @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Malla - + Make segment Hacer un segmento - - + + Creates a mesh segment Crea un segmento de la malla @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Malla - + Split mesh Dividir malla - - + + Splits a mesh into two meshes Divide una malla en dos mallas @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Malla - + Trim mesh Recortar malla - - + + Trims a mesh with a picked polygon Recorta una malla con un polígono escogido @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Malla - + Refinement... Refinamiento... - - + + Refine existing mesh Refinar malla existente @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Malla - + Remove components by hand... Eliminar componentes a mano... - - + + Mark a component to remove it from the mesh Marcar un componente para eliminarlo de la malla @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Malla - + Remove components... Eliminar componentes... - - + + Remove topologic independent components from the mesh Eliminar componentes topológicos independientes de la malla @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Malla - + Scale... Escala... - + Scale selected meshes Escala las mallas seleccionadas @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Malla - + Create section from mesh and plane Crear corte desde malla y plano - - + + Section from mesh and plane Corte de malla y plano @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Malla - + Create mesh segments... Crear segmentos de malla... - - + + Create mesh segments Crear segmentos de malla @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Malla - + Create mesh segments from best-fit surfaces... Crear segmentos de malla de las superficies que mejor se ajustan... - - + + Create mesh segments from best-fit surfaces Crear segmentos de malla de las superficies que mejor se ajustan @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Malla - + Smooth... Suavizar... - - + + Smooth the selected meshes Suaviza las mallas seleccionadas @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Malla - + Split by components Partir por componentes - + Split selected mesh into its components Partir la malla seleccionada en sus componentes @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Malla - + Trim mesh with a plane Recortar malla con un plano - - + + Trims a mesh with a plane Recorta una malla con un plano @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Malla - + Union Unión @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Malla - + Curvature plot Gráfico de la curvatura - - + + Calculates the curvature of the vertices of a mesh Calcula la curvatura de los vértices de una malla @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Malla - + Curvature info Información de curvatura - - + + Information about curvature Información sobre la curvatura @@ -672,144 +672,144 @@ Unión de malla - + Mesh difference Diferencia de Malla - + Mesh intersection Intersección de malla - + Import Mesh Importar Malla - + Mesh VertexCurvature Curvatura de vértices de malla - + Mesh Smoothing Suavizado de malla - + Harmonize mesh normals Armonizar mallas normales - + Flip mesh normals Invertir normales de malla - + Fill up holes Rellenar agujeros - + Mesh merge Fusionar malla - + Mesh split Partir malla - + Mesh scale Escala de malla - + Mesh Decimating Diezmado de malla - + Harmonize normals Armoniza las normales - + Remove non-manifolds Eliminar no-múltiples - + Fix indices Arreglar índices - + Remove degenerated faces Eliminar caras degeneradas - + Remove duplicated faces Eliminar caras duplicadas - + Remove duplicated points Eliminar puntos duplicados - + Fix self-intersections Corregir auto-intersecciones - + Remove folds Eliminar pliegues - + Repair mesh Reparar malla - + Delete selection Eliminar selección - - + + Cut Cortar - - + + Trim Recortar - + Split Dividir - + Segment Segmento - + Delete Eliminar - + Fill hole Rellenar agujero @@ -838,7 +838,7 @@ - + Absolute number Número absoluto @@ -848,7 +848,7 @@ Tolerancia - + Absolute number (Maximum: %1) Número absoluto (Máximo: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Configuración... - - + + No selection Sin selección - - - - - - - - - - - + + + + + + + + + + + No information Ninguna información - + Orientation Orientación - + No flipped normals Ninguna normal invertida - + %1 flipped normals %1 normales invertidas - + No non-manifolds Sin múltiples - + %1 non-manifolds %1 sin múltiples - - + + Non-manifolds Sin múltiples - + Cannot remove non-manifolds No se pueden eliminar los no-múltiples - + Invalid face indices Índices de cara inválidos - + Invalid point indices Índices de puntos inválidos - + Multiple point indices Índices de puntos múltiples - + Invalid neighbour indices Índices cercanos inválidos - + No invalid indices Sin índices inválidos - + Indices Índices - + No degenerations Sin degeneraciones - + %1 degenerated faces %1 caras degeneradas - + Degenerations Degeneraciones - + No duplicated faces No hay caras duplicadas - + %1 duplicated faces %1 caras duplicadas - + Duplicated faces Caras duplicadas - + No duplicated points No hay puntos duplicados - - + + Duplicated points Puntos duplicados - + No self-intersections Sin auto-intersecciones - + Self-intersections Auto-intersecciones - + No folds on surface Sin pliegues en la superficie - + %1 folds on surface %1 pliegues en la superficie - + Folds Pliegues - - + + Mesh repair Reparación de malla @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Crear %1 - + No active document Ningún documento activo @@ -1348,7 +1348,7 @@ Always export mesh as model type in 3MF format even if not a solid - Always export mesh as model type in 3MF format even if not a solid + Exportar siempre la malla como tipo de modelo en formato 3MF incluso si no es un sólido @@ -1366,7 +1366,7 @@ Altura: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Este parámetro indica si la compresión ZIP @@ -1548,48 +1548,48 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::GmshWidget - + Automatic Automático - + Adaptive Adaptado - + Frontal Frontal - + Frontal Quad Cuadrilátero frontal - + Parallelograms Paralelogramos - - + + Time: Tiempo: - + Running gmsh... Ejecutando gmsh... - + Failed to start Fallo al iniciar - + Error Error @@ -1597,22 +1597,22 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::MeshFaceAddition - + Add triangle Agregar triángulo - + Flip normal Invertir normal - + Clear Limpiar - + Finish Finalizar @@ -1620,7 +1620,7 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::MeshFillHole - + Finish Finalizar @@ -1628,47 +1628,47 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::ParametersDialog - + Surface fit Ajuste de la superficie - + Parameters Parámetros - + Selection Selección - + Region Región - + Triangle Triángulo - + Clear Limpiar - + Compute Calcular - + No selection Sin selección - + Before fitting the surface select an area. Antes de colocar la superficie seleccione un área. @@ -1927,29 +1927,29 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Esfera - - + + Base Base - + Normal Normal - + Axis Eje - - + + Radius Radio - + Center Centro @@ -1983,12 +1983,12 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Sólo se respetan los triángulos con las normales de la pantalla - + Use a brush tool to select the area Use una herramienta de pincel para seleccionar el área - + Clears completely the selected area Borra completamente el área seleccionada @@ -1996,14 +1996,14 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::TaskRemoveComponents - - + + Delete Eliminar - - + + Invert Invertido @@ -2011,38 +2011,38 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshInfoWatcher - + Number of points: Número de puntos: - + Number of facets: Número de facetas: - + Minimum bound: Límite mínimo: - + Maximum bound: Límite máximo: - + Mesh info box Caja de información de la malla - + Mesh info Info de la malla - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2050,7 +2050,7 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Mesh_BoundingBox - + Boundings of %1: Límites de %1: @@ -2058,26 +2058,26 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Ocurrió un error desconocido mientras se ejecutaba OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD no parece instalado en su sistema. Por favor visite http://www.openscad.org/index.html para instalarlo. @@ -2086,7 +2086,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Evaluar & Reparar Malla @@ -2094,241 +2094,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Mostrar - + Import-Export Importar-Exportar - + All Mesh Files Todos los Archivos de Mallas - - + + Binary STL Binario STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binario de la Malla - - + + Alias Mesh Alias de la Malla - - + + Object File Format Formato de Archivo del Objeto - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Polígono Stanford - + NASTRAN NASTRAN - - + + All Files Todos los Archivos - + Import mesh Importar malla - + Simple Model Format Formato de Modelo Simple - + Inventor V2.1 ascii Inventor ascii V2.1 - + X3D Extensible 3D X3D 3D Extensible - + Compressed X3D X3D Comprimido - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Comprimido VRML 2.0 - + Nastran Nastran - + Python module def Módulo def de Python - + Asymptote Format Formato Asymptote - + 3D Manufacturing Format Formato de Manufactura 3D - + Export mesh Exportar la malla - + Meshing Tolerance Tolerancia de la Malla - + Enter tolerance for meshing geometry: Introducir tolerancia para la geometría de malla: - + The mesh '%1' is not a solid. La malla '%1' no es un sólido. - + The mesh '%1' is a solid. La malla '%1' es un sólido. - + Solid Mesh Malla Sólida - + Boundings Límites - + Fill holes Rellenar agujeros - + Fill holes with maximum number of edges: Rellenar agujeros con el número máximo de aristas: - + Scaling Escalado - + Enter scaling factor: Introducir factor de escala: - + [Points: %1, Edges: %2, Faces: %3] [Puntos: %1, Aristas: %2, Caras: %3] - + Display components Mostrar componentes - + Display segments Mostrar segmentos - + Display colors Colores de pantalla - - + + Leave info mode Salir del modo información - + Index: %1 Índice: %1 - + Leave hole-filling mode Salir del modo de llenado de agujeros - + Leave removal mode Salir del modo de eliminación - + Delete selected faces Eliminar caras seleccionadas - + Clear selected faces Borrar las caras seleccionadas - + Annotation Anotación diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_es-ES.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_es-ES.ts index a33bb0a8be..1c0694c065 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_es-ES.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_es-ES.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Malla - + Add triangle Añadir triángulo - - + + Add triangle manually to a mesh Añadir triángulo manualmente en una malla @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Malla - + Boundings info... Información de los límites... - - + + Shows the boundings of the selected mesh Muestra los límites de la malla seleccionada @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Malla - + Regular solid... Sólido regular... - - + + Builds a regular solid Crea un sólido regular @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Malla - + Cross-sections... Cortes transversales... - - + + Cross-sections Cortes transversales @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Malla - + Decimation... Diezmado... - - - + + + Decimates a mesh Diezmar una malla @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Malla - + Difference Diferencia @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Malla - + Face info Información de la cara - - + + Information about face Información de la cara @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Malla - + Check solid mesh Comprobar la malla del sólido - - + + Checks whether the mesh is a solid Comprueba si la malla es un sólido @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Malla - + Evaluate and repair mesh... Evaluar y reparar malla... - - + + Opens a dialog to analyze and repair a mesh Abre un diálogo para analizar y reparar una malla. @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Malla - + Export mesh... Exportar malla... - - + + Exports a mesh to file Exporta la malla a un archivo @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Malla - + Close hole Cerrar agujero - - + + Close holes interactively Cerrar agujeros interactiva-mente @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Malla - + Fill holes... Rellenar agujeros ... - - + + Fill holes of the mesh Rellenar agujeros de la malla @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Malla - + Flip normals Voltear normales - - + + Flips the normals of the mesh Voltea las normales de la malla @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Malla - + Create mesh from geometry... Crea una malla a partir de la geometría... - - + + Create mesh from the selected geometry Crea una malla a partir de la geometría seleccionada @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Malla - + Create mesh from shape... Crear malla de forma ... - + Tessellate shape Teselar forma @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Malla - + Harmonize normals Armoniza las normales - - + + Harmonizes the normals of the mesh Armoniza las normales de la malla. @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Malla - + Import mesh... Importar malla... - - + + Imports a mesh from file Importa una malla desde un archivo @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Malla - + Intersection Intersección @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Malla - + Merge Fusionar - + Merges selected meshes into one Fusionar las mallas seleccionadas en una sola @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Malla - + Cut mesh Cortar malla - - + + Cuts a mesh with a picked polygon Corta una malla con un polígono designado @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Malla - + Make segment Hacer un segmento - - + + Creates a mesh segment Crea un segmento de la malla @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Malla - + Split mesh Dividir malla - - + + Splits a mesh into two meshes Divide una malla en dos mallas @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Malla - + Trim mesh Recortar malla - - + + Trims a mesh with a picked polygon Recorta una malla con un polígono escogido @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Malla - + Refinement... Refinamiento... - - + + Refine existing mesh Refinar malla existente @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Malla - + Remove components by hand... Elimina los componentes a mano ... - - + + Mark a component to remove it from the mesh Marcar un componente para eliminarlo de la malla @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Malla - + Remove components... Eliminar componentes... - - + + Remove topologic independent components from the mesh Eliminar componentes topológicos independientes de la malla @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Malla - + Scale... Escala... - + Scale selected meshes Escalado de mallas seleccionadas @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Malla - + Create section from mesh and plane Crear sección de malla y del plano - - + + Section from mesh and plane Sección de la malla y del plano @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Malla - + Create mesh segments... Crear segmentos de la malla... - - + + Create mesh segments Crear segmentos de la malla @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Malla - + Create mesh segments from best-fit surfaces... Crear segmentos de malla a partir de superficies con mejor ajuste... - - + + Create mesh segments from best-fit surfaces Crear segmentos de malla a partir de superficies con mejor ajuste @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Malla - + Smooth... Suavizar... - - + + Smooth the selected meshes Suaviza las mallas seleccionadas @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Malla - + Split by components Despiece - + Split selected mesh into its components Despiece de malla @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Malla - + Trim mesh with a plane Recortar malla con un plano - - + + Trims a mesh with a plane Ajusta una malla con un plano @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Malla - + Union Unión @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Malla - + Curvature plot Trazado de la curvatura - - + + Calculates the curvature of the vertices of a mesh Calcula la curvatura de los vértices de una malla @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Malla - + Curvature info Información de la curvatura - - + + Information about curvature Información de la curvatura @@ -672,144 +672,144 @@ Unir malla - + Mesh difference Diferencia de Malla - + Mesh intersection Interceptar mallas - + Import Mesh Importar malla - + Mesh VertexCurvature Curvar vértices de malla - + Mesh Smoothing Suavizar malla - + Harmonize mesh normals Armonizar mallas normales - + Flip mesh normals Voltear normales de malla - + Fill up holes Rellenar agujeros - + Mesh merge Unir malla - + Mesh split Partir malla - + Mesh scale Escala de Malla - + Mesh Decimating Diezmado de Malla - + Harmonize normals Armoniza las normales - + Remove non-manifolds Eliminar no-variedades - + Fix indices Arreglar índices - + Remove degenerated faces Eliminar caras degeneradas - + Remove duplicated faces Eliminar caras duplicadas - + Remove duplicated points Eliminar puntos duplicados - + Fix self-intersections Corregir auto-intersecciones - + Remove folds Eliminar pliegues - + Repair mesh Reparar malla - + Delete selection Eliminar selección - - + + Cut Cortar - - + + Trim Recortar - + Split Dividir - + Segment Segmento - + Delete Eliminar - + Fill hole Rellenar hueco @@ -838,7 +838,7 @@ - + Absolute number Número absoluto @@ -848,7 +848,7 @@ Tolerancia - + Absolute number (Maximum: %1) Número absoluto (Máximo: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Opciones... - - + + No selection Ninguna selección - - - - - - - - - - - + + + + + + + + + + + No information Ninguna información - + Orientation Orientación - + No flipped normals Ninguna normal volteada - + %1 flipped normals %1 normales volteada - + No non-manifolds Sin múltiples - + %1 non-manifolds %1 sin múltiples - - + + Non-manifolds Sin múltiples - + Cannot remove non-manifolds No se pueden eliminar los múltiples - + Invalid face indices índices de las caras inválidos - + Invalid point indices Índices de los puntos inválidos - + Multiple point indices Índices de puntos múltiples - + Invalid neighbour indices Índices cercanos inválidos - + No invalid indices Sin índices inválidos - + Indices Índices - + No degenerations Sin degeneraciones - + %1 degenerated faces %1 caras deterioradas - + Degenerations Degeneraciones - + No duplicated faces Ninguna cara duplicada - + %1 duplicated faces %1 caras duplicadas - + Duplicated faces Caras duplicadas - + No duplicated points Ningún punto duplicado - - + + Duplicated points Puntos duplicados - + No self-intersections Sin auto intersecciones - + Self-intersections Auto-intersecciones - + No folds on surface Sin pliegues en la superficie - + %1 folds on surface %1 pliegues en la superficie - + Folds Pliegues - - + + Mesh repair Reparación de la malla @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Crear %1 - + No active document Ningún documento activo @@ -1348,7 +1348,7 @@ Always export mesh as model type in 3MF format even if not a solid - Always export mesh as model type in 3MF format even if not a solid + Exportar siempre la malla como tipo de modelo en formato 3MF incluso si no es un sólido @@ -1366,7 +1366,7 @@ Altura: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Este parámetro indica si la compresión ZIP @@ -1548,48 +1548,48 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::GmshWidget - + Automatic Automatico - + Adaptive Adaptativo - + Frontal Frontal - + Frontal Quad Cuadro frontal - + Parallelograms Paralelogramos - - + + Time: Tiempo: - + Running gmsh... Ejecutando gmsh... - + Failed to start Fallo al iniciar - + Error Error @@ -1597,22 +1597,22 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::MeshFaceAddition - + Add triangle Añadir triángulo - + Flip normal Voltear normal - + Clear Borrar - + Finish Finalizar @@ -1620,7 +1620,7 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::MeshFillHole - + Finish Terminado @@ -1628,47 +1628,47 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::ParametersDialog - + Surface fit Superficie de ajuste - + Parameters Parámetros - + Selection Selección - + Region Región - + Triangle Triángulo - + Clear Limpiar - + Compute Calcular - + No selection Ninguna selección - + Before fitting the surface select an area. Antes de colocar la superficie selecciona un área. @@ -1728,7 +1728,7 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Clear - Limpiar + Borrar @@ -1865,7 +1865,7 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Sphere - Esféra + Esfera @@ -1927,29 +1927,29 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Esfera - - + + Base Base - + Normal Normal - + Axis Eje - - + + Radius Radio - + Center Centro @@ -1983,12 +1983,12 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Respeta solo los triángulos con normales mirando hacia la pantalla - + Use a brush tool to select the area Use una herramienta de pincel para seleccionar el área - + Clears completely the selected area Borra completamente el área seleccionada. @@ -1996,14 +1996,14 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshGui::TaskRemoveComponents - - + + Delete - Eliminar + Borrar - - + + Invert Invertido @@ -2011,38 +2011,38 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el MeshInfoWatcher - + Number of points: Número de puntos: - + Number of facets: Número de facetas: - + Minimum bound: Límite mínimo: - + Maximum bound: Límite máximo: - + Mesh info box Caja de información de la malla - + Mesh info Info de la malla - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2050,7 +2050,7 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Mesh_BoundingBox - + Boundings of %1: Límites de %1: @@ -2058,26 +2058,26 @@ a una apariencia poco realista para superficies curvas mientras que si se usa el Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Se ha producido un error desconocido al ejecutar OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD no parece instalado en su sistema. Por favor visite http://www.openscad.org/index.html para instalarlo. @@ -2086,7 +2086,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Evaluar y reparar malla @@ -2094,241 +2094,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Mostrar - + Import-Export Importar/Exportar - + All Mesh Files Todos los archivos de las mallas - - + + Binary STL Binario STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Malla binaria - - + + Alias Mesh Alias de la malla - - + + Object File Format Formato de archivo del objeto - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Polígono Stanford - + NASTRAN NASTRAN - - + + All Files Todos los Archivos - + Import mesh Importar malla - + Simple Model Format Formato de modelo simple - + Inventor V2.1 ascii Inventor ascii V2.1 - + X3D Extensible 3D Extensible X3D (*.x3d) 3D - + Compressed X3D X3D comprimido - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Comprimido VRML 2.0 - + Nastran Nastran - + Python module def Módulo def de Python - + Asymptote Format Formato de Asíntota - + 3D Manufacturing Format Formato de Manufactura 3D - + Export mesh Exportar la malla - + Meshing Tolerance Tolerancia de la malla - + Enter tolerance for meshing geometry: Introduce la tolerancia para la geometría de la malla: - + The mesh '%1' is not a solid. La malla '%1' no es un sólido. - + The mesh '%1' is a solid. La malla '%1' es un sólido. - + Solid Mesh Malla sólida - + Boundings Límites - + Fill holes Llenar agujeros - + Fill holes with maximum number of edges: Rellenado de los agujeros con el número máximo de los bordes: - + Scaling Escalado - + Enter scaling factor: Introduce el factor de la escala: - + [Points: %1, Edges: %2, Faces: %3] [Puntos: %1, Aristas: %2, Caras: %3] - + Display components Mostrar los componentes - + Display segments Mostrar segmentos - + Display colors Colores de pantalla - - + + Leave info mode Salir del modo información - + Index: %1 Índice: %1 - + Leave hole-filling mode Salir el modo de llenado de agujeros - + Leave removal mode Salir del modo de eliminación - + Delete selected faces Eliminar las caras seleccionadas - + Clear selected faces Borrar las caras seleccionadas - + Annotation Anotación diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_eu.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_eu.ts index 2e6e60e82f..f06decf8b9 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_eu.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_eu.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Amarauna - + Add triangle Gehitu triangelua - - + + Add triangle manually to a mesh Gehitu triangelua eskuz amaraun bati @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Amarauna - + Boundings info... Mugen informazioa... - - + + Shows the boundings of the selected mesh Erakutsi hautatutako amaraunaren mugak @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Amarauna - + Regular solid... Solido erregularra... - - + + Builds a regular solid Solido erregular bat eraikitzen du @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Amarauna - + Cross-sections... Zeharkako sekzioak... - - + + Cross-sections Zeharkako sekzioak @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Amarauna - + Decimation... Bakantzea... - - - + + + Decimates a mesh Amaraun bat bakantzen du @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Amarauna - + Difference Diferentzia @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Amarauna - + Face info Aurpegi-informazioa - - + + Information about face Aurpegiari buruzko informazioa @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Amarauna - + Check solid mesh Egiaztatu amaraun solidoa - - + + Checks whether the mesh is a solid Amaraun bat solidoa den egiaztatzen du @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Amarauna - + Evaluate and repair mesh... Ebaluatu eta konpondu amarauna... - - + + Opens a dialog to analyze and repair a mesh Elkarrizketa-koadro bat irekitzen du amaraun bat analizatu eta konpontzeko @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Amarauna - + Export mesh... Esportatu amarauna... - - + + Exports a mesh to file Amaraun bat fitxategi batera esportatzen du @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Amarauna - + Close hole Itxi zuloa - - + + Close holes interactively Zuloak interaktiboki ixten ditu @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Amarauna - + Fill holes... Bete zuloak... - - + + Fill holes of the mesh Bete amaraunaren zuloak @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Amarauna - + Flip normals Irauli normalak - - + + Flips the normals of the mesh Amaraunaren normalak iraultzen ditu @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Amarauna - + Create mesh from geometry... Sortu amarauna geometriatik... - - + + Create mesh from the selected geometry Sortu amarauna hautatutako geometriatik @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Amarauna - + Create mesh from shape... Sortu amarauna formatik... - + Tessellate shape Teselatu forma @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Amarauna - + Harmonize normals Harmonizatu normalak - - + + Harmonizes the normals of the mesh Amarauneko normalak harmonizatzen ditu @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Amarauna - + Import mesh... Inportatu amarauna... - - + + Imports a mesh from file Amaraun bat fitxategi batetik inportatzen du @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Amarauna - + Intersection Ebakidura @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Amarauna - + Merge Fusionatu - + Merges selected meshes into one Hautatutako amaraunak fusionatzen ditu bakarra sortuz @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Amarauna - + Cut mesh Moztu amarauna - - + + Cuts a mesh with a picked polygon Amaraun bat mozten du hautatutako poligono batekin @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Amarauna - + Make segment Sortu segmentua - - + + Creates a mesh segment Amaraun segmentu bat sortzen du @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Amarauna - + Split mesh Zatitu amarauna - - + + Splits a mesh into two meshes Amaraun bat bitan zatitzen du @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Amarauna - + Trim mesh Muxarratu amarauna - - + + Trims a mesh with a picked polygon Amarauna muxarratzen du aukeratutako poligono batekin @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Amarauna - + Refinement... Fintzea... - - + + Refine existing mesh Findu lehendik dagoen amarauna @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Amarauna - + Remove components by hand... Kendu osagaiak eskuz... - - + + Mark a component to remove it from the mesh Markatu osagai bat, hura amaraunetik kentzeko @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Amarauna - + Remove components... Kendu osagaiak... - - + + Remove topologic independent components from the mesh Kendu topologikoki independenteak diren osagaiak amaraunetik @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Amarauna - + Scale... Eskala... - + Scale selected meshes Eskalatu hautatutako amaraunak @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Amarauna - + Create section from mesh and plane Sortu sekzioa amaraunetik eta planotik - - + + Section from mesh and plane Sekzioa amaraunetik eta planotik @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Amarauna - + Create mesh segments... Sortu amaraun segmentuak... - - + + Create mesh segments Sortu amaraun segmentuak @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Amarauna - + Create mesh segments from best-fit surfaces... Sortu amaraun segmentuak ondoen doitzen diren azaleretatik... - - + + Create mesh segments from best-fit surfaces Sortu amaraun segmentuak ondoen doitzen diren azaleretatik @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Amarauna - + Smooth... Leundu... - - + + Smooth the selected meshes Leundu hautatutako amaraunak @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Amarauna - + Split by components Zatitu osagaien arabera - + Split selected mesh into its components Zatitu amaraun hautatua bere osagaietan @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Amarauna - + Trim mesh with a plane Muxarratu amarauna plano batekin - - + + Trims a mesh with a plane Amaraun bat muxarratzen du plano batekin @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Amarauna - + Union Batuketa @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Amarauna - + Curvature plot Kurbaduraren trazaketa - - + + Calculates the curvature of the vertices of a mesh Amaraun bateko erpinen kurbadura kalkulatzen du @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Amarauna - + Curvature info Kurbaduraren informazioa - - + + Information about curvature Kurbadurari buruzko informazioa @@ -672,144 +672,144 @@ Amaraunen batuketa - + Mesh difference Amaraunen diferentzia - + Mesh intersection Amaraunen ebakidura - + Import Mesh Inportatu amarauna - + Mesh VertexCurvature Amaraunaren erpinen kurbadura - + Mesh Smoothing Amaraunaren leuntzea - + Harmonize mesh normals Harmonizatu amaraun-normalak - + Flip mesh normals Irauli amaraunaren normalak - + Fill up holes Bete zuloak - + Mesh merge Amaraunen fusioa - + Mesh split Amaraunaren zatiketa - + Mesh scale Amaraunaren eskala - + Mesh Decimating Amaraunaren bakantzea - + Harmonize normals Harmonizatu normalak - + Remove non-manifolds Kendu anizkoitzak ez direnak - + Fix indices Finkatu indizeak - + Remove degenerated faces Kendu aurpegi degeneratuak - + Remove duplicated faces Kendu aurpegi bikoiztuak - + Remove duplicated points Kendu puntu bikoiztuak - + Fix self-intersections Konpondu autoebakidurak - + Remove folds Kendu karpetak - + Repair mesh Konpondu amarauna - + Delete selection Ezabatu hautapena - - + + Cut Moztu - - + + Trim Muxarratu - + Split Zatitu - + Segment Segmentua - + Delete Ezabatu - + Fill hole Bete zuloa @@ -838,7 +838,7 @@ - + Absolute number Zenbaki absolutua @@ -848,7 +848,7 @@ Tolerantzia - + Absolute number (Maximum: %1) Zenbaki absolutua (maximoa: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Ezarpenak... - - + + No selection Hautapenik ez - - - - - - - - - - - + + + + + + + + + + + No information Informaziorik ez - + Orientation Orientazioa - + No flipped normals Iraulitako normalik ez - + %1 flipped normals Iraulitako %1 normal - + No non-manifolds Ez dago anizkoitza ez denik - + %1 non-manifolds Anizkoitzak ez diren %1 - - + + Non-manifolds Ez anizkoitzak - + Cannot remove non-manifolds Ezin dira kendu anizkoitzak ez direnak - + Invalid face indices Aurpegi-indize baliogabeak - + Invalid point indices Puntu-indize baliogabeak - + Multiple point indices Puntu-indize anitzak - + Invalid neighbour indices Auzoko indize baliogabeak - + No invalid indices Ez dago baliogabeko indizerik - + Indices Indizeak - + No degenerations Ez dago degeneraziorik - + %1 degenerated faces Degeneratutako %1 aurpegi - + Degenerations Degenerazioak - + No duplicated faces Ez dago aurpegi bikoizturik - + %1 duplicated faces %1 aurpegi bikoiztu - + Duplicated faces Aurpegi bikoiztuak - + No duplicated points Ez dago puntu bikoizturik - - + + Duplicated points Puntu bikoiztuak - + No self-intersections Autoebakidurarik ez - + Self-intersections Autoebakidurak - + No folds on surface Tolesturarik ez gainazalean - + %1 folds on surface %1 tolestura gainazalean - + Folds Tolesturak - - + + Mesh repair Amaraunaren konponketa @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Sortu %1 - + No active document Ez dago dokumentu aktiborik @@ -1366,7 +1366,7 @@ Altuera: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Parametro honek adierazten du ZIP konpresioa @@ -1551,48 +1551,48 @@ itxura leunagoa ematen du. MeshGui::GmshWidget - + Automatic Automatikoa - + Adaptive Moldakorra - + Frontal Aurrekoa - + Frontal Quad Aurreko karratua - + Parallelograms Paralelogramoak - - + + Time: Denbora: - + Running gmsh... Gmsh exekutatzen... - + Failed to start Hasierak huts egin du - + Error Errorea @@ -1600,22 +1600,22 @@ itxura leunagoa ematen du. MeshGui::MeshFaceAddition - + Add triangle Gehitu triangelua - + Flip normal Alderantzikatu normala - + Clear Garbitu - + Finish Amaitu @@ -1623,7 +1623,7 @@ itxura leunagoa ematen du. MeshGui::MeshFillHole - + Finish Amaitu @@ -1631,47 +1631,47 @@ itxura leunagoa ematen du. MeshGui::ParametersDialog - + Surface fit Gainazala doitzea - + Parameters Parametroak - + Selection Hautapena - + Region Eskualdea - + Triangle Triangelua - + Clear Garbitu - + Compute Kalkulatu - + No selection Hautapenik ez - + Before fitting the surface select an area. Gainazala doitu baino lehen, hautatu area bat. @@ -1930,29 +1930,29 @@ itxura leunagoa ematen du. Esfera - - + + Base Oinarria - + Normal Normala - + Axis Ardatza - - + + Radius Erradioa - + Center Zentroa @@ -1986,12 +1986,12 @@ itxura leunagoa ematen du. Errespetatu pantailara begira dauden normalak dituzten triangeluak besterik ez - + Use a brush tool to select the area Erabili eskuila-tresna bat area hautatzeko - + Clears completely the selected area Hautatutako area osorik garbitzen du @@ -1999,14 +1999,14 @@ itxura leunagoa ematen du. MeshGui::TaskRemoveComponents - - + + Delete Ezabatu - - + + Invert Alderantzikatu @@ -2014,38 +2014,38 @@ itxura leunagoa ematen du. MeshInfoWatcher - + Number of points: Puntu kopurua: - + Number of facets: Alderdi kopurua: - + Minimum bound: Muga minimoa: - + Maximum bound: Muga maximoa: - + Mesh info box Amaraun-informazioaren koadroa - + Mesh info Amaraun-informazioa - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ itxura leunagoa ematen du. Mesh_BoundingBox - + Boundings of %1: %1 elementuaren mugak: @@ -2061,26 +2061,26 @@ itxura leunagoa ematen du. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Errore ezezaguna gertatu da OpenSCAD exekutatzean. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. Ez da OpenSCAD aurkitu zure sisteman. @@ -2090,7 +2090,7 @@ Jo http://www.openscad.org/index.html helbidera hura instalatzeko. QDockWidget - + Evaluate & Repair Mesh Ebaluatu eta konpondu amarauna @@ -2098,241 +2098,241 @@ Jo http://www.openscad.org/index.html helbidera hura instalatzeko. QObject - + Display Bistaratzea - + Import-Export Inportatu-Esportatu - + All Mesh Files Amaraun-fitxategi guztiak - - + + Binary STL STL bitarra - - - + + + ASCII STL STL ASCIIa - - + + Binary Mesh Amaraun bitarra - - + + Alias Mesh Alias-amarauna - - + + Object File Format Objektu-fitxategiaren formatua - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford poligonoa - + NASTRAN NASTRAN - - + + All Files Fitxategi guztiak - + Import mesh Inportatu amarauna - + Simple Model Format Simple Model Format - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D, 3D hedagarria - + Compressed X3D X3D konprimatua - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 VRML 2.0 konprimatua - + Nastran Nastran - + Python module def Phyton moduluaren definizioa - + Asymptote Format Asintota-formatua - + 3D Manufacturing Format 3D manufakturako formatua - + Export mesh Esportatu amarauna - + Meshing Tolerance Amarauna sortzeko tolerantzia - + Enter tolerance for meshing geometry: Sartu tolerantzia amaraun-geometriarako: - + The mesh '%1' is not a solid. %1' amarauna ez da solido bat. - + The mesh '%1' is a solid. %1' amarauna solido bat da. - + Solid Mesh Amaraun solidoa - + Boundings Mugak - + Fill holes Bete zuloak - + Fill holes with maximum number of edges: Bete zuloak ertz kopuru maximoarekin: - + Scaling Eskalatzea - + Enter scaling factor: Sartu eskalatze-faktorea: - + [Points: %1, Edges: %2, Faces: %3] [Puntuak: %1, ertzak: %2, aurpegiak: %3] - + Display components Erakutsi osagaiak - + Display segments Bistaratu segmentuak - + Display colors Bistaratu koloreak - - + + Leave info mode Utzi informazio modua - + Index: %1 Indizea: %1 - + Leave hole-filling mode Utzi zuloak betetzeko modua - + Leave removal mode Utzi kentze modua - + Delete selected faces Ezabatu hautatutako aurpegiak - + Clear selected faces Garbitu hautatutako aurpegiak - + Annotation Oharpena diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_fi.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_fi.ts index d207914dec..d5d69da047 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_fi.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_fi.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Lisää kolmio - - + + Add triangle manually to a mesh Lisää kolmio käsivaraisesti verkkopintaan @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Rajoituksista tietoa... - - + + Shows the boundings of the selected mesh Näytä valitun verkkopinnan rajat @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Säännöllinen monitahokas... - - + + Builds a regular solid Luo säännöllisen monitahokkaan @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Poikkileikkaukset... - - + + Cross-sections Poikkileikkaukset @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Desimaatio... - - - + + + Decimates a mesh Desimoi verkkopinta @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Erotus @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Pinnan tiedot - - + + Information about face Tietoa pinnasta @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Tarkasta kiinteä verkkopinta - - + + Checks whether the mesh is a solid Tarkastaa onko verkkopinta kiinteä @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Arvioi ja korjaa verkkopinta... - - + + Opens a dialog to analyze and repair a mesh Avaa valintaikkunan jossa voit analysoida ja korjata verkkopinnan @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Vie verkkopinta... - - + + Exports a mesh to file Vie verkkopinnan tiedot tiedostoon @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Sulje reikä - - + + Close holes interactively Sulje reikiä vuorovaikutteisesti @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Täyttää reiät... - - + + Fill holes of the mesh Täytä verkkopinnan reiät @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Käännä normaalit päinvastaisiksi - - + + Flips the normals of the mesh Käännä verkkopinnan normaalit @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Luo verkkopinta geometriasta... - - + + Create mesh from the selected geometry Luo verkkopinta valitusta geometriasta @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Luo verkkotaso muodosta... - + Tessellate shape Jaa muoto ruutuihin @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Yhdenmukaista normaalit - - + + Harmonizes the normals of the mesh Yhdenmukaistaa verkkopinnan normaalit @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Tuo verkkopinta... - - + + Imports a mesh from file Tuo verkkopinta tiedostosta @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Leikkaus @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Yhdistä - + Merges selected meshes into one Yhdistä valitut verkkopinnat yhdeksi @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Leikkaa verkkopinta - - + + Cuts a mesh with a picked polygon Leikkaa verkkopinta valitulla monikulmiolla @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Tee lohko - - + + Creates a mesh segment Luo verkkopinnan lohkon @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Jaa verkkopinta - - + + Splits a mesh into two meshes Jakaa verkkopinnan kahdeksi verkkopinnaksi @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Viimeistele verkkopinta - - + + Trims a mesh with a picked polygon Viimeistelee verkkopinnan valitulla monikulmiolla @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Parannus... - - + + Refine existing mesh Paranna olemassa olevaa verkkoa @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Poista osia käsin... - - + + Mark a component to remove it from the mesh Merkitse osa, joka poistetaan verkkopinnasta @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Poista osia... - - + + Remove topologic independent components from the mesh Poista topologisesti riippumattomia komponentteja verkkopinnasta @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Skaalaa... - + Scale selected meshes Skaalaa valitut verkkopinnat @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Luo osio verkkopinnasta ja tasosta - - + + Section from mesh and plane Lohko verkkopinnasta ja tasosta @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Luo verkkopinnan lohkoja... - - + + Create mesh segments Luo verkkopinnan lohkoja @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Luo verkkopinnan segmentit parhaiten sopivista pinnoista... - - + + Create mesh segments from best-fit surfaces Luo verkkopinnan segmentit parhaiten sopivista pinnoista @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Siloita... - - + + Smooth the selected meshes Siloita valitut verkkopinnat @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Jaa osien avulla - + Split selected mesh into its components Jaa valittu verkkopinta sen osiin @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Leikkaa vekkopintaan tasolla - - + + Trims a mesh with a plane Leikkaa verkkopintaan tasolla @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Unioni @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Kaarevuuden merkitseminen - - + + Calculates the curvature of the vertices of a mesh Laskee verkkopinnan kärkipisteiden kaarevuuden @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Kaarevuuden tiedot - - + + Information about curvature Tietoja kaarevuudesta @@ -672,144 +672,144 @@ Verkkopintojen liitto - + Mesh difference Verkkopinnan ero - + Mesh intersection Verkkopintojen leikkaus - + Import Mesh Tuo verkkopinta - + Mesh VertexCurvature Verkkopinnan VertexKaarevuus - + Mesh Smoothing Verkkopinnan pehmennys - + Harmonize mesh normals Yhdenmukaista verkkopinnan normaalit - + Flip mesh normals Vaihda verkkopinnan normaalit päinvastaisiksi - + Fill up holes Täytä reiät - + Mesh merge Verkkopinnan yhdistäminen - + Mesh split Verkkopinnan jako - + Mesh scale Verkkopinnan mittakaava - + Mesh Decimating Verkkopinnan desimalisointi - + Harmonize normals Yhdenmukaista normaalit - + Remove non-manifolds Poista epä-moninaisuudet - + Fix indices Korjaa indeksit - + Remove degenerated faces Poista vaurioituneet näkymäpinnat - + Remove duplicated faces Poista monistuneet näkymäpinnat - + Remove duplicated points Poista monistuneet (tuplautuneet) pisteet - + Fix self-intersections Korjaa itse-leikkauskohdat - + Remove folds Poista kansiot - + Repair mesh Korjaa verkkopinta - + Delete selection Poista valinta - - + + Cut Leikkaa - - + + Trim rajaa - + Split Jaa osiin - + Segment Segmentti - + Delete Poista - + Fill hole Täytä reikä @@ -838,7 +838,7 @@ - + Absolute number Absoluuttinen määrä @@ -848,7 +848,7 @@ Toleranssi - + Absolute number (Maximum: %1) Absoluuttinen luku (Maksimi: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Asetukset... - - + + No selection Ei valintaa - - - - - - - - - - - + + + + + + + + + + + No information Ei tietoja - + Orientation Suunta - + No flipped normals Ei käännettyjä normaaleja - + %1 flipped normals %1 käännettyä normaalia - + No non-manifolds Epäreaalipintoja ei havaittu - + %1 non-manifolds %1 kappaletta epäreaalipintoja - - + + Non-manifolds Eireaalipinnat (non-manifolds) - + Cannot remove non-manifolds Epäreaalipintoja ei pystytä poistamaan - + Invalid face indices Virheellinen pinnan indeksi - + Invalid point indices Virheellinen pisteen indeksi - + Multiple point indices Useita pisteiden indeksejä - + Invalid neighbour indices Virheelliset viereiset indeksit - + No invalid indices Ei vääriä indeksejä - + Indices Indeksit - + No degenerations Ei surkastumia - + %1 degenerated faces %1 kappaletta rappeutuneita tahkoja - + Degenerations Rappeutumaa - + No duplicated faces Ei päällekkäisiä tahkoja - + %1 duplicated faces %1 päällekkäistä tahkoa - + Duplicated faces Monistetut tahkot - + No duplicated points Ei kahdennettuja pisteitä - - + + Duplicated points Monistetut pisteet - + No self-intersections Ei itseleikkauksia - + Self-intersections Itseleikkauksia - + No folds on surface Pinnassa ei ole taitteita - + %1 folds on surface Pinnassa on %1 taitetta - + Folds Taitteita - - + + Mesh repair Verkkopinnan korjaus @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Luo %1 - + No active document Ei aktiivista dokumenttia @@ -1366,7 +1366,7 @@ Korkeus: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Tämä parametri ilmaisee, on ZIP pakkaaminen @@ -1551,48 +1551,48 @@ sileämpään ulkonäköön. MeshGui::GmshWidget - + Automatic Automaattinen - + Adaptive Adaptive - + Frontal Etuosa - + Frontal Quad Etuosan nelikkö (quad) - + Parallelograms Suunnikkaat - - + + Time: Aika: - + Running gmsh... Suorittaa gmsh... - + Failed to start Käynnistäminen epäonnistui - + Error Virhe @@ -1600,22 +1600,22 @@ sileämpään ulkonäköön. MeshGui::MeshFaceAddition - + Add triangle Lisää kolmio - + Flip normal Käännä normaalit päinvastaisiksi - + Clear Tyhjennä - + Finish Valmis @@ -1623,7 +1623,7 @@ sileämpään ulkonäköön. MeshGui::MeshFillHole - + Finish Valmis @@ -1631,47 +1631,47 @@ sileämpään ulkonäköön. MeshGui::ParametersDialog - + Surface fit Ulkopinnan istuvuus - + Parameters Muuttujat - + Selection Valinta - + Region Alue - + Triangle Kolmio - + Clear Tyhjennä - + Compute Laske - + No selection Ei valintaa - + Before fitting the surface select an area. Ennen pinnan sovittamista valitse alue. @@ -1930,29 +1930,29 @@ sileämpään ulkonäköön. Pallo - - + + Base Perusta - + Normal Normaali - + Axis Akseli - - + + Radius Säde - + Center Keskikohta @@ -1986,12 +1986,12 @@ sileämpään ulkonäköön. Ota huomioon vain kolmiot joiden normaalit ovat näyttöön päin - + Use a brush tool to select the area Käytä sivellintyökalua valitaksesi alueen - + Clears completely the selected area Tyhjentää kokonaan valitun alueen @@ -1999,14 +1999,14 @@ sileämpään ulkonäköön. MeshGui::TaskRemoveComponents - - + + Delete Poista - - + + Invert Käännä @@ -2014,38 +2014,38 @@ sileämpään ulkonäköön. MeshInfoWatcher - + Number of points: Pisteiden määrä: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Mesh info - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ sileämpään ulkonäköön. Mesh_BoundingBox - + Boundings of %1: Rajaukset %1: @@ -2061,26 +2061,26 @@ sileämpään ulkonäköön. Mesh_Union - - - - - + + + + + OpenSCAD openSCAD - - - + + + Unknown error occurred while running OpenSCAD. Tuntematon virhe ilmeni OpenSCAD: n käytössä. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD:ia ei löydy järjestelmästäsi. Käy @@ -2090,7 +2090,7 @@ http://www.openscad.org/index.html asentaaksesi sen. QDockWidget - + Evaluate & Repair Mesh Arvioi & korjaa verkkopinta @@ -2098,241 +2098,241 @@ http://www.openscad.org/index.html asentaaksesi sen. QObject - + Display Näyttö - + Import-Export Tuo/Vie - + All Mesh Files Kaikki verkkopinta-tiedostot - - + + Binary STL Binäärinen STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binäärinen Verkkopinta - - + + Alias Mesh Eli pintaverkkona - - + + Object File Format Valitse kohteen tiedostomuoto - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Monikulmio - + NASTRAN NASTRAN - - + + All Files Kaikki tiedostot - + Import mesh Tuo verkkopinta - + Simple Model Format Yksinkertaisen mallin muoto - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D laajennettava 3D - + Compressed X3D Pakattu X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Pakattu VRML 2.0 - + Nastran Nastran - + Python module def Python modulin määrittely - + Asymptote Format Asymptoottinen Muoto - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh Vie verkkopinta - + Meshing Tolerance Verkkopinnoittumisen toleranssi - + Enter tolerance for meshing geometry: Anna verkkopintageometrian toleranssi: - + The mesh '%1' is not a solid. Verkkopinta '%1' ei ole yhtenäinen. - + The mesh '%1' is a solid. Verkkopinta '%1' on yhtenäinen. - + Solid Mesh Eheä verkkopinta - + Boundings Rajat - + Fill holes Täyttää reiät - + Fill holes with maximum number of edges: Täytä reiät suurimmalla mahdollisella määrällä reunoja: - + Scaling Skaalaus - + Enter scaling factor: Anna skaalauskerroin: - + [Points: %1, Edges: %2, Faces: %3] [Pisteet: %1, Reunat: %2, Ulkopinnat: %3] - + Display components Näytä osat - + Display segments Näytä segmentit - + Display colors Display colors - - + + Leave info mode Poistu Tieto tilasta - + Index: %1 Indeksi: %1 - + Leave hole-filling mode Jätä reiäntäyttötila - + Leave removal mode Jätä poistotila - + Delete selected faces Tuhoa valitut tahkot - + Clear selected faces Puhdista valitut tahkot - + Annotation Huomautus diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_fr.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_fr.ts index 82a81ab74c..dbaa48fdc3 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_fr.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_fr.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Maillage - + Add triangle Ajouter un triangle - - + + Add triangle manually to a mesh Ajouter manuellement un triangle à un maillage @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh - Maillage + Mesh - + Boundings info... Dimensions extérieures... - - + + Shows the boundings of the selected mesh Afficher les dimensions englobantes du maillage sélectionné @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Solide régulier... - - + + Builds a regular solid Construire un solide régulier @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Coupes... - - + + Cross-sections Coupes @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Décimer... - - - + + + Decimates a mesh Décimer un maillage @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Différence @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Informations sur la face - - + + Information about face Informations sur la face @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Vérifier la solidité du maillage - - + + Checks whether the mesh is a solid Vérifier si le maillage est un solide @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Évaluer et réparer le maillage... - - + + Opens a dialog to analyze and repair a mesh Ouvrir une boîte de dialogue pour analyser et réparer un maillage @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Exporter le maillage... - - + + Exports a mesh to file Exporte le maillage dans un fichier @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Boucher un trou - - + + Close holes interactively Boucher un trou de manière interactive @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Remplir les trous... - - + + Fill holes of the mesh Remplir un trou de manière interactive @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Inverser les normales - - + + Flips the normals of the mesh Inverser les normales du maillage @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Créer un maillage depuis une géométrie... - - + + Create mesh from the selected geometry Créer un maillage à partir de la géométrie sélectionnée @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Créer un maillage à partir de la forme... - + Tessellate shape Tesseller la forme @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Harmoniser les normales - - + + Harmonizes the normals of the mesh Harmoniser les normales du maillage @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Importer un maillage... - - + + Imports a mesh from file Importer un maillage depuis un fichier @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Intersection @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Fusionner - + Merges selected meshes into one Fusionner les maillages sélectionnés en un seul @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Couper le maillage - - + + Cuts a mesh with a picked polygon Couper un maillage à l'aide du polygone sélectionné @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Créer un segment - - + + Creates a mesh segment Créer un segment de maillage @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Diviser un maillage - - + + Splits a mesh into two meshes Diviser un maillage en deux @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Ajuster le maillage - - + + Trims a mesh with a picked polygon Ajuster un maillage à l'aide du polygone sélectionné @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Affiner... - - + + Refine existing mesh Affiner le maillage existant @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Supprimer manuellement des composants... - - + + Mark a component to remove it from the mesh Marquer un composant pour le supprimer du maillage @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Supprimer des composants... - - + + Remove topologic independent components from the mesh Supprimer les composants de topologie indépendants du maillage @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Mettre à l'échelle... - + Scale selected meshes Mettre à l'échelle les maillages sélectionnés @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Créer une section à partir d'un maillage et d'un plan - - + + Section from mesh and plane Section à partir d'un maillage et d'un plan @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Segmenter le maillage... - - + + Create mesh segments Segmenter le maillage @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Segmenter le maillage par des surfaces adaptées... - - + + Create mesh segments from best-fit surfaces Segmenter le maillage par des surfaces adaptées @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Lisser... - - + + Smooth the selected meshes Lisser les maillages sélectionnés @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Éclater par composants - + Split selected mesh into its components Éclater le maillage sélectionné en ses composants @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Ajuster le maillage avec un plan - - + + Trims a mesh with a plane Ajuster le maillage avec un plan @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Union @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Tracer la courbure - - + + Calculates the curvature of the vertices of a mesh Calculer la courbure des sommets du maillage @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh - Mesh + Maillage - + Curvature info Informations sur la courbure - - + + Information about curvature Informations sur la courbure @@ -672,144 +672,144 @@ Union de maillage - + Mesh difference Différence de maillage - + Mesh intersection Intersection de maillage - + Import Mesh Importer un maillage - + Mesh VertexCurvature Courbure de sommet du maillage - + Mesh Smoothing Lissage du maillage - + Harmonize mesh normals Harmonisation normale du maillage - + Flip mesh normals Retourner les maillages normaux - + Fill up holes Remplir les trous - + Mesh merge Fusion de maillage - + Mesh split Scinder le maillage - + Mesh scale Redimensionner le maillage - + Mesh Decimating Décimer un maillage - + Harmonize normals Harmoniser les normales - + Remove non-manifolds Supprimer les non-manifolds - + Fix indices Corriger les indices - + Remove degenerated faces Enlever les faces dégénérées - + Remove duplicated faces Enlever les faces dupliquées - + Remove duplicated points Enlever les points dupliqués - + Fix self-intersections Corriger les auto-intersections - + Remove folds Supprimer des plis - + Repair mesh Réparer le maillage - + Delete selection Supprimer la sélection - - + + Cut Couper - - + + Trim Rogner - + Split Éclater - + Segment Segment - + Delete Supprimer - + Fill hole Remplir le trou @@ -838,7 +838,7 @@ - + Absolute number Valeur absolue d'un nombre @@ -848,7 +848,7 @@ Tolérance - + Absolute number (Maximum: %1) Valeur absolue d'un nombre (Maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Paramètres... - - + + No selection Aucune sélection - - - - - - - - - - - + + + + + + + + + + + No information Aucune information - + Orientation Orientation - + No flipped normals Aucune normale inversée - + %1 flipped normals %1 normales inversées - + No non-manifolds Aucun non-manifold - + %1 non-manifolds %1 non-manifolds - - + + Non-manifolds Non-manifolds - + Cannot remove non-manifolds Impossible de supprimer les non-manifolds - + Invalid face indices Indices de face invalides - + Invalid point indices Indices de point invalides - + Multiple point indices Indices de point multiples - + Invalid neighbour indices Indices voisins invalides - + No invalid indices Aucun indice invalide - + Indices Indices - + No degenerations Aucune dégénération - + %1 degenerated faces %1 faces dégénérées - + Degenerations Dégénérations - + No duplicated faces Aucune face dupliquée - + %1 duplicated faces %1 faces dupliquées - + Duplicated faces Faces dupliquées - + No duplicated points Aucun point dupliqué - - + + Duplicated points Points dupliqués - + No self-intersections Aucune collision interne - + Self-intersections Collisions internes - + No folds on surface Aucun pli sur la surface - + %1 folds on surface %1 plis sur la surface - + Folds Plis - - + + Mesh repair Réparer le maillage @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Créer %1 - + No active document Aucun document actif @@ -1366,7 +1366,7 @@ Hauteur : - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Ce paramètre indique si la compression ZIP @@ -1551,48 +1551,48 @@ l'ombrage Phong conduit à un aspect plus lisse. MeshGui::GmshWidget - + Automatic Automatique - + Adaptive Adaptatif - + Frontal Frontal - + Frontal Quad Quadrangle frontal - + Parallelograms Parallélogrammes - - + + Time: Temps : - + Running gmsh... Exécution de gmsh... - + Failed to start Échec du démarrage - + Error Erreur @@ -1600,22 +1600,22 @@ l'ombrage Phong conduit à un aspect plus lisse. MeshGui::MeshFaceAddition - + Add triangle Ajouter un triangle - + Flip normal Inverser les normales - + Clear Effacer - + Finish Terminer @@ -1623,7 +1623,7 @@ l'ombrage Phong conduit à un aspect plus lisse. MeshGui::MeshFillHole - + Finish Terminer @@ -1631,47 +1631,47 @@ l'ombrage Phong conduit à un aspect plus lisse. MeshGui::ParametersDialog - + Surface fit Ajustement de la surface - + Parameters Paramètres - + Selection Sélection - + Region Région - + Triangle Triangle - + Clear Effacer - + Compute Calculer - + No selection Aucune sélection - + Before fitting the surface select an area. Avant d’ajuster la surface, sélectionnez une zone. @@ -1834,7 +1834,7 @@ l'ombrage Phong conduit à un aspect plus lisse. Tolerance - Tolérance + Tolérance  @@ -1910,7 +1910,7 @@ l'ombrage Phong conduit à un aspect plus lisse. Tolerance - Tolérance  + Tolérance @@ -1930,29 +1930,29 @@ l'ombrage Phong conduit à un aspect plus lisse. Sphère - - + + Base Base - + Normal Normal - + Axis Axes - - + + Radius Rayon - + Center Centrer @@ -1986,12 +1986,12 @@ l'ombrage Phong conduit à un aspect plus lisse. Respecter seulement les triangles dont les normales font face à écran - + Use a brush tool to select the area Utiliser un outil pinceau pour sélectionner une zone - + Clears completely the selected area Nettoyer complètement la zone sélectionnée @@ -1999,14 +1999,14 @@ l'ombrage Phong conduit à un aspect plus lisse. MeshGui::TaskRemoveComponents - - + + Delete Supprimer - - + + Invert Inverser @@ -2014,38 +2014,38 @@ l'ombrage Phong conduit à un aspect plus lisse. MeshInfoWatcher - + Number of points: Nombre de points : - + Number of facets: Nombre de facettes : - + Minimum bound: Limite minimale : - + Maximum bound: Limite maximale : - + Mesh info box Boîte d'information du maillage - + Mesh info Informations sur le maillage - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ l'ombrage Phong conduit à un aspect plus lisse. Mesh_BoundingBox - + Boundings of %1: Límites de %1 : @@ -2061,26 +2061,26 @@ l'ombrage Phong conduit à un aspect plus lisse. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Une erreur inconnue s’est produite lors de l’exécution d'OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD n'as pas pu être trouvé dans votre système. @@ -2090,7 +2090,7 @@ Merci de visiter http://www.openscad.org/index.html pour l'installer. QDockWidget - + Evaluate & Repair Mesh Évaluer et réparer un maillage @@ -2098,241 +2098,241 @@ Merci de visiter http://www.openscad.org/index.html pour l'installer. QObject - + Display Affichage - + Import-Export Importer-Exporter - + All Mesh Files Tous les fichiers de maillage - - + + Binary STL STL binaire - - - + + + ASCII STL STL ASCII - - + + Binary Mesh Maillage binaire - - + + Alias Mesh Maillage Alias - - + + Object File Format Format de fichier Objet - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Polygone Stanford - + NASTRAN NASTRAN - - + + All Files Tous les fichiers - + Import mesh Importer un maillage - + Simple Model Format Modèle simple Format - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D X3D compressé - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 VRML 2.0 compressé - + Nastran Nastran - + Python module def Définition de module Python - + Asymptote Format Format Asymptote - + 3D Manufacturing Format Format de fabrication 3D - + Export mesh Exporter un maillage - + Meshing Tolerance Tolérance de maillage - + Enter tolerance for meshing geometry: Saisir la tolérance pour la géométrie maillée : - + The mesh '%1' is not a solid. Le maillage '%1' n'est pas un solide. - + The mesh '%1' is a solid. Le maillage '%1' est un solide. - + Solid Mesh Maillage solide - + Boundings Limites englobantes - + Fill holes Remplir les trous - + Fill holes with maximum number of edges: Remplir les trous avec un nombre maximum de contours : - + Scaling Mettre à l'échelle - + Enter scaling factor: Entrer le facteur d’échelle : - + [Points: %1, Edges: %2, Faces: %3] [Points : %1, Contours : %2, Faces : %3] - + Display components Afficher les composants - + Display segments Afficher les segments - + Display colors Couleurs d'affichage - - + + Leave info mode Quitter le mode d'information - + Index: %1 Index : %1 - + Leave hole-filling mode Quitter le mode remplissage des trous - + Leave removal mode Quitter le mode suppression - + Delete selected faces Supprimer les faces sélectionnées - + Clear selected faces Dé-sélectionner les faces sélectionnées - + Annotation Annotation diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_gl.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_gl.ts index d9b97cddac..d0530cd811 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_gl.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_gl.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Engadir triángulo - - + + Add triangle manually to a mesh Engadir triángulo a malla manualmente @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Información de límites... - - + + Shows the boundings of the selected mesh Amosa os límites da malla escolmada @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Sólido regular... - - + + Builds a regular solid Constrúe un sólido regular @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Cortes transversais... - - + + Cross-sections Cortes transversais @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Decimation... - - - + + + Decimates a mesh Decimates a mesh @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Diferencia @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Información da face - - + + Information about face Información sobre face @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Verificar o sólido da malla - - + + Checks whether the mesh is a solid Verifica se a malla é un sólido @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Avaliar e arranxar a malla... - - + + Opens a dialog to analyze and repair a mesh Abre unha xanela para analizar e reparar a malla @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Exportar Malla... - - + + Exports a mesh to file Exportar unha malla para un ficheiro @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Pechar furado - - + + Close holes interactively Pechar buratos iterativamente @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Reencher buratos... - - + + Fill holes of the mesh Reencher furados na malla @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Inverter normais - - + + Flips the normals of the mesh Inverte as normais da malla @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Crear malla a partir da xeometría... - - + + Create mesh from the selected geometry Crea una malla a partir dunha xeometría escolmada @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Crear malla dende forma... - + Tessellate shape Forma teselada @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Harmonizar normais - - + + Harmonizes the normals of the mesh Harmoniza as normais da malla @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Importar Malla... - - + + Imports a mesh from file Importa unha malla dun ficheiro @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Intersección @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Fundir - + Merges selected meshes into one Funde as mallas escollidas nunha soa @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Tallar malla - - + + Cuts a mesh with a picked polygon Talla unha malla cun polígono escollido @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Facer segmento - - + + Creates a mesh segment Fai un segmento da malla @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Dividir malla - - + + Splits a mesh into two meshes Divide a malla en dúas @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Tallar malla - - + + Trims a mesh with a picked polygon Talla unha malla cun polígono escollido @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Refinement... - - + + Refine existing mesh Refine existing mesh @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Desbotar compoñentes a man... - - + + Mark a component to remove it from the mesh Marque un compoñente para eliminalo da malla @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Rexeitar compoñentes... - - + + Remove topologic independent components from the mesh Elimina os compoñentes topolóxicos independentes da malla @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Escala... - + Scale selected meshes Escalar mallas selecionadas @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Facer sección a partir de malla e plano - - + + Section from mesh and plane Sección a partir de malla e plano @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Crear segmentos de malla... - - + + Create mesh segments Crea segmentos de malla @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Cera segmentos de malla dende as superficies que mellor axustan... - - + + Create mesh segments from best-fit surfaces Crea segmentos de malla das superficies que mellor se axustan @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Suavizar... - - + + Smooth the selected meshes Suaviza as mallas escolmadas @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Dividir por compoñentes - + Split selected mesh into its components Split selected mesh into its components @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Tallar malla cun plano - - + + Trims a mesh with a plane Tallar unha malla cun plano @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Unión @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Trazado da curvatura - - + + Calculates the curvature of the vertices of a mesh Calcula a curvatura dos vértices da malla @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Información da curvatura - - + + Information about curvature Información sobre a curvatura @@ -672,144 +672,144 @@ Mesh union - + Mesh difference Mesh difference - + Mesh intersection Mesh intersection - + Import Mesh Import Mesh - + Mesh VertexCurvature Mesh VertexCurvature - + Mesh Smoothing Mesh Smoothing - + Harmonize mesh normals Harmonize mesh normals - + Flip mesh normals Flip mesh normals - + Fill up holes Fill up holes - + Mesh merge Mesh merge - + Mesh split Mesh split - + Mesh scale Mesh scale - + Mesh Decimating Mesh Decimating - + Harmonize normals Harmonizar normais - + Remove non-manifolds Remove non-manifolds - + Fix indices Fix indices - + Remove degenerated faces Remove degenerated faces - + Remove duplicated faces Remove duplicated faces - + Remove duplicated points Remove duplicated points - + Fix self-intersections Fix self-intersections - + Remove folds Remove folds - + Repair mesh Repair mesh - + Delete selection Delete selection - - + + Cut Tallar - - + + Trim Tallar - + Split Dividir - + Segment Segmento - + Delete Desbotar - + Fill hole Fill hole @@ -838,7 +838,7 @@ - + Absolute number Número absoluto @@ -848,7 +848,7 @@ Tolerancia - + Absolute number (Maximum: %1) Número absoluto (Máximo: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Configuracións... - - + + No selection Ningunha escolla - - - - - - - - - - - + + + + + + + + + + + No information Sen información - + Orientation Orientación - + No flipped normals Ningunha normal invertida - + %1 flipped normals %1 normais invertidas - + No non-manifolds Ningunha non-multiplicidade - + %1 non-manifolds %1 non-multiplicidades - - + + Non-manifolds Non-multiplicidade - + Cannot remove non-manifolds Non é posíbel rexeitar as non-multiplicidades - + Invalid face indices Índices de face inválidos - + Invalid point indices Índices de punto inválidos - + Multiple point indices Moitos índices de puntos - + Invalid neighbour indices Índices veciños inválidos - + No invalid indices Ningún índice inválido - + Indices Índices - + No degenerations Ningunha dexeneración - + %1 degenerated faces %1 faces dexeneradas - + Degenerations Dexeneracións - + No duplicated faces Ningunha face duplicada - + %1 duplicated faces %1 faces duplicadas - + Duplicated faces Caras duplicadas - + No duplicated points Ningún punto duplicado - - + + Duplicated points Puntos duplicados - + No self-intersections Ningunha auto-intersección - + Self-intersections Auto-interseccións - + No folds on surface Ningunha dobra na superficie - + %1 folds on surface %1 dobras na superficie - + Folds Dobras - - + + Mesh repair Arranxar malla @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Crear %1 - + No active document Ningún documento activo @@ -1366,7 +1366,7 @@ Alto: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Iste parámetro indica uso de compresión ZIP cando escribe ficheiros en formato AMF @@ -1550,48 +1550,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Automática - + Adaptive Adaptable - + Frontal Frontal - + Frontal Quad Frontal Quad - + Parallelograms Parallelograms - - + + Time: Tempo: - + Running gmsh... Executando gmsh... - + Failed to start Non se puido iniciar - + Error Erro @@ -1599,22 +1599,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Engadir triángulo - + Flip normal Inverter normal - + Clear Baleirar - + Finish Rematar @@ -1622,7 +1622,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Rematar @@ -1630,47 +1630,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Superficie de axuste - + Parameters Parámetros - + Selection Selección - + Region Rexión - + Triangle Triángulo - + Clear Baleirar - + Compute Calcular - + No selection Ningunha escolla - + Before fitting the surface select an area. Antes de colocar a superficie escolma unha área. @@ -1929,29 +1929,29 @@ to a smoother appearance. Esfera - - + + Base Base - + Normal Normal - + Axis Eixo - - + + Radius Radio - + Center Centro @@ -1985,12 +1985,12 @@ to a smoother appearance. Respectar só triángulos con normais de cara a pantalla - + Use a brush tool to select the area Empregue unha ferramenta brocha para escolmar a área - + Clears completely the selected area Baleira completamente a área escolmada @@ -1998,14 +1998,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Desbotar - - + + Invert Inverter @@ -2013,38 +2013,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Cantidade de puntos: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Mesh info - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2052,7 +2052,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Límites de %1: @@ -2060,26 +2060,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Ocorreu un erro descoñecido namentres corría OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. O OpenSCAD non se atopou no seu sistema. @@ -2089,7 +2089,7 @@ Por favor visite http://www.openscad.org/index.html para instalalo. QDockWidget - + Evaluate & Repair Mesh Avaliar e Arranxar Malla @@ -2097,241 +2097,241 @@ Por favor visite http://www.openscad.org/index.html para instalalo. QObject - + Display Visualización - + Import-Export Importar-Exportar - + All Mesh Files Tódolos ficheiros de malla - - + + Binary STL Binario STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Malla binaria - - + + Alias Mesh Alcume da malla - - + + Object File Format Formato do ficheiro do obxecto - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Polígono de Stanford - + NASTRAN NASTRAN - - + + All Files Tódolos ficheiros - + Import mesh Importar malla - + Simple Model Format Formato de Modelo Sinxelo - + Inventor V2.1 ascii Inventor v 2.1 ascii - + X3D Extensible 3D X3D Extensíbel 3D - + Compressed X3D Compressed X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML v 2.0 - + Compressed VRML 2.0 VRML 2.0 comprimido - + Nastran Nastran - + Python module def Definición do módulo Python - + Asymptote Format Asymptote Format - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh Exportar malla - + Meshing Tolerance Tolerancia da malla - + Enter tolerance for meshing geometry: Introduza a tolerancia para a xeometría da malla: - + The mesh '%1' is not a solid. A malla '%1' non é un sólido. - + The mesh '%1' is a solid. A malla '%1' é un sólido. - + Solid Mesh Malla sólida - + Boundings Límites - + Fill holes Reencher buratos - + Fill holes with maximum number of edges: Reencher buratos coa cantidade máxima de arestas: - + Scaling Escalar - + Enter scaling factor: Inserir factor de escala: - + [Points: %1, Edges: %2, Faces: %3] [Puntos: %1, Arestas: %2, Faces: %3] - + Display components Amosar compoñentes - + Display segments Amosar segmentos - + Display colors Display colors - - + + Leave info mode Saír do modo de información - + Index: %1 Índice: %1 - + Leave hole-filling mode Saír do modo de reenchido de buratos - + Leave removal mode Saír do modo de rexeitado - + Delete selected faces Desbotar as faces escolmadas - + Clear selected faces Limpar faces escolmadas - + Annotation Apuntamento diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_hr.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_hr.ts index 59f71d5591..8b12a05d62 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_hr.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_hr.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mreža - + Add triangle Dodaj trokut - - + + Add triangle manually to a mesh Ručno dodaj trokut mreži @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mreža - + Boundings info... Informacije o granicama... - - + + Shows the boundings of the selected mesh Prikazuje granicu odabrane mreže @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mreža - + Regular solid... Obično tijelo... - - + + Builds a regular solid Kreira obično tijelo @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mreža - + Cross-sections... Presjeci... - - + + Cross-sections Presjeci @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mreža - + Decimation... Desetkovanje... - - - + + + Decimates a mesh Desetkuj mrežu @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mreža - + Difference Razlika @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mreža - + Face info Informacije Lice - - + + Information about face Informacije o površini @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mreža - + Check solid mesh Provjerite tijelo mreže - - + + Checks whether the mesh is a solid Provjerava dali je li mreža tijelo @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mreža - + Evaluate and repair mesh... Procijena i popravak mreže... - - + + Opens a dialog to analyze and repair a mesh Otvara dijalog za analizu i popravak mreže @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mreža - + Export mesh... Izvoz mreže - - + + Exports a mesh to file Izvoz mreže u datoteku @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mreža - + Close hole Zatvori rupe - - + + Close holes interactively Zatvori rupe interaktivno @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mreža - + Fill holes... Ispuni rupe... - - + + Fill holes of the mesh Ispuni rupe mreže @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mreža - + Flip normals Zrcali normale - - + + Flips the normals of the mesh Zrcali normale mreže @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mreža - + Create mesh from geometry... Stvaranje mreže iz geometrije ... - - + + Create mesh from the selected geometry Stvori mrežu od odabranih objekata @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mreža - + Create mesh from shape... Stvori mrežu od oblika ... - + Tessellate shape Pretvori oblik u mrežu @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mreža - + Harmonize normals Uskladi normale - - + + Harmonizes the normals of the mesh Usklađuje normale mreže @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mreža - + Import mesh... Uvezi mrežu... - - + + Imports a mesh from file Uvoz mreže iz datoteke @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mreža - + Intersection Presjek @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mreža - + Merge Spoji - + Merges selected meshes into one Spaja odabrane mreže u jednu @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mreža - + Cut mesh Izreži mrežu - - + + Cuts a mesh with a picked polygon Presjeca mrežu sa odabranim višekutnikom @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mreža - + Make segment Stvori segment - - + + Creates a mesh segment Stvara segment mreže @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mreža - + Split mesh Podjeli mrežu - - + + Splits a mesh into two meshes Podijeli mrežu na dva dijela @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mreža - + Trim mesh Izreži mrežu - - + + Trims a mesh with a picked polygon Presjeca mrežu sa odabranim višekutnikom @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mreža - + Refinement... Izglađivanje... - - + + Refine existing mesh Izgladi postojeću mrežu @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mreža - + Remove components by hand... Ukloniti komponente ručno... - - + + Mark a component to remove it from the mesh Označi komponenta koju želite uklonili iz mreže @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mreža - + Remove components... Ukloniti komponente... - - + + Remove topologic independent components from the mesh Izvadite komponente neovisne o topologiji iz mreže @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mreža - + Scale... Skalirajte... - + Scale selected meshes Skaliranje odabranih mreža @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mreža - + Create section from mesh and plane Stvori presjek iz mreže i ravnine - - + + Section from mesh and plane Presjek iz mreže i ravnine @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mreža - + Create mesh segments... Kreiraj segmente mreže... - - + + Create mesh segments Kreiraj segmente mreže @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mreža - + Create mesh segments from best-fit surfaces... Stvaranje mreže segmenta od površina sa najboljim uklapanjem... - - + + Create mesh segments from best-fit surfaces Stvaranje mreže segmenta od površina sa najboljim uklapanjem @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mreža - + Smooth... Izgladi... - - + + Smooth the selected meshes Izgladi odabranu mrežu @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mreža - + Split by components Razdjeli po komponentama - + Split selected mesh into its components Podijelite odabranu mrežu na njene komponente @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mreža - + Trim mesh with a plane Obrezivanje mreže s ravninom - - + + Trims a mesh with a plane Obrezuje mrežu s ravninom @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mreža - + Union Unija @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mreža - + Curvature plot Iscrtavanje krivina - - + + Calculates the curvature of the vertices of a mesh Izračunava zakrivljenost vrhova mreže @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mreža - + Curvature info Informacije krivina - - + + Information about curvature Informacije o zakrivljenosti @@ -672,144 +672,144 @@ Unija mreže - + Mesh difference Razlika mreže - + Mesh intersection Preklapanje mreže - + Import Mesh Uvezi mrežu - + Mesh VertexCurvature Mreža zakrivljenosti tjemene točke - + Mesh Smoothing Zaglađivanje mreže - + Harmonize mesh normals Harmonizirajte mrežne normale - + Flip mesh normals Preokreni normale mreže - + Fill up holes Ispuni rupe - + Mesh merge Spoji mreže - + Mesh split Razdvoji mreže - + Mesh scale Skaliranje mreže - + Mesh Decimating Desetkuj mrežu - + Harmonize normals Uskladi normale - + Remove non-manifolds Ukloni nemnogostruke - + Fix indices Popravi indekse - + Remove degenerated faces Uklonite nevaljana naličja - + Remove duplicated faces Uklonite duplicirana naličja - + Remove duplicated points Uklonite duplicirane točke - + Fix self-intersections Popravi samo-sjecišta - + Remove folds Ukloni nabore - + Repair mesh Popravi mrežu - + Delete selection Obriši označeno - - + + Cut Isječak - - + + Trim Skrati - + Split Razdjeli - + Segment Segment - + Delete Izbriši - + Fill hole Ispuni rupu @@ -838,7 +838,7 @@ - + Absolute number Apsolutni broj @@ -848,7 +848,7 @@ Tolerancija - + Absolute number (Maximum: %1) Apsolutni broj (Maksimalno: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Postavke... - - + + No selection Nema odabira - - - - - - - - - - - + + + + + + + + + + + No information Nema informacija - + Orientation Orijentacija - + No flipped normals Nema zrcaljenih normala - + %1 flipped normals %1 zrcaljenih normala - + No non-manifolds Nema jednostrukih - + %1 non-manifolds %1 jednostrukih - - + + Non-manifolds Jednostruki - + Cannot remove non-manifolds Ne mogu ukloniti jednostruke - + Invalid face indices Nevaljani indeksi površina - + Invalid point indices Nevažeća točka indeksa - + Multiple point indices Višestruki indeksi točaka - + Invalid neighbour indices Nevažeći susjedni indeksi - + No invalid indices Nema nevažećih indeksa - + Indices Indeksi - + No degenerations Nema degeneracija - + %1 degenerated faces %1 degeneriranih površina - + Degenerations Degeneracije - + No duplicated faces Nema dvostrukih površina - + %1 duplicated faces %1 dvostrukih površina - + Duplicated faces Dvostruke površine - + No duplicated points Nema dvostrukih točaka - - + + Duplicated points Dvostruki vrhovi - + No self-intersections Nema prekalpanja - + Self-intersections Preklapanja - + No folds on surface Bez nabora na površini - + %1 folds on surface %1 nabori na površini - + Folds Sklapanje - - + + Mesh repair Popravi mrežu @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Napravi %1 - + No active document Nema aktivnog dokumenta @@ -1363,10 +1363,10 @@ Height: - Duljina: + Visina: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Ovaj parametar pokazuje koja ZIP kompresija je korištena za zapis u AMF formatu @@ -1552,48 +1552,48 @@ vodi do uglađenijeg izgleda. MeshGui::GmshWidget - + Automatic Automatsko - + Adaptive Prilagodljiv - + Frontal Čeoni - + Frontal Quad Čeoni Četverokut - + Parallelograms Paralelogrami - - + + Time: Vrijeme: - + Running gmsh... Izvodi se gmsh... - + Failed to start Neuspjelo pokretanje - + Error Pogreška @@ -1601,22 +1601,22 @@ vodi do uglađenijeg izgleda. MeshGui::MeshFaceAddition - + Add triangle Dodaj trokut - + Flip normal Okreni normalu - + Clear Brisanje - + Finish Završiti @@ -1624,7 +1624,7 @@ vodi do uglađenijeg izgleda. MeshGui::MeshFillHole - + Finish Završiti @@ -1632,47 +1632,47 @@ vodi do uglađenijeg izgleda. MeshGui::ParametersDialog - + Surface fit Prilagođavanje površine - + Parameters Parametara - + Selection Izbor - + Region Regija - + Triangle Trokut - + Clear Brisanje - + Compute Izračunati - + No selection Nema odabira - + Before fitting the surface select an area. Prije prilagođavanja površine odaberite jedno područje. @@ -1931,29 +1931,29 @@ vodi do uglađenijeg izgleda. Kugla - - + + Base Baza - + Normal Normalno - + Axis Osi - - + + Radius Polumjer - + Center Središte @@ -1987,12 +1987,12 @@ vodi do uglađenijeg izgleda. Poštovanje samo trokuta s normalama prema zaslonu - + Use a brush tool to select the area Koristiti kist alat za odabir područja - + Clears completely the selected area Potpuno Briše odabrano područje @@ -2000,14 +2000,14 @@ vodi do uglađenijeg izgleda. MeshGui::TaskRemoveComponents - - + + Delete Izbriši - - + + Invert Invertiraj @@ -2015,38 +2015,38 @@ vodi do uglađenijeg izgleda. MeshInfoWatcher - + Number of points: Broj vrhova: - + Number of facets: Broj naličja: - + Minimum bound: Minimalna granica: - + Maximum bound: Maksimalna granica: - + Mesh info box Info okvir Mreže - + Mesh info Informacije Mreže - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2054,7 +2054,7 @@ vodi do uglađenijeg izgleda. Mesh_BoundingBox - + Boundings of %1: Ograničenje od %1: @@ -2062,26 +2062,26 @@ vodi do uglađenijeg izgleda. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Pojavila se nepoznata pogreška pri izvršavanju OpenSCAD-a. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD nije moguće pronaći na vašem sustavu. @@ -2091,7 +2091,7 @@ Posjetite http://www.openscad.org/index.html da biste ga instalirali. QDockWidget - + Evaluate & Repair Mesh Procijeni & Popravi mrežu @@ -2099,241 +2099,241 @@ Posjetite http://www.openscad.org/index.html da biste ga instalirali. QObject - + Display Prikaz - + Import-Export Uvoz / izvoz - + All Mesh Files Sve datoteke mreže - - + + Binary STL Binarno STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binarno Mreža - - + + Alias Mesh Nadimak mreže - - + + Object File Format Format Datoteke Objekta - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford višekutnik - + NASTRAN NASTRAN - - + + All Files Sve datoteke - + Import mesh Uvezi mrežu - + Simple Model Format Jednostavan Model Format - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Proširena 3D - + Compressed X3D Komprimirani X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Komprimirani VRML 2.0 - + Nastran Nastran finite element analysis (FEA) - + Python module def Python modul def - + Asymptote Format Format asimptote - + 3D Manufacturing Format 3D proizvodni format - + Export mesh Izvezi mrežu - + Meshing Tolerance Tolerancija mreže - + Enter tolerance for meshing geometry: Unesite toleranciju geometrije mreže: - + The mesh '%1' is not a solid. Mreža '%1' nije tijelo. - + The mesh '%1' is a solid. Mreža '%1' je tijelo. - + Solid Mesh Čvrsta mreža - + Boundings Granice - + Fill holes Ispuni rupe - + Fill holes with maximum number of edges: Ispunite rupe s maksimalnim brojem rubova: - + Scaling Skaliranje - + Enter scaling factor: Unesite faktor skaliranja: - + [Points: %1, Edges: %2, Faces: %3] [Točke: %1, Rubovi: %2, Lica: %3] - + Display components Prikaz komponenti - + Display segments Prikaži segmente - + Display colors Boje prikaza - - + + Leave info mode Zatvori info način rada - + Index: %1 Indeks: %1 - + Leave hole-filling mode Zatvori način rada za popunjavanje otvora - + Leave removal mode Zatvori način rada za uklanjanje - + Delete selected faces Izbriši odabrane površine - + Clear selected faces Izbriši odabrane površine - + Annotation Anotacija diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_hu.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_hu.ts index 9776db292f..d86b56c273 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_hu.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_hu.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Háló - + Add triangle Háromszöget adjon hozzá - - + + Add triangle manually to a mesh Adjon háromszöget kézzel a hálóhoz @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Háló - + Boundings info... Határolók információi... - - + + Shows the boundings of the selected mesh Megmutatja a kiválasztott háló határvonalait @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Háló - + Regular solid... Szabályos szilárd test... - - + + Builds a regular solid Szabályos szilárd testet épít @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Háló - + Cross-sections... Keresztmetszet... - - + + Cross-sections Keresztmetszet @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Háló - + Decimation... Tizedelés... - - - + + + Decimates a mesh Háló tizedelése @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Háló - + Difference Különbség @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Háló - + Face info Felület infó - - + + Information about face Információ a felületről @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Háló - + Check solid mesh Szilárd háló ellenőrzése - - + + Checks whether the mesh is a solid Ellenőrzi, ha a háló egy szilárd testet ad ki @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Háló - + Evaluate and repair mesh... Háló értékelése & javítása... - - + + Opens a dialog to analyze and repair a mesh Megnyit egy párbeszédablakot, a háló elemzéséhez és javításához @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Háló - + Export mesh... Háló exportálása... - - + + Exports a mesh to file Fájlba exportálja a hálót @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Háló - + Close hole Lyukat bezárja - - + + Close holes interactively Interaktívan bezárja a lyukakat @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Háló - + Fill holes... Lyukak kitöltése... - - + + Fill holes of the mesh A hálón lévő lyukak kitöltése @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Háló - + Flip normals Aktuálisok tükrözése - - + + Flips the normals of the mesh Az aktuális hálók tükrözése @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Háló - + Create mesh from geometry... Háló létrehozása a geometriából... - - + + Create mesh from the selected geometry Háló létrehozása a kijelölt geometriából @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Háló - + Create mesh from shape... Hálós test létrehozása alakzatból... - + Tessellate shape Mozaik alakja @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Háló - + Harmonize normals Aktuálisok összehangolása - - + + Harmonizes the normals of the mesh A hálón lévő aktuálisok összehangolása @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Háló - + Import mesh... Háló importálása... - - + + Imports a mesh from file A háló importálása fájlból @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Háló - + Intersection Metszet @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Háló - + Merge Egyesítés - + Merges selected meshes into one Egyesíti a kiválasztott hálótesteket @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Háló - + Cut mesh Háló vágása - - + + Cuts a mesh with a picked polygon Háló kivágása a kiválasztott sokszög rácsvonallal @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Háló - + Make segment Szegmens létrehozása - - + + Creates a mesh segment A háló szegmens létrehozása @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Háló - + Split mesh Háló osztása - - + + Splits a mesh into two meshes Háló osztása két részre @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Háló - + Trim mesh Háló levágása - - + + Trims a mesh with a picked polygon A háló levágása kiválasztott sokszöggel @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Háló - + Refinement... Finomítás... - - + + Refine existing mesh Meglévő háló finomítása @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Háló - + Remove components by hand... Távolítsa el kézzel az összetevőket... - - + + Mark a component to remove it from the mesh Egy összetevő megjelölése a hálóból való eltávolításához @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Háló - + Remove components... Összetevők eltávolítása... - - + + Remove topologic independent components from the mesh Vegye ki a topológiailag független részegységeket a hálóból @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Háló - + Scale... Lépték... - + Scale selected meshes Kiválasztott hálók skálázása @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Háló - + Create section from mesh and plane Létrehoz egy szakaszt a hálóból és a síkból - - + + Section from mesh and plane Szakasz a hálóból és a síkból @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Háló - + Create mesh segments... Háló szegmensek létrehozása... - - + + Create mesh segments Háló szegmensek létrehozása @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Háló - + Create mesh segments from best-fit surfaces... Háló szegmensek létrehozása a legjobban illeszkedő felületekből... - - + + Create mesh segments from best-fit surfaces Háló szegmensek létrehozása a legjobban illeszkedő felületekből @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Háló - + Smooth... Simítás... - - + + Smooth the selected meshes Kiválasztott háló simítása @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Háló - + Split by components Felosztás összetevők szerint - + Split selected mesh into its components Kijelölt háló felosztása összetevőire @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Háló - + Trim mesh with a plane Egy síkkal metszi a hálótestet - - + + Trims a mesh with a plane Egy síkkal metsz egy hálótestet @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Háló - + Union Egyesítés @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Háló - + Curvature plot Görbület terv - - + + Calculates the curvature of the vertices of a mesh Kiszámítja egy háló csúcspont görbületét @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Háló - + Curvature info Görbület információ - - + + Information about curvature Görbület információk @@ -672,144 +672,144 @@ Háló egyesítés - + Mesh difference Háló különbségek - + Mesh intersection Háló metszéspont - + Import Mesh Háló importálás - + Mesh VertexCurvature Hálócsúcsgörbület - + Mesh Smoothing Háló simítás - + Harmonize mesh normals Aktuális hálók összehangolása - + Flip mesh normals Aktuális háló átfordítás - + Fill up holes Furatokat tölt ki - + Mesh merge Háló egyesítés - + Mesh split Háló felosztás - + Mesh scale Háló méretezés - + Mesh Decimating Háló tizedelése - + Harmonize normals Aktuálisok összehangolása - + Remove non-manifolds Nem-szétágazók eltávolítása - + Fix indices Jelzőszámok javítása - + Remove degenerated faces Korcs felületek eltávolítása - + Remove duplicated faces Kettőzött felületek eltávolítása - + Remove duplicated points Kettőzött pontok eltávolítása - + Fix self-intersections Belső-csomópontok javítása - + Remove folds Redők eltávolítása - + Repair mesh Háló javítás - + Delete selection Kijelölt törlése - - + + Cut Kivágás - - + + Trim Vágás - + Split Feloszt - + Segment Szegmens - + Delete Töröl - + Fill hole Furatokat kitölt @@ -838,7 +838,7 @@ - + Absolute number Abszolút szám @@ -848,7 +848,7 @@ Tűrés - + Absolute number (Maximum: %1) Abszolút szám (Maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Beállítások... - - + + No selection Nincs kijelölés - - - - - - - - - - - + + + + + + + + + + + No information Nincs információ - + Orientation Tájolás - + No flipped normals Nincsenek tükrözött aktuálisok - + %1 flipped normals %1 tükrözött aktuálisok - + No non-manifolds Nincsenek nem-szétágazottak - + %1 non-manifolds %1 nem-szétágazott - - + + Non-manifolds Nem szétágazó - + Cannot remove non-manifolds Nem lehet eltávolítani a nem-szétágazottakat - + Invalid face indices Érvénytelen felület indexek - + Invalid point indices Érvénytelen pont indexek - + Multiple point indices Több pontos indexek - + Invalid neighbour indices Érvénytelen szomszédos indexek - + No invalid indices Nincsenek érvénytelen indexek - + Indices Indexek - + No degenerations Nincs elváltozás - + %1 degenerated faces %1 elváltozott felület - + Degenerations Elváltozás - + No duplicated faces Nincsenek duplikált felületek - + %1 duplicated faces %1 duplikált felület - + Duplicated faces Felületek megduplázása - + No duplicated points Nincsenek duplikált pontok - - + + Duplicated points Pontok megkettőzése - + No self-intersections Nem belső-csomópontok - + Self-intersections Saját csomópontok - + No folds on surface Nem hajítható felület - + %1 folds on surface %1 összecsukás a felületen - + Folds Ráncok - - + + Mesh repair Háló javítása @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Létrehozás %1 - + No active document Nincs aktív dokumentum @@ -1366,7 +1366,7 @@ Magasság: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Ez a paraméter azt jelzi, hogy a program használ-e ZIP-tömörítést a fájlok AMF formátumban történő írásakor @@ -1549,48 +1549,48 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj MeshGui::GmshWidget - + Automatic Automatikus - + Adaptive Adaptív - + Frontal Elülső - + Frontal Quad Elülső négyoldalú - + Parallelograms Parallelogramma - - + + Time: Idő: - + Running gmsh... Futó gmsh... - + Failed to start Nem sikerült elindítani - + Error Hiba @@ -1598,22 +1598,22 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj MeshGui::MeshFaceAddition - + Add triangle Háromszöget adjon hozzá - + Flip normal Normál tükrözés - + Clear Tiszta - + Finish Befejezés @@ -1621,7 +1621,7 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj MeshGui::MeshFillHole - + Finish Befejezés @@ -1629,47 +1629,47 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj MeshGui::ParametersDialog - + Surface fit Felület illesztés - + Parameters Paraméterek - + Selection Kijelölés - + Region Régió - + Triangle Háromszög - + Clear Törlés - + Compute Kiszámítás - + No selection Nincs kijelölés - + Before fitting the surface select an area. Felület illesztése előtt jelöljön ki egy területet. @@ -1729,7 +1729,7 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj Clear - Törlés + Tiszta @@ -1928,29 +1928,29 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj Gömb - - + + Base Alap - + Normal Alapértelmezett - + Axis Tengely - - + + Radius Sugár - + Center Középre @@ -1984,12 +1984,12 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj Csak az aktuális felülettel kijelzett háromszögeket részesíti előnyben - + Use a brush tool to select the area Ecset eszköz segítségével válassza ki a területet - + Clears completely the selected area Teljesen törli a kijelölt területet @@ -1997,14 +1997,14 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj MeshGui::TaskRemoveComponents - - + + Delete - Töröl + Törlés - - + + Invert Invertálás @@ -2012,38 +2012,38 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj MeshInfoWatcher - + Number of points: Pontok száma: - + Number of facets: Sokszögek száma: - + Minimum bound: Minimális határérték: - + Maximum bound: Maimális határérték: - + Mesh info box Háló info mező - + Mesh info Háló infó - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2051,7 +2051,7 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj Mesh_BoundingBox - + Boundings of %1: %1 kötései: @@ -2059,26 +2059,26 @@ Ha a felület szöge ≥ gyűrődésszögét, a feület árnyékolást használj Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Ismeretlen hiba történt az OpenSCAD futása közben. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD nem található a rendszeren. Kérjük, látogasson el ide: http://www.openscad.org/index.html a telepítéshez. @@ -2087,7 +2087,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Háló értékelése & javítása @@ -2095,241 +2095,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Megjelenítés - + Import-Export Importálás-Exportálás - + All Mesh Files Minden hálótest fájl - - + + Binary STL Bináris STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Bináris hálótest - - + + Alias Mesh Ál hálótest - - + + Object File Format Tárgy fájl formátum - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford sokszög - + NASTRAN NASTRAN - - + + All Files Összes fájl - + Import mesh Háló importálása - + Simple Model Format Egyszerű modell formátum - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D bővíthető 3D - + Compressed X3D Tömörített X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Tömörített VRML 2.0 - + Nastran Nastran - + Python module def Python modul def - + Asymptote Format Érintő formátum - + 3D Manufacturing Format 3D gyártási formátum - + Export mesh Háló exportálása - + Meshing Tolerance Hálózás tűrése - + Enter tolerance for meshing geometry: Adja meg a tűrést az erővonal geometriájának: - + The mesh '%1' is not a solid. A(z)'%1' háló nem szilárd test. - + The mesh '%1' is a solid. A(z) '%1' háló egy szilárd test. - + Solid Mesh Szilárd test háló - + Boundings Csatlakozások - + Fill holes Furatok kitöltése - + Fill holes with maximum number of edges: Töltse ki a furatokat maximális számú élekkel: - + Scaling Méretezés - + Enter scaling factor: Adja meg a skálafaktort: - + [Points: %1, Edges: %2, Faces: %3] [Pontok: %1, élek: %2, felületek: %3] - + Display components Összetevők megjelenítése - + Display segments Szegmensek megjelenítése - + Display colors Megjelenített színek - - + + Leave info mode Hagyja az info módot - + Index: %1 Index: %1 - + Leave hole-filling mode Hagyja lyuk betöltő üzemmódban - + Leave removal mode Hagyja eltávolítása módban - + Delete selected faces Törli a kijelölt felületeket - + Clear selected faces Felületek kiválasztásának törlése - + Annotation Jegyzet diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_id.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_id.ts index 5bc1eedcf1..34ace98d36 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_id.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_id.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Tambahkan segitiga - - + + Add triangle manually to a mesh Add triangle manually to a mesh @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Ikatan info... - - + + Shows the boundings of the selected mesh Menunjukkan ikatan tautan yang dipilih @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Biasa padat... - - + + Builds a regular solid Membangun solid biasa @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Persimpangan... - - + + Cross-sections Persimpangan @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Decimation... - - - + + + Decimates a mesh Decimates a mesh @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Perbedaan @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Wajah info - - + + Information about face Informasi tentang wajah @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Check solid mesh - - + + Checks whether the mesh is a solid Memeriksa apakah mesh itu padat @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Evaluate and repair mesh... - - + + Opens a dialog to analyze and repair a mesh Membuka dialog untuk menganalisa dan memperbaiki jala @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Ekspor mesh... - - + + Exports a mesh to file Ekspor mesh ke file @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Tutup lubang - - + + Close holes interactively Tutup lubang secara interaktif @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Isi lubang... - - + + Fill holes of the mesh Isi lubang jala @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Flip normal - - + + Flips the normals of the mesh Membalik normals dari jala @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Buat jala dari geometri... - - + + Create mesh from the selected geometry Buat jala dari yang dipilih geometri @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Create mesh from shape... - + Tessellate shape Tessellate shape @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Harmonis normal - - + + Harmonizes the normals of the mesh Selaras dengan normals dari jala @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Impor mesh... - - + + Imports a mesh from file Impor mesh dari file @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Persimpangan @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Menggabungkan - + Merges selected meshes into one Menggabungkan jerat terpilih menjadi satu @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Potong jala - - + + Cuts a mesh with a picked polygon Memotong jaring dengan poligon pilihan @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Buat segmen - - + + Creates a mesh segment Creates a mesh segment @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Split jaring - - + + Splits a mesh into two meshes Perpecahan jala menjadi dua jerat @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Pangkas jaring - - + + Trims a mesh with a picked polygon Potong jala dengan poligon pilihan @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Refinement... - - + + Refine existing mesh Refine existing mesh @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Hapus komponen dengan tangan... - - + + Mark a component to remove it from the mesh Menandai komponen untuk menghapusnya dari para jala @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Hapus komponen... - - + + Remove topologic independent components from the mesh Hapus komponen independen topologic dari para jala @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Skala... - + Scale selected meshes Skala jerat dipilih @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Buat bagian dari mesh dan plane - - + + Section from mesh and plane Bagian dari jala dan pesawat @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Buat segmen jaring... - - + + Create mesh segments Buat segmen jaring @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Create mesh segments from best-fit surfaces... - - + + Create mesh segments from best-fit surfaces Create mesh segments from best-fit surfaces @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Halus... - - + + Smooth the selected meshes Haluskan jaring yang dipilih @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Split by components - + Split selected mesh into its components Split selected mesh into its components @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Pangkas jaring dengan pesawat - - + + Trims a mesh with a plane Potong jala dengan pesawat @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Persatuan @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Plot lengkungan - - + + Calculates the curvature of the vertices of a mesh Menghitung kelengkungan dari simpul dari jala @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Info kelengkungan - - + + Information about curvature Informasi tentang kelengkungan @@ -672,144 +672,144 @@ Mesh union - + Mesh difference Mesh difference - + Mesh intersection Mesh intersection - + Import Mesh Import Mesh - + Mesh VertexCurvature Mesh VertexCurvature - + Mesh Smoothing Mesh Smoothing - + Harmonize mesh normals Harmonize mesh normals - + Flip mesh normals Flip mesh normals - + Fill up holes Fill up holes - + Mesh merge Mesh merge - + Mesh split Mesh split - + Mesh scale Mesh scale - + Mesh Decimating Mesh Decimating - + Harmonize normals Harmonis normal - + Remove non-manifolds Remove non-manifolds - + Fix indices Fix indices - + Remove degenerated faces Remove degenerated faces - + Remove duplicated faces Remove duplicated faces - + Remove duplicated points Remove duplicated points - + Fix self-intersections Fix self-intersections - + Remove folds Remove folds - + Repair mesh Repair mesh - + Delete selection Delete selection - - + + Cut Memotong - - + + Trim Memangkas - + Split Split - + Segment Segment - + Delete Menghapus - + Fill hole Fill hole @@ -838,7 +838,7 @@ - + Absolute number Absolute number @@ -848,7 +848,7 @@ Toleransi - + Absolute number (Maximum: %1) Absolute number (Maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Setelan... - - + + No selection Tidak ada pilihan - - - - - - - - - - - + + + + + + + + + + + No information Tidak ada informasi - + Orientation Orientasi - + No flipped normals Tidak ada normal membalik - + %1 flipped normals % 1 membalik normals - + No non-manifolds Tidak ada manifold - + %1 non-manifolds % 1 non-manifold - - + + Non-manifolds Bukan manifold - + Cannot remove non-manifolds Tidak dapat menghapus non-manifold - + Invalid face indices Indeks wajah tidak valid - + Invalid point indices Indeks titik tidak valid - + Multiple point indices Beberapa indeks titik - + Invalid neighbour indices Indeks tetangga tidak valid - + No invalid indices Tidak ada indeks yang tidak valid - + Indices Indeks - + No degenerations Tidak ada degenerasi - + %1 degenerated faces % 1 merosot wajah - + Degenerations Degenerasi - + No duplicated faces Tidak ada wajah duplikat - + %1 duplicated faces % 1 wajah duplikat - + Duplicated faces Wajah duplikat - + No duplicated points Tidak ada poin duplikat - - + + Duplicated points Poin duplikat - + No self-intersections Tidak ada persimpangan diri - + Self-intersections Persimpangan diri - + No folds on surface Tidak ada lipatan di permukaan - + %1 folds on surface % 1 lipatan di permukaan - + Folds Lipat - - + + Mesh repair Perbaikan mesh @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Buat % 1 - + No active document Tidak ada dokumen aktif @@ -1366,7 +1366,7 @@ Tinggi: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format This parameter indicates whether ZIP compression @@ -1551,48 +1551,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Otomatis - + Adaptive Adaptive - + Frontal Frontal - + Frontal Quad Frontal Quad - + Parallelograms Parallelograms - - + + Time: Waktu: - + Running gmsh... Running gmsh... - + Failed to start Failed to start - + Error Kesalahan @@ -1600,22 +1600,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Tambahkan segitiga - + Flip normal Flip normal - + Clear Bersih - + Finish Selesai @@ -1623,7 +1623,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Selesai @@ -1631,47 +1631,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Surface fit - + Parameters Parameter - + Selection Pilihan - + Region Wilayah - + Triangle Segi tiga - + Clear Bersih - + Compute Compute - + No selection Tidak ada pilihan - + Before fitting the surface select an area. Before fitting the surface select an area. @@ -1930,29 +1930,29 @@ to a smoother appearance. Lingkup - - + + Base Base - + Normal Normal - + Axis Axis - - + + Radius Jari-jari - + Center Pusat @@ -1986,12 +1986,12 @@ to a smoother appearance. Menghormati hanya segitiga dengan normal yang menghadap layar - + Use a brush tool to select the area Gunakan alat sikat untuk memilih area - + Clears completely the selected area Membersihkan sepenuhnya area yang dipilih @@ -1999,14 +1999,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Menghapus - - + + Invert Membalikkan @@ -2014,38 +2014,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Jumlah poin: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Mesh info - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Boundings of %1: @@ -2061,26 +2061,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD Buka Scad - - - + + + Unknown error occurred while running OpenSCAD. Terjadi kesalahan yang tidak diketahui saat menjalankan OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD tidak dapat ditemukan di sistem anda. Silakan kunjungi http://www.openscad.org/index.html untuk menginstalnya. @@ -2089,7 +2089,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Evaluasi & Perbaikan Mesh @@ -2097,241 +2097,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Tampilan - + Import-Export Ekspor Impor - + All Mesh Files Semua File Mesh - - + + Binary STL Biner STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binary Mesh - - + + Alias Mesh Alias Mesh - - + + Object File Format Objek File Format - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files Semua data - + Import mesh Impor mesh - + Simple Model Format Simple Model Format - + Inventor V2.1 ascii Penemu V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Compressed X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Compressed VRML 2.0 - + Nastran Nastran - + Python module def Modul python def - + Asymptote Format Asymptote Format - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh Ekspor mesh - + Meshing Tolerance Meshing Toleransi - + Enter tolerance for meshing geometry: Masukkan toleransi untuk geometri meshing: - + The mesh '%1' is not a solid. Jala ' % 1 ' bukan padat. - + The mesh '%1' is a solid. Jaringan ' % 1 ' adalah padat. - + Solid Mesh Solid Mesh - + Boundings Boundings - + Fill holes Isi lubang - + Fill holes with maximum number of edges: Isi lubang dengan jumlah maksimum tepi: - + Scaling Scaling - + Enter scaling factor: Masukkan faktor penskalaan: - + [Points: %1, Edges: %2, Faces: %3] [Poin: % 1 , Tepi: % 2 , Wajah: % 3 ] - + Display components Menampilkan komponen - + Display segments Display segments - + Display colors Display colors - - + + Leave info mode Tinggalkan info mode - + Index: %1 Indeks: % 1 - + Leave hole-filling mode Tinggalkan mode pengisian lubang - + Leave removal mode Tinggalkan mode penghapusan - + Delete selected faces Hapus wajah yang dipilih - + Clear selected faces Hapus wajah yang dipilih - + Annotation Anotasi diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_it.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_it.ts index 5168c38faf..a2160a1dac 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_it.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_it.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Aggiungi triangolo - - + + Add triangle manually to a mesh Aggiunge manualmente un triangolo alla mesh @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Info limiti d'ingombro... - - + + Shows the boundings of the selected mesh Mostra le coordinate dei limiti del contenitore della mesh selezionata @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Solido regolare... - - + + Builds a regular solid Costruisce un solido regolare @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Sezioni... - - + + Cross-sections Sezioni @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Decimazione... - - - + + + Decimates a mesh Decima una mesh @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Differenza @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Dettagli faccia - - + + Information about face Informazioni sulla faccia @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Controlla se è un solido - - + + Checks whether the mesh is a solid Controlla se l'oggetto mesh è un solido @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Valuta e ripara la mesh... - - + + Opens a dialog to analyze and repair a mesh Apre una finestra di dialogo per analizzare e riparare una mesh @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Esporta mesh... - - + + Exports a mesh to file Esporta la mesh in un file @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Chiudi il foro - - + + Close holes interactively Chiude i buchi in modo interattivo @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Riempi i buchi... - - + + Fill holes of the mesh Riempie i buchi della mesh @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Inverti le normali - - + + Flips the normals of the mesh Inverte le normali della mesh @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Crea una mesh da una geometria... - - + + Create mesh from the selected geometry Crea una mesh dalla geometria selezionata @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Crea mesh da una forma... - + Tessellate shape Forma della tessellazione @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Armonizza le normali - - + + Harmonizes the normals of the mesh Armonizza le normali della mesh @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Importa mesh... - - + + Imports a mesh from file Importa una mesh da file @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Intersezione @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Unisci - + Merges selected meshes into one Unisce le Mesh selezionate in una unica @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Taglia la mesh - - + + Cuts a mesh with a picked polygon Taglia la mesh con un poligono @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Crea un segmento - - + + Creates a mesh segment Crea un segmento di mesh @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Dividi la mesh - - + + Splits a mesh into two meshes Divide la mesh in due mesh @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Rifila con un poligono - - + + Trims a mesh with a picked polygon Taglia una mesh con un poligono selezionato @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Affinamento... - - + + Refine existing mesh Affina le mesh esistenti @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Rimuovi componenti a mano... - - + + Mark a component to remove it from the mesh Segna un componente per rimuoverlo dalla mesh @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Rimuovi componente... - - + + Remove topologic independent components from the mesh Rimuove i componenti topologici indipendenti dalla mesh @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Scala... - + Scale selected meshes Scala le mesh selezionate @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Sezione da mesh e piano - - + + Section from mesh and plane Sezione da mesh e piano @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Crea segmenti di mesh... - - + + Create mesh segments Crea segmenti di mesh @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Adatta i segmenti... - - + + Create mesh segments from best-fit surfaces Crea segmenti mesh delle superfici che si adattano meglio @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Leviga... - - + + Smooth the selected meshes Leviga le mesh selezionate @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Dividi in componenti - + Split selected mesh into its components Dividi la mesh selezionata nei suoi componenti @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Rifila con un piano - - + + Trims a mesh with a plane Rifila una mesh con un piano @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Unione @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Grafico della curvatura - - + + Calculates the curvature of the vertices of a mesh Calcola la curvatura dei vertici di una mesh @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Dettagli della curvatura - - + + Information about curvature Informazioni sulla curvatura @@ -672,144 +672,144 @@ Unione mesh - + Mesh difference Differenza di mesh - + Mesh intersection Intersezione di mesh - + Import Mesh Importa Mesh - + Mesh VertexCurvature Mesh VerticiCurvatura - + Mesh Smoothing Leviga la mesh - + Harmonize mesh normals Armonizza le normali della mesh - + Flip mesh normals Inverti le normali della mesh - + Fill up holes Riempi i fori - + Mesh merge Unisci le mesh - + Mesh split Dividi le mesh - + Mesh scale Scala la mesh - + Mesh Decimating Decimazione mesh - + Harmonize normals Armonizza le normali - + Remove non-manifolds Rimuovi non-manifolds - + Fix indices Ripara indici - + Remove degenerated faces Rimuovi facce degenerate - + Remove duplicated faces Rimuovi facce duplicate - + Remove duplicated points Rimuovi punti duplicati - + Fix self-intersections Correggi le auto-intersezioni - + Remove folds Rimuovi pieghe - + Repair mesh Ripara la mesh - + Delete selection Elimina selezione - - + + Cut Taglio - - + + Trim Assetto - + Split Dividi - + Segment Segmento - + Delete Elimina - + Fill hole Riempi foro @@ -838,7 +838,7 @@ - + Absolute number Valore assoluto @@ -848,7 +848,7 @@ Tolleranza - + Absolute number (Maximum: %1) Valore assoluto (massimo: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Impostazioni... - - + + No selection Nessuna selezione - - - - - - - - - - - + + + + + + + + + + + No information Nessuna informazione - + Orientation Orientamento - + No flipped normals Nessuna normale invertita - + %1 flipped normals %1 normali invertite - + No non-manifolds Nessun non-manifold - + %1 non-manifolds %1 non-manifold - - + + Non-manifolds Non-manifold - + Cannot remove non-manifolds non è possibile rimuovere i non-manifold - + Invalid face indices Indici faccia non validi - + Invalid point indices Indici punto non validi - + Multiple point indices Indici punto multipli - + Invalid neighbour indices Indici vicini non validi - + No invalid indices Nessun indice non valido - + Indices Indici - + No degenerations Nessuna degenerazione - + %1 degenerated faces %1 facce degenerate - + Degenerations Degenerazioni - + No duplicated faces Nessuna faccia duplicata - + %1 duplicated faces %1 facce duplicate - + Duplicated faces Facce duplicate - + No duplicated points Nessun punto duplicato - - + + Duplicated points Punti duplicati - + No self-intersections Nessuna auto-intersezione - + Self-intersections Auto-intersezioni - + No folds on surface Nessuna piega sulla superficie - + %1 folds on surface %1 pieghe sulla superficie - + Folds Pieghe - - + + Mesh repair Ripara la mesh @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Crea %1 - + No active document Nessun documento attivo @@ -1366,7 +1366,7 @@ Altezza: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Questo parametro indica se la compressione ZIP @@ -1547,48 +1547,48 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate MeshGui::GmshWidget - + Automatic Automatica - + Adaptive Adattivo - + Frontal Frontale - + Frontal Quad Quad frontale - + Parallelograms Parallelogrammi - - + + Time: Tempo: - + Running gmsh... Esecuzione di gmsh... - + Failed to start Avvio fallito - + Error Errore @@ -1596,22 +1596,22 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate MeshGui::MeshFaceAddition - + Add triangle Aggiungi triangolo - + Flip normal Inverti la normale - + Clear Cancella - + Finish Termina @@ -1619,7 +1619,7 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate MeshGui::MeshFillHole - + Finish Termina @@ -1627,47 +1627,47 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate MeshGui::ParametersDialog - + Surface fit Adattamento della superficie - + Parameters Parametri - + Selection Selezione - + Region Regione - + Triangle Triangolo - + Clear Pulisci - + Compute Calcola - + No selection Nessuna selezione - + Before fitting the surface select an area. Prima di adattare la superficie selezionare un'area. @@ -1727,7 +1727,7 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate Clear - Pulisci + Cancella @@ -1926,29 +1926,29 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate Sfera - - + + Base Base - + Normal Normale - + Axis Asse - - + + Radius Raggio - + Center Centro @@ -1982,12 +1982,12 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate Solo i triangoli con le normali in direzione dello schermo - + Use a brush tool to select the area Usa uno strumento pennello per selezionare l'area - + Clears completely the selected area Cancella completamente l'area selezionata @@ -1995,14 +1995,14 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate MeshGui::TaskRemoveComponents - - + + Delete Elimina - - + + Invert Inverti @@ -2010,38 +2010,38 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate MeshInfoWatcher - + Number of points: Numero di punti: - + Number of facets: Numero di sfaccettature: - + Minimum bound: Limite minimo: - + Maximum bound: Limite massimo: - + Mesh info box Casella informazioni Mesh - + Mesh info Informazioni sulla mesh - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2049,7 +2049,7 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate Mesh_BoundingBox - + Boundings of %1: Limiti di %1: @@ -2057,26 +2057,26 @@ Usando l'ombreggiatura piana, le normali alla superficie non saranno determinate Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Si è verificato un errore sconosciuto durante l'esecuzione di OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD non può essere trovato sul tuo sistema. Visita http://www.openscad.org/index.html per installarlo. @@ -2085,7 +2085,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Valuta e ripara mesh @@ -2093,241 +2093,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Visualizzazione - + Import-Export Importa/Esporta - + All Mesh Files Tutti i file Mesh - - + + Binary STL STL binario - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binario Mesh - - + + Alias Mesh Alias Mesh - - + + Object File Format Object File Format - + Inventor V2.1 ASCII Inventor ascii V2.1 - - + + Stanford Polygon Poligono Stanford - + NASTRAN NASTRAN - - + + All Files Tutti i file - + Import mesh Importa mesh - + Simple Model Format Formato del modello semplice - + Inventor V2.1 ascii Inventor ascii V2.1 - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D X3D Compresso - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML v 2.0 - + Compressed VRML 2.0 Compresso VRML 2.0 - + Nastran Nastran - + Python module def Modulo def di Python - + Asymptote Format Formato Asymptote - + 3D Manufacturing Format Formato Di Produzione 3D - + Export mesh Esporta mesh - + Meshing Tolerance Tolleranza Mesh - + Enter tolerance for meshing geometry: Inserisci la tolleranza per la geometria della mesh - + The mesh '%1' is not a solid. L'oggetto mesh '%1' non è un solido. - + The mesh '%1' is a solid. L'oggetto mesh '%1' è un solido. - + Solid Mesh Mesh solida - + Boundings Limiti - + Fill holes Riempi i buchi - + Fill holes with maximum number of edges: Numero massimo di spigoli per riempire i buchi: - + Scaling Scalatura - + Enter scaling factor: Immettere il fattore di scala: - + [Points: %1, Edges: %2, Faces: %3] [Punti: %1, bordi: %2, facce: %3] - + Display components Visualizza i componenti - + Display segments Mostra i segmenti - + Display colors Visualizza colori - - + + Leave info mode Esci dalla modalità info - + Index: %1 Indice: %1 - + Leave hole-filling mode Esci dalla modalità riempimento dei buchi - + Leave removal mode Esci dalla modalità rimozione - + Delete selected faces Elimina le facce selezionate - + Clear selected faces Cancella le facce selezionate - + Annotation Annotazione diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ja.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ja.ts index fedd8a5694..08f754214c 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ja.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ja.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle 三角形を追加 - - + + Add triangle manually to a mesh 手動でメッシュに三角形を追加 @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... バウンディングボックス情報... - - + + Shows the boundings of the selected mesh 選択されたメッシュのバウンディングボックスを表示します @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... 正多面体... - - + + Builds a regular solid 正多面体を作成 @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... 断面... - - + + Cross-sections 断面 @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... 間引き... - - - + + + Decimates a mesh メッシュを間引きする @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference 差集合 @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info 面の情報 - - + + Information about face 面の情報 @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh ソリッドメッシュをチェック - - + + Checks whether the mesh is a solid メッシュがソリッドかどうか調べる @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... メッシュの検査と修復... - - + + Opens a dialog to analyze and repair a mesh メッシュの分析・修復ダイアログを開く @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... メッシュをエクスポート... - - + + Exports a mesh to file メッシュをファイルにエクスポート @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole 穴をふさぐ - - + + Close holes interactively 対話形式で穴を閉じる @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... 穴を閉じる... - - + + Fill holes of the mesh メッシュの穴を閉じる @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals 法線を反転 - - + + Flips the normals of the mesh メッシュの法線を反転 @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... ジオメトリからメッシュを作成... - - + + Create mesh from the selected geometry 選択されたジオメトリからメッシュを作成します @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... シェイプからメッシュを作成... - + Tessellate shape シェイプをテッセレーションします。 @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals 法線を一致 - - + + Harmonizes the normals of the mesh メッシュの法線の向きを一致させます @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... メッシュをインポート... - - + + Imports a mesh from file ファイルからメッシュをインポートします @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection 共通集合 @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge マージ - + Merges selected meshes into one 選択されたメッシュを一つにマージさせます @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh メッシュを切断 - - + + Cuts a mesh with a picked polygon 選択ポリゴンでメッシュを切断します @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment セグメントを作成 - - + + Creates a mesh segment メッシュのセグメントを作成します @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh メッシュを分割 - - + + Splits a mesh into two meshes メッシュを2つのメッシュに分割します @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh メッシュをトリム - - + + Trims a mesh with a picked polygon 選択ポリゴンでメッシュをトリムします @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... リファイン... - - + + Refine existing mesh 既存のメッシュをリファイン @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... 手動によるコンポーネントの削除... - - + + Mark a component to remove it from the mesh メッシュから削除するコンポーネントを選択します @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... コンポーネントの削除... - - + + Remove topologic independent components from the mesh トポロジーとして独立しているコンポーネントをメッシュから削除します @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... 拡大縮小... - + Scale selected meshes 選択したメッシュを拡大縮小 @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane メッシュと平面から断面を作成 - - + + Section from mesh and plane メッシュと平面による断面 @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... メッシュセグメントを作成... - - + + Create mesh segments メッシュのセグメントを作成します @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... 最もフィットするサーフェスからメッシュのセグメントを作成... - - + + Create mesh segments from best-fit surfaces 最も一致するサーフェスからメッシュのセグメントを作成。 @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... スムージング - - + + Smooth the selected meshes 選択したメッシュを滑らかにします @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components コンポーネントで分割 - + Split selected mesh into its components 選択したメッシュをコンポーネントに分割 @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane 平面上のメッシュをトリム - - + + Trims a mesh with a plane 平面上のメッシュを1つトリム @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union 結合 @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot 曲率プロット - - + + Calculates the curvature of the vertices of a mesh メッシュの頂点の曲率を計算します @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info 曲率の情報 - - + + Information about curvature 曲率の情報を表示します @@ -672,144 +672,144 @@ メッシュ和演算 - + Mesh difference メッシュ差演算 - + Mesh intersection メッシュ積演算 - + Import Mesh メッシュをインポート - + Mesh VertexCurvature メッシュ頂点曲率 - + Mesh Smoothing メッシュ平滑化 - + Harmonize mesh normals メッシュ法線を統一 - + Flip mesh normals メッシュ法線を反転 - + Fill up holes 穴を埋め - + Mesh merge メッシュ結合 - + Mesh split メッシュ分割 - + Mesh scale メッシュ拡大縮小 - + Mesh Decimating メッシュ削減 - + Harmonize normals 法線を一致 - + Remove non-manifolds ノンマニホールドを削除 - + Fix indices インデックスを修正 - + Remove degenerated faces 縮退した面を削除 - + Remove duplicated faces 重複した面を削除 - + Remove duplicated points 重複した点を削除 - + Fix self-intersections 自己交差を修正 - + Remove folds 折り目を削除 - + Repair mesh メッシュを修復 - + Delete selection 選択範囲を削除 - - + + Cut 切り取り - - + + Trim トリム - + Split スプリット - + Segment セグメント - + Delete 削除 - + Fill hole 穴埋め @@ -838,7 +838,7 @@ - + Absolute number 絶対番号 @@ -848,7 +848,7 @@ 公差 - + Absolute number (Maximum: %1) 絶対番号 (最大: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... 設定... - - + + No selection 選択されていません - - - - - - - - - - - + + + + + + + + + + + No information 情報なし - + Orientation 向き - + No flipped normals 逆向きの法線はありません - + %1 flipped normals %1 個の逆向きの法線があります - + No non-manifolds ノンマニフォールドはありません - + %1 non-manifolds %1 個のノンマニフォールドがあります - - + + Non-manifolds ノンマニフォールド - + Cannot remove non-manifolds ノンマニフォールドを取り除くことができません - + Invalid face indices 無効な面のインデックス - + Invalid point indices 無効な点のインデックス - + Multiple point indices 複数点のインデックス - + Invalid neighbour indices 無効な隣接インデックス - + No invalid indices 無効なインデックスはありません - + Indices インデックス - + No degenerations 縮退はありません - + %1 degenerated faces %1 この縮退された面があります - + Degenerations 縮退 - + No duplicated faces 重複面はありません - + %1 duplicated faces %1 の重複面があります - + Duplicated faces 重複面 - + No duplicated points 重複点はありません - - + + Duplicated points 重複点 - + No self-intersections 自己干渉はありません - + Self-intersections 自己干渉 - + No folds on surface 面上に折り畳み構造はありません - + %1 folds on surface %1 個の折り畳み構造が面上にあります - + Folds 折り畳み構造 - - + + Mesh repair メッシュの修復 @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 %1を作成します。 - + No active document アクティブなドキュメントがありません @@ -1366,7 +1366,7 @@ 高さ: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format このパラメータは、AMF形式のフォイルを書き込むときにZIP圧縮を使用するかを指示します @@ -1545,48 +1545,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic 自動 - + Adaptive 自動 - + Frontal フロンタル法 - + Frontal Quad フロンタル・クアッド法 - + Parallelograms 平行四辺形 - - + + Time: 時間： - + Running gmsh... Gmshを実行中... - + Failed to start 開始に失敗しました - + Error エラー @@ -1594,22 +1594,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle 三角形を追加 - + Flip normal 法線を逆向きに設定 - + Clear クリア - + Finish 完了 @@ -1617,7 +1617,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish 完了 @@ -1625,47 +1625,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit サーフェスに一致 - + Parameters パラメーター - + Selection 選択範囲 - + Region 領域 - + Triangle 三角形 - + Clear クリア - + Compute 計算 - + No selection 選択されていません - + Before fitting the surface select an area. 表面をフィッティングする前に領域を選択 @@ -1862,7 +1862,7 @@ to a smoother appearance. Sphere - 球 + 球体 @@ -1924,29 +1924,29 @@ to a smoother appearance. 球体 - - + + Base Base - + Normal 標準 - + Axis 軸 - - + + Radius 半径 - + Center 中心 @@ -1980,12 +1980,12 @@ to a smoother appearance. 画面の方向を向いた法線を持つ三角形のみ考慮 - + Use a brush tool to select the area ブラシツールを使用して領域を選択 - + Clears completely the selected area 選択範囲を完全に選択解除 @@ -1993,14 +1993,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete 削除 - - + + Invert 反転 @@ -2008,38 +2008,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: 点の数: - + Number of facets: 面の数: - + Minimum bound: 最小限度: - + Maximum bound: 最大限度: - + Mesh info box メッシュ情報ボックス - + Mesh info メッシュ情報 - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2047,7 +2047,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: %1 の境界: @@ -2055,26 +2055,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. OpenSCAD の実行中に、不明なエラーが発生しました。 - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD がシステムに見つかりません。 @@ -2084,7 +2084,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh メッシュの評価と修復 @@ -2092,241 +2092,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display 表示 - + Import-Export インポート/エクスポート - + All Mesh Files 全てのメッシュファイル - - + + Binary STL バイナリーSTL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh バイナリーメッシュ - - + + Alias Mesh Aliasメッシュ - - + + Object File Format オブジェクトファイル形式 - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon スタンフォードポリゴン - + NASTRAN NASTRAN - - + + All Files すべてのファイル - + Import mesh メッシュをインポート - + Simple Model Format シンプルモデルフォーマット - + Inventor V2.1 ascii Inventor V2.1 ASCII - + X3D Extensible 3D X3D 拡張 3D - + Compressed X3D 圧縮済み X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 圧縮済み VRML 2.0 - + Nastran Nastran - + Python module def Pythonモジュール定義 - + Asymptote Format 漸近線フォーマット - + 3D Manufacturing Format 3次元製造フォーマット - + Export mesh メッシュをエクスポート - + Meshing Tolerance メッシュ処理のトレランス - + Enter tolerance for meshing geometry: ジオメトリーのメッシュ処理用のトレランスを入力: - + The mesh '%1' is not a solid. メッシュ '%1' はソリッドではありません。 - + The mesh '%1' is a solid. '%1'はソリッドメッシュです。 - + Solid Mesh ソリッドメッシュ - + Boundings バウンディングボックス - + Fill holes 穴を埋める - + Fill holes with maximum number of edges: 最大数以下のエッジを持つ穴を埋める: - + Scaling 拡大縮小 - + Enter scaling factor: 倍率を入力: - + [Points: %1, Edges: %2, Faces: %3] [点: %1, 線: %2 面: %3] - + Display components 表示コンポーネント - + Display segments セグメントを表示 - + Display colors 表示色 - - + + Leave info mode 情報モードを解除 - + Index: %1 インデックス: %1 - + Leave hole-filling mode 穴埋めモードを解除 - + Leave removal mode 削除モードを解除 - + Delete selected faces 選択した面を削除 - + Clear selected faces 面の選択を全て解除 - + Annotation 注釈 diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ka.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ka.ts index 51ab40647e..497b180eb1 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ka.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ka.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle სამკუთხედის დამატება - - + + Add triangle manually to a mesh მრავალკუთხა დაფაზე სამკუთხედის ხელით დამატება @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh - Mesh + ბადე - + Boundings info... ინფორმაცია სტრუქტურის შესახებ... - - + + Shows the boundings of the selected mesh მონიშნული მრავალკუთხა ბადის სტრუქტურის ჩვენება @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh ბადე - + Regular solid... სწორი გეომეტრიული სხეული... - - + + Builds a regular solid სწორი გეომეტრიული სხეულის აგება @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh ბადე - + Cross-sections... განივი კვეთები... - - + + Cross-sections განივი კვეთები @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh ბადე - + Decimation... დეციმაცია... - - - + + + Decimates a mesh ბადის კიდეების რაოდენობის შემცირება @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh ბადე - + Difference სხვაობა @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh ბადე - + Face info ინფორმაცია ზედაპირზე - - + + Information about face ინფორმაცია ზედაპირის შესახებ @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh ბადე - + Check solid mesh მრავალკუთხა ბადის სიმყარეზე შემოწმება - - + + Checks whether the mesh is a solid მრავალკუთხა ბადის სიმყარეზე შემოწმება @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh ბადე - + Evaluate and repair mesh... მრავალკუთხა ბადის შეფასება და აღდგენა... - - + + Opens a dialog to analyze and repair a mesh მრავალკუთხა ბადის ანალიზისა და შეკეთების ფანჯრის გახსნა @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh ბადე - + Export mesh... მრავალკუთხა ბადის გატანა... - - + + Exports a mesh to file მრავალკუთხა ბადის ფაილში გატანა @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh ბადე - + Close hole ხვრელის დახურვა - - + + Close holes interactively ხვრელების ინტერაქტიული დახურვა @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh ბადე - + Fill holes... ხვრელების შემვსები... - - + + Fill holes of the mesh მრავალკუთხა ბადის ხვრელების შევსება @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh ბადე - + Flip normals ნორმალების მიმართუკლების შეცვლა - - + + Flips the normals of the mesh მრავალკუთხა ბადის ნორმალების მიმართულების შებრუნება @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh ბადე - + Create mesh from geometry... მრავალკუთხა ბადის გეომეტრიის მიხედვით შექმნა... - - + + Create mesh from the selected geometry მოცემული გეომეტრიის მრავალკუთხა ბადის შექმნა @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh ბადე - + Create mesh from shape... მოხაზულობის შექმნა ბადიდან... - + Tessellate shape მოხაზულობის ტესელაცია @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh ბადე - + Harmonize normals ნორმალების შეთანხმება - - + + Harmonizes the normals of the mesh მრავალკუთხა ბადის ნორმალების შეთანხმება @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh ბადე - + Import mesh... მრავალკუთხა ბადის შემოტანა... - - + + Imports a mesh from file მრავალკუთხა ბადის ფაილიდან შემოტანა @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh ბადე - + Intersection კვეთა @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh ბადე - + Merge შერწყმა - + Merges selected meshes into one მონიშნული მრავალკუთხა ბადეების შერწყმა @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh ბადე - + Cut mesh მრავალკუთხა ბადის ამოჭრა - - + + Cuts a mesh with a picked polygon მრავალკუთხა ბადის არჩეული მრავალკუთხედით ამოჭრა @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh ბადე - + Make segment სეგმენტის შექმნა - - + + Creates a mesh segment მრავალკუთხა ბადის სეგმენტის შექმნა @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh ბადე - + Split mesh მრავალკუთხა ბადის გაყოფა - - + + Splits a mesh into two meshes მრავალკუთხა ბადის ორად გაყოფა @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh ბადე - + Trim mesh მრავალკუთხა ბადის ჩამოჭრა - - + + Trims a mesh with a picked polygon მრავალკუთხა ბადის მონიშნული მრავალკუთხედის ფორმაზე ჩამოჭრა @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh ბადე - + Refinement... გაუმჯობესება... - - + + Refine existing mesh არსებული ბადის გაუმჯობესება @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh ბადე - + Remove components by hand... კომპონენტების ხელით მოცილება... - - + + Mark a component to remove it from the mesh კომპონენტების მრავალკუთხა ბადიდან წასაშლელად მონიშვნა @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh ბადე - + Remove components... კომპონენტების წაშლა... - - + + Remove topologic independent components from the mesh ტოპოლოგიურად დამოუკიდებელი ობიექტების მრავალკუთხა ბადიდან წაშლა @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh ბადე - + Scale... მასშტაბირება... - + Scale selected meshes მონიშნული მრავალკუთხა ბადეების მასშტაბირება @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh ბადე - + Create section from mesh and plane მრავალკუთხა ბადისა და სიბრტყისაგან სექციის შექმნა - - + + Section from mesh and plane სექცია მრავალკუთხა ბადისა და სიბრტყისაგან @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh ბადე - + Create mesh segments... მრავალკუთხა ბადის სეგმენტის შექმნა... - - + + Create mesh segments მრავალკუთხა ბადის სეგმენების შექმნა @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh ბადე - + Create mesh segments from best-fit surfaces... მრავალკუთხა ბადის სეგმენტების შექმნა ზედაპირების საუკეთესო თანხვედრით... - - + + Create mesh segments from best-fit surfaces მრავალკუთხა ბადის სეგმენტების შექმნა ზედაპირების საუკეთესო თანხვედრით @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh ბადე - + Smooth... მოგლუვება... - - + + Smooth the selected meshes მონიშნული მრავალკუთხა ბადების მოგლუვება @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh ბადე - + Split by components კომპონენტებად დაყოფა - + Split selected mesh into its components მონიშნული მრავალკუთხა ბადის კომპონენტებად დაყოფა @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh ბადე - + Trim mesh with a plane მრავალკუთხა ბადის სიბრტყით ჩამოჭრა - - + + Trims a mesh with a plane მრავალკუთხა ბადის სიბრტყით ჩამოჭრა @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh ბადე - + Union გაერთიანება @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh ბადე - + Curvature plot სიმრუდის გრაფიკი - - + + Calculates the curvature of the vertices of a mesh მრავალკუთხა ბადის პიკების მრუდის გამოთვლა @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh - ბადე + Mesh - + Curvature info ინფორმაცია სიმრუდეზე - - + + Information about curvature ინფორმაცია სიმრუდის შესახებ @@ -672,144 +672,144 @@ ბადეების გაერთიანება - + Mesh difference ბადეებს შორის სხვაობა - + Mesh intersection ბადეების თანაკვეთა - + Import Mesh ბადის შემოტანა - + Mesh VertexCurvature ბადის წვეროების სიმრუდე - + Mesh Smoothing ბადის მოგლუვება - + Harmonize mesh normals ბადის ნორმალების გათანაბრება - + Flip mesh normals ბადის ნორმალების გადაბრუნება - + Fill up holes ხვრელების შევსება - + Mesh merge ბადეების შერწყმა - + Mesh split ბადის გაყოფა - + Mesh scale ბადის მასშტაბირება - + Mesh Decimating ბადის დეციმაცია - + Harmonize normals ნორმალების შეთანხმება - + Remove non-manifolds არაერთგვაროვნების მოცილება - + Fix indices ინდექსების გასწორება - + Remove degenerated faces დაზიანებული ზედაპირების მოცილება - + Remove duplicated faces დუბლირებული ზედაპირების მოცილება - + Remove duplicated points დუბლირებული წერტილების მოცილება - + Fix self-intersections თვითკვეთების მოცილება - + Remove folds ნაოჭების მოცილება - + Repair mesh ბადის აღდგენა - + Delete selection მონიშნულის წაშლა - - + + Cut ამოჭრა - - + + Trim მოკვეცა - + Split გაყოფა - + Segment სეგმენტი - + Delete წაშლა - + Fill hole ხვრელების შევსება @@ -838,7 +838,7 @@ - + Absolute number აბსოლუტური რიცხვი @@ -848,7 +848,7 @@ დაშვება - + Absolute number (Maximum: %1) აბსოლუტური რიცხვი (მაქს: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... გამართვა... - - + + No selection არაფერია მონიშნული - - - - - - - - - - - + + + + + + + + + + + No information მონაცემები არაა - + Orientation ორიენტაცია - + No flipped normals ამობრუნებული ნორმალები ნაპოვნი არაა - + %1 flipped normals %1 ამობრუნებული ნორმალი - + No non-manifolds არაერთგვაროვნები ნაპოვნი არაა - + %1 non-manifolds %1 არაერთგვაროვანი - - + + Non-manifolds არაერთგვაროვნები - + Cannot remove non-manifolds არაერთგვაროვნების წაშლა შეუძლებელია - + Invalid face indices არასწორი ზედაპირების ინდექსები - + Invalid point indices წერტილების არასწორი ინდექსები - + Multiple point indices ბევრი წერტილის ინდექსები - + Invalid neighbour indices ახლომდებარე ელემენტების ინდექსები არასწორია - + No invalid indices არასწორი ინდექსები ნაპოვნი არაა - + Indices ინდექსები - + No degenerations დაზიანებები ნაპოვნი არაა - + %1 degenerated faces %1 დაზიანებული ზედაპირები - + Degenerations დაზიანებული - + No duplicated faces განმეორებადი ზედაპირები ნაპოვნი არაა - + %1 duplicated faces %1 განმეორებადი ზედაპირები - + Duplicated faces განმეორებადი ზედაპირები - + No duplicated points განმეორებადი წერტილები ნაპოვნი არაა - - + + Duplicated points განმეორებადი წერტილები - + No self-intersections თვითკვეთები ნაპოვნი არაა - + Self-intersections თვით-თანაკვეთები - + No folds on surface ზედაპირზე ნაოჭები ნაპოვნი არაა - + %1 folds on surface ზედაპირზე ნაპოვნია %1 ნაოჭი - + Folds ნაოჭები - - + + Mesh repair მრავალკუთხა ბადის აღდგენა @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 %1-ის შექნა - + No active document აქტიური დოკუმენტის გარეშე @@ -1366,7 +1366,7 @@ სიმაღლე: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format ეს პარამეტრი განსაზღვრავს ჩართულია თუ არა @@ -1550,48 +1550,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic ავტომატური - + Adaptive ადაპტაციური - + Frontal წინა - + Frontal Quad წინა კვადრატი - + Parallelograms პარალელოგრამები - - + + Time: დრო: - + Running gmsh... Gmsh-ის გაშვება... - + Failed to start გაშვების შეცდომა - + Error შეცდომა @@ -1599,22 +1599,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle სამკუთხედის დამატება - + Flip normal ნორმალის ამოყირავება - + Clear გასუფთავება - + Finish დასრულება @@ -1622,7 +1622,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish დასრულება @@ -1630,47 +1630,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit ზედაპირის თანხვედრა - + Parameters პარამეტრები - + Selection მონიშნული - + Region რეგიონი - + Triangle სამკუთხედი - + Clear გასუფთავება - + Compute გამოთვლა - + No selection - არაფერია მონიშნული + მონიშნული არაფერი არაა - + Before fitting the surface select an area. ზედაპირს ჩატევამდე გთხოვთ აირჩიოთ რეგიონი. @@ -1890,12 +1890,12 @@ to a smoother appearance. Mesh segmentation - ბადის სეგმენტაცია + მრავალკუთხა ბადის სეგმენტაცია Plane - სიბრტყე + ზედაპირი @@ -1909,7 +1909,7 @@ to a smoother appearance. Tolerance - დაშვება + სიზუსტე @@ -1929,29 +1929,29 @@ to a smoother appearance. სფერო - - + + Base ფუძე - + Normal ნორმალური - + Axis ღერძი - - + + Radius რადიუსი - + Center ცენტრი @@ -1985,12 +1985,12 @@ to a smoother appearance. ყურადღების მხოლოდ ეკრანისკენ მოშვერილი ნორმალიანი სამკუთხედებისთვის მიქცევა - + Use a brush tool to select the area რეგიონის ფუნჯით მონიშვნა - + Clears completely the selected area მონიშნული რეგიონის მთლიანად გაწმენდა @@ -1998,14 +1998,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete წაშლა - - + + Invert დაბრუნება @@ -2013,38 +2013,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: წერტილების რიცხვი: - + Number of facets: წახნაგების რაოდენობა: - + Minimum bound: მინიმალური ზღვარი: - + Maximum bound: მაქსიმალურ ზღვარი: - + Mesh info box ბადის ინფორმაციის ფანჯარა - + Mesh info ბადის ინფორმაცია - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2052,7 +2052,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: %1-ის შეზღუდვები: @@ -2060,26 +2060,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. OpenSCAD-ის გაშვების უცნობი შეცდომა. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. თქვენს სისტემაში OpenSCAD-ი არ არის დაყენებული. @@ -2089,7 +2089,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh მრავალკუთხა ბადის შეფასება & აღდგენა @@ -2097,241 +2097,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display ჩვენება - + Import-Export შეტანა-გატანა - + All Mesh Files მრავალკუთხა ბადის ყველა ფაილი - - + + Binary STL ორობითი STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh ორობითი მრავალკუთხა ბადე - - + + Alias Mesh ბადის ფსევდონიმი - - + + Object File Format ობიექტის ფაილის ფორმატი - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files ყველა ფაილი - + Import mesh მრავალკუთხა ბადის შემოტანა - + Simple Model Format მოდელის უბრალო ფორმატი - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D შეკუმშული X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML v 2.0 - + Compressed VRML 2.0 შეკუმშული VRML 2.0 - + Nastran Nastran - + Python module def Python-ის მოდული - + Asymptote Format ასიმპტოტის ფორმატი - + 3D Manufacturing Format 3D დამზადების ფორმატი - + Export mesh მრავალკუთხა ბადის გატანა - + Meshing Tolerance მრავალკუთხა ბადის შესაძლო გადახრა - + Enter tolerance for meshing geometry: შეიყვანეთ შესაძლო აცდენა, რომელსაც მრავალკუთხა ბადე გეომეტრიისთვის ქმნის: - + The mesh '%1' is not a solid. მრავალკუთხა ბადე %1 არ წარმოადგენს მყარ სხეულს. - + The mesh '%1' is a solid. მრავალკუთხა ბადე %1 მყარი სხეულია. - + Solid Mesh მყარი მრავალკუთხა ბადე - + Boundings შეზღუდვები - + Fill holes ხვრელების შევსება - + Fill holes with maximum number of edges: შესავსები ხვრელების წიბოების მაქსიმალური რაოდენობა: - + Scaling მასშტაბირება - + Enter scaling factor: შეიყვანეთ მასშტაბირების კოეფიციენტი: - + [Points: %1, Edges: %2, Faces: %3] [წერტილი: %1, წიბო: %2, ზედაპირი: %3] - + Display components კომპონენტების ჩვენება - + Display segments სეგმენტების ჩვენება - + Display colors ფერების ჩვენება - - + + Leave info mode საინფორმაციო რეჟიმიდან გასვლა - + Index: %1 ინდექსი: %1 - + Leave hole-filling mode ნახვრეტების შევსების რეჟიმიდან გასვლა - + Leave removal mode წაშლის რეჟიმიდან გამოსვლა - + Delete selected faces მონიშნული ზედაპირების წაშლა - + Clear selected faces ზედაპირებზე მონიშვნის მოხსნა - + Annotation შენიშვნა @@ -2381,7 +2381,7 @@ Please visit http://www.openscad.org/index.html to install it. Mesh segmentation - მრავალკუთხა ბადის სეგმენტაცია + ბადის სეგმენტაცია diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ko.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ko.ts index bdeba6ee0f..2d5887d8c2 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ko.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ko.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle 삼각형 추가 - - + + Add triangle manually to a mesh 삼각형을 메시에 수동으로 추가 @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Boundings 정보... - - + + Shows the boundings of the selected mesh 선택된 메시의 boundings 표시 @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... 일반 솔리드... - - + + Builds a regular solid 일반 솔리드 만들기 @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... 횡단면... - - + + Cross-sections 횡단면 @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... 제거 - - - + + + Decimates a mesh Decimates a mesh @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference 차이 @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info 평면 정보 - - + + Information about face Information about face @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh 솔리드 메쉬 검사 - - + + Checks whether the mesh is a solid 메쉬가 솔리드인지 검사 @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Evaluate and repair mesh... - - + + Opens a dialog to analyze and repair a mesh 메쉬의 분석/수정을 위한 대화상자 열기 @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... 메쉬 내보내기... - - + + Exports a mesh to file 메쉬 파일로 내보냅니다. @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole 구멍 닫기 - - + + Close holes interactively 대화식으로 구멍 닫기 @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... 구멍 메우기... - - + + Fill holes of the mesh 메시의 구멍 채우기 @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Flip normals - - + + Flips the normals of the mesh Flips the normals of the mesh @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Create mesh from geometry... - - + + Create mesh from the selected geometry Create mesh from the selected geometry @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... 쉐이프에서 메쉬 생성... - + Tessellate shape 쉐이프 테셀레이션 @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Harmonize normals - - + + Harmonizes the normals of the mesh Harmonizes the normals of the mesh @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... 메시 가지오기 - - + + Imports a mesh from file 메쉬를 파일에서 가져오기 @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection 교집합 @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge 병합 - + Merges selected meshes into one 선택된 메쉬를 하나로 병합 @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh 메쉬 자르기 - - + + Cuts a mesh with a picked polygon 메쉬를 선택한 다각형으로 자르기 @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Make segment - - + + Creates a mesh segment Creates a mesh segment @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh 메쉬 분할 - - + + Splits a mesh into two meshes 하나의 메쉬를 2개로 분할 @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh 메쉬 다듬기 - - + + Trims a mesh with a picked polygon 선택한 다각형으로 메쉬를 다듬기 @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Refinement... - - + + Refine existing mesh Refine existing mesh @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Remove components by hand... - - + + Mark a component to remove it from the mesh 메시에서 제거할 구성요소를 표시합니다. @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Remove components... - - + + Remove topologic independent components from the mesh 메시에서 토폴로지 독립 구성요소 제거 @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Scale... - + Scale selected meshes Scale selected meshes @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Create section from mesh and plane - - + + Section from mesh and plane Section from mesh and plane @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Create mesh segments... - - + + Create mesh segments Create mesh segments @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Create mesh segments from best-fit surfaces... - - + + Create mesh segments from best-fit surfaces Create mesh segments from best-fit surfaces @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Smooth... - - + + Smooth the selected meshes Smooth the selected meshes @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Split by components - + Split selected mesh into its components Split selected mesh into its components @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Trim mesh with a plane - - + + Trims a mesh with a plane Trims a mesh with a plane @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union 결합체 @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Curvature plot - - + + Calculates the curvature of the vertices of a mesh Calculates the curvature of the vertices of a mesh @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Curvature info - - + + Information about curvature Information about curvature @@ -672,144 +672,144 @@ Mesh union - + Mesh difference Mesh difference - + Mesh intersection Mesh intersection - + Import Mesh Import Mesh - + Mesh VertexCurvature Mesh VertexCurvature - + Mesh Smoothing Mesh Smoothing - + Harmonize mesh normals Harmonize mesh normals - + Flip mesh normals Flip mesh normals - + Fill up holes Fill up holes - + Mesh merge Mesh merge - + Mesh split Mesh split - + Mesh scale Mesh scale - + Mesh Decimating Mesh Decimating - + Harmonize normals Harmonize normals - + Remove non-manifolds Remove non-manifolds - + Fix indices Fix indices - + Remove degenerated faces Remove degenerated faces - + Remove duplicated faces Remove duplicated faces - + Remove duplicated points Remove duplicated points - + Fix self-intersections Fix self-intersections - + Remove folds Remove folds - + Repair mesh Repair mesh - + Delete selection Delete selection - - + + Cut 자르기 - - + + Trim Trim - + Split 분할 - + Segment Segment - + Delete 삭제 - + Fill hole Fill hole @@ -838,7 +838,7 @@ - + Absolute number Absolute number @@ -848,7 +848,7 @@ 공차 - + Absolute number (Maximum: %1) Absolute number (Maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Settings... - - + + No selection 선택 안 함 - - - - - - - - - - - + + + + + + + + + + + No information No information - + Orientation Orientation - + No flipped normals No flipped normals - + %1 flipped normals %1 flipped normals - + No non-manifolds No non-manifolds - + %1 non-manifolds %1 non-manifolds - - + + Non-manifolds Non-manifolds - + Cannot remove non-manifolds Cannot remove non-manifolds - + Invalid face indices Invalid face indices - + Invalid point indices Invalid point indices - + Multiple point indices Multiple point indices - + Invalid neighbour indices Invalid neighbour indices - + No invalid indices No invalid indices - + Indices Indices - + No degenerations No degenerations - + %1 degenerated faces %1 degenerated faces - + Degenerations Degenerations - + No duplicated faces No duplicated faces - + %1 duplicated faces %1 duplicated faces - + Duplicated faces Duplicated faces - + No duplicated points No duplicated points - - + + Duplicated points Duplicated points - + No self-intersections No self-intersections - + Self-intersections Self-intersections - + No folds on surface No folds on surface - + %1 folds on surface %1 folds on surface - + Folds Folds - - + + Mesh repair 메시 복구 @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 %1 만들기 - + No active document 활성 문서가 없습니다 @@ -1366,7 +1366,7 @@ 높이: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format This parameter indicates whether ZIP compression @@ -1551,48 +1551,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Automatic - + Adaptive Adaptive - + Frontal Frontal - + Frontal Quad Frontal Quad - + Parallelograms Parallelograms - - + + Time: 시간: - + Running gmsh... Running gmsh... - + Failed to start Failed to start - + Error 에러 @@ -1600,22 +1600,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle 삼각형 추가 - + Flip normal Flip normal - + Clear 지우기 - + Finish 마침 @@ -1623,7 +1623,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish 마침 @@ -1631,47 +1631,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Surface fit - + Parameters Parameters - + Selection 선택항목 - + Region Region - + Triangle 삼각형 - + Clear 지우기 - + Compute Compute - + No selection 선택 안 함 - + Before fitting the surface select an area. Before fitting the surface select an area. @@ -1930,29 +1930,29 @@ to a smoother appearance. 공모양 - - + + Base Base - + Normal 일반 - + Axis 축 - - + + Radius Radius - + Center 센터 @@ -1986,12 +1986,12 @@ to a smoother appearance. Respect only triangles with normals facing screen - + Use a brush tool to select the area Use a brush tool to select the area - + Clears completely the selected area Clears completely the selected area @@ -1999,14 +1999,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete 삭제 - - + + Invert Invert @@ -2014,38 +2014,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Number of points: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Mesh info - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Boundings of %1: @@ -2061,26 +2061,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Unknown error occurred while running OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD cannot be found on your system. @@ -2090,7 +2090,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh 메시 평가 및 수리하기 @@ -2098,241 +2098,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display 화면 - + Import-Export 가져오기 내보내기 - + All Mesh Files All Mesh Files - - + + Binary STL Binary STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binary Mesh - - + + Alias Mesh Alias Mesh - - + + Object File Format Object File Format - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files 모든 파일 - + Import mesh 메시 불러오기 - + Simple Model Format Simple Model Format - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Compressed X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Compressed VRML 2.0 - + Nastran Nastran - + Python module def Python module def - + Asymptote Format Asymptote Format - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh 메시 내보내기 - + Meshing Tolerance Meshing Tolerance - + Enter tolerance for meshing geometry: Enter tolerance for meshing geometry: - + The mesh '%1' is not a solid. The mesh '%1' is not a solid. - + The mesh '%1' is a solid. The mesh '%1' is a solid. - + Solid Mesh Solid Mesh - + Boundings Boundings - + Fill holes Fill holes - + Fill holes with maximum number of edges: Fill holes with maximum number of edges: - + Scaling Scaling - + Enter scaling factor: Enter scaling factor: - + [Points: %1, Edges: %2, Faces: %3] [Points: %1, Edges: %2, Faces: %3] - + Display components Display components - + Display segments Display segments - + Display colors Display colors - - + + Leave info mode Leave info mode - + Index: %1 Index: %1 - + Leave hole-filling mode Leave hole-filling mode - + Leave removal mode Leave removal mode - + Delete selected faces Delete selected faces - + Clear selected faces Clear selected faces - + Annotation Annotation diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_nl.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_nl.ts index a3096f30eb..9e520184b6 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_nl.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_nl.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Driehoek toevoegen - - + + Add triangle manually to a mesh Handmatig een driehoek toevoegen aan een gaas @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh - Mesh + Mesh - + Boundings info... Begrenzingsinfo... - - + + Shows the boundings of the selected mesh Toont de begrenzingen van het geselecteerde mesh @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Regelmatig volumemodel... - - + + Builds a regular solid Bouwt volumemodel @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Doorsnedes... - - + + Cross-sections Doorsnedes @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Decimatie... - - - + + + Decimates a mesh Decimeert een rooster @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Verschil @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Vlak-info - - + + Information about face Informatie over vlak @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Controleer vast maaswerk - - + + Checks whether the mesh is a solid Controleert of het maaswerk een volumemodel is @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh - Mesh + Mesh - + Evaluate and repair mesh... Evalueer en repareer maaswerk... - - + + Opens a dialog to analyze and repair a mesh Opent een venster voor analyse en reparatie van een maaswerk @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Gaas exporteren... - - + + Exports a mesh to file Exporteert een gaas naar een bestand @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Dicht gat - - + + Close holes interactively Sluit gaten interactief @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Vul gaten... - - + + Fill holes of the mesh Gaten in het gaas vullen @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Loodlijnen spiegelen - - + + Flips the normals of the mesh De normalen van het gaas omkeren @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Genereer maaswerk vanuit geometrie... - - + + Create mesh from the selected geometry Genereer maaswerk vanuit geselecteerde vorm @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Maak een mesh van vorm... - + Tessellate shape Tegel vorm @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Harmoniseer loodlijnen - - + + Harmonizes the normals of the mesh Harmoniseert de loodlijnen van de mesh @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Mesh importeren... - - + + Imports a mesh from file Importeer een mesh uit een bestand @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Snijpunt @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Samenvoegen - + Merges selected meshes into one Voegt geselecteerde maaswerken samen tot één enkele @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Snij de mesh - - + + Cuts a mesh with a picked polygon Een mesh snijden met een geselecteerde polygoon @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Maak segment - - + + Creates a mesh segment Maakt een mesh segment @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Verdeel de mesh - - + + Splits a mesh into two meshes Verdeelt een gaas in twee gazen @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Gaas bijsnijden - - + + Trims a mesh with a picked polygon Snijdt een maaswerk met een geselecteerde veelhoek @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Verfijning... - - + + Refine existing mesh Verfijn bestaande mesh @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Verwijder componenten met de hand... - - + + Mark a component to remove it from the mesh Markeer een te verwijderen deel in de mesh @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Verwijder componenten... - - + + Remove topologic independent components from the mesh Ruimtelijk onafhankelijke onderdelen van het maaswerk verwijderen @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Schaal... - + Scale selected meshes Geselecteerde maaswerken schalen @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Genereer doorsnede van maaswerk en vlak - - + + Section from mesh and plane Doorsnede van maaswerk en vlak @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Genereer maaswerk-segmenten... - - + + Create mesh segments Gaassegmenten aanmaken @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Genereer maaswerk-segmenten uit meest passende oppervlakken... - - + + Create mesh segments from best-fit surfaces Genereer maaswerk-segmenten uit meest passende oppervlakken @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Glad... - - + + Smooth the selected meshes De geselecteerde meshes glad maken @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Gesplitst op onderdelen - + Split selected mesh into its components Splits geselecteerde maaswerk tot zijn componenten @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Maaswerk bijsnijden met een vlak - - + + Trims a mesh with a plane Snijdt een maaswerk bij met een vlak @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Verbinden @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Kromming definitie - - + + Calculates the curvature of the vertices of a mesh Berekent de kromming van de hoekpunten binnen een maaswerk @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Kromming info - - + + Information about curvature Informatie over kromming @@ -672,144 +672,144 @@ Maaswerk samensmelten - + Mesh difference Maaswerk van elkaar aftrekken - + Mesh intersection Maaswerk overlapping - + Import Mesh Importeer maaswerk - + Mesh VertexCurvature Maaswerk HoekpuntKromming - + Mesh Smoothing Maaswerk Vloeiend maken - + Harmonize mesh normals Harmonize maaswerk normalen - + Flip mesh normals Normale spiegelen van maaswerk - + Fill up holes Gaten vullen - + Mesh merge Samenvoegen van maaswerk - + Mesh split Maaswerk splitsen - + Mesh scale Maaswerk verschalen - + Mesh Decimating Maaswerk verminderen - + Harmonize normals Harmoniseer loodlijnen - + Remove non-manifolds Verwijder niet waterdichte elementen - + Fix indices Index repareren - + Remove degenerated faces Gedegenereerde vlakken verwijderen - + Remove duplicated faces Dubbele vlakken verwijderen - + Remove duplicated points Dubbele punten verwijderen - + Fix self-intersections Repareer zelf-kruisingen - + Remove folds Vouwen verwijderen - + Repair mesh Herstel maaswerk - + Delete selection Selectie verwijderen - - + + Cut Knippen - - + + Trim Bijsnijden - + Split Opsplitsen - + Segment Segment - + Delete Verwijderen - + Fill hole Vul gat @@ -838,7 +838,7 @@ - + Absolute number Absoluut getal @@ -848,7 +848,7 @@ Tolerantie - + Absolute number (Maximum: %1) Absoluut getal (Maximum: %1) @@ -980,167 +980,167 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Instellingen... - - + + No selection Geen selectie - - - - - - - - - - - + + + + + + + + + + + No information Geen informatie - + Orientation Oriëntatie - + No flipped normals Geen gespiegelde loodlijnen - + %1 flipped normals %1 gespiegelde loodlijnen - + No non-manifolds Geen niet-variëteiten - + %1 non-manifolds %1 niet-variëteiten - - + + Non-manifolds Niet-variëteiten - + Cannot remove non-manifolds Kan de niet-variëteiten niet verwijderen - + Invalid face indices Ongeldige vlak indexen - + Invalid point indices Ongeldige punt indexen - + Multiple point indices Meerdere punt indexen - + Invalid neighbour indices Ongeldige buurindexen - + No invalid indices Geen ongeldige indices - + Indices Indexen - + No degenerations Geen degeneraties - + %1 degenerated faces %1 gedegenereerde vlakken - + Degenerations Degeneraties - + No duplicated faces Geen gedupliceerde vlakken - + %1 duplicated faces %1 dubbele vlakken - + Duplicated faces Dubbele vlakken - + No duplicated points Geen dubbele punten - - + + Duplicated points dubbele punten - + No self-intersections Niet zelfsnijdend - + Self-intersections Zelf-doorsnijdingen - + No folds on surface Geen plooien op het oppervlak - + %1 folds on surface 1% plooien op het oppervlak - + Folds Plooien - - + + Mesh repair Mesh reparatie @@ -1292,14 +1292,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Maak %1 - + No active document Geen actief document @@ -1367,7 +1367,7 @@ Hoogte: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Deze parameter geeft aan of ZIP-compressie @@ -1552,48 +1552,48 @@ tot een gladder uiterlijk leidt. MeshGui::GmshWidget - + Automatic Automatisch - + Adaptive Aanpasbaar - + Frontal Frontaal - + Frontal Quad Frontale vierhoek - + Parallelograms Parallellogrammen - - + + Time: Tijd: - + Running gmsh... Uitvoering van gmsh... - + Failed to start Starten mislukt - + Error Fout @@ -1601,22 +1601,22 @@ tot een gladder uiterlijk leidt. MeshGui::MeshFaceAddition - + Add triangle Driehoek toevoegen - + Flip normal Normaal spiegelen - + Clear Wissen - + Finish Voltooien @@ -1624,7 +1624,7 @@ tot een gladder uiterlijk leidt. MeshGui::MeshFillHole - + Finish Voltooien @@ -1632,47 +1632,47 @@ tot een gladder uiterlijk leidt. MeshGui::ParametersDialog - + Surface fit Aanpassing van het oppervlak - + Parameters Parameters - + Selection Selectie - + Region Sectie - + Triangle Driehoek - + Clear Wissen - + Compute Berekenen - + No selection Geen selectie - + Before fitting the surface select an area. Selecteer een gebied alvorens het oppervlak aan te brengen. @@ -1892,7 +1892,7 @@ tot een gladder uiterlijk leidt. Mesh segmentation - Mesh segmentatie + Meshsegmentatie @@ -1931,29 +1931,29 @@ tot een gladder uiterlijk leidt. Bol - - + + Base Basis - + Normal Loodrechte lijn - + Axis As - - + + Radius Straal - + Center Middelpunt @@ -1987,12 +1987,12 @@ tot een gladder uiterlijk leidt. Respecteren alleen driehoeken met normalen naar het scherm toe - + Use a brush tool to select the area Gebruik een penseelgereedschap om het gebied te selecteren - + Clears completely the selected area Wist het geselecteerde gebied in zijn geheel @@ -2000,14 +2000,14 @@ tot een gladder uiterlijk leidt. MeshGui::TaskRemoveComponents - - + + Delete Verwijderen - - + + Invert Omkeren @@ -2015,38 +2015,38 @@ tot een gladder uiterlijk leidt. MeshInfoWatcher - + Number of points: Aantal punten: - + Number of facets: Aantal facetten: - + Minimum bound: Minimale grens: - + Maximum bound: Maximale grens: - + Mesh info box Mesh info box - + Mesh info Mesh informatie - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2054,7 +2054,7 @@ tot een gladder uiterlijk leidt. Mesh_BoundingBox - + Boundings of %1: Begrenzingen van %1: @@ -2062,26 +2062,26 @@ tot een gladder uiterlijk leidt. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Er is een onbekende fout opgetreden tijdens het uitvoeren van OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD kan niet worden gevonden op uw systeem. @@ -2091,7 +2091,7 @@ Gelieve naar http://www.openscad.org/index.html te gaan om het te installeren. QDockWidget - + Evaluate & Repair Mesh Evalueer & herstel de mesh @@ -2099,241 +2099,241 @@ Gelieve naar http://www.openscad.org/index.html te gaan om het te installeren. QObject - + Display Weergave - + Import-Export Importeren-Exporteren - + All Mesh Files Alle mesh bestanden - - + + Binary STL Binair STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binaire mesh - - + + Alias Mesh Alias mesh - - + + Object File Format Object Bestandsformaat - + Inventor V2.1 ASCII Uitvinder V2.1 ASCII - - + + Stanford Polygon Stanford Polygoon - + NASTRAN NASTRAN - - + + All Files Alle bestanden - + Import mesh Gaas importeren - + Simple Model Format Eenvoudig modelformaat - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Gecomprimeerde X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Compressed VRML 2.0 - + Nastran Nastran - + Python module def Python module def - + Asymptote Format Asymptoot formaat - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh Gaas exporteren - + Meshing Tolerance Meshingtolerantie - + Enter tolerance for meshing geometry: Voer tolerantie in voor de meshinggeometrie: - + The mesh '%1' is not a solid. De mesh '%1' is geen volumemodel. - + The mesh '%1' is a solid. De mesh '%1' is een volumemodel. - + Solid Mesh Solid Mesh - + Boundings Begrenzingen - + Fill holes Vul gaten - + Fill holes with maximum number of edges: Vul de gaten met maximaal aantal randen: - + Scaling Schalen - + Enter scaling factor: Geef schaal factor: - + [Points: %1, Edges: %2, Faces: %3] [Punten: %1, randen: %2, gezichten: %3] - + Display components Geef componenten weer - + Display segments Segmenten weergeven - + Display colors Kleuren weergeven - - + + Leave info mode Info modus verlaten - + Index: %1 Index: %1 - + Leave hole-filling mode Gatvulmodus verlaten - + Leave removal mode Verwijdermodus verlaten - + Delete selected faces Verwijder geselecteerde vlakken - + Clear selected faces Geselecteerde vlakken wissen - + Annotation Aantekening @@ -2383,7 +2383,7 @@ Gelieve naar http://www.openscad.org/index.html te gaan om het te installeren. Mesh segmentation - Meshsegmentatie + Mesh segmentatie diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_pl.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_pl.ts index 69ce210e9b..f5c28d3b8e 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_pl.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_pl.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Siatka - + Add triangle Dodaj trójkąt - - + + Add triangle manually to a mesh Dodaje trójkąt do siatki manualnie @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Siatka - + Boundings info... Informacje o granicach ... - - + + Shows the boundings of the selected mesh Pokazuje granice wybranej siatki @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Siatka - + Regular solid... Utwórz bryłę pierwotną ... - - + + Builds a regular solid Zbuduj bryłę podstawową @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Siatka - + Cross-sections... Przekroje poprzeczne ... - - + + Cross-sections Przekroje poprzeczne @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Siatka - + Decimation... Uprość ... - - - + + + Decimates a mesh Wyznacza siatkę @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Siatka - + Difference Różnica @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Siatka - + Face info Informacje o powierzchni - - + + Information about face Informacje na temat powierzchni @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Siatka - + Check solid mesh Sprawdź siatkę bryły - - + + Checks whether the mesh is a solid Sprawdza czy siatka jest bryłą @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Siatka - + Evaluate and repair mesh... Oceń i napraw siatkę ... - - + + Opens a dialog to analyze and repair a mesh Otwiera okno dialogowe do analizy i naprawy siatki @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Siatka - + Export mesh... Eksportuj siatkę ... - - + + Exports a mesh to file Eksportuj siatkę do pliku @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Siatka - + Close hole Zamknij otwór - - + + Close holes interactively Zamyka otwory interaktywnie @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Siatka - + Fill holes... Wypełnij otwory ... - - + + Fill holes of the mesh Wypełnia otwory siatki @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Siatka - + Flip normals Odwróć wektory normalne - - + + Flips the normals of the mesh Odwraca wektory normalne siatki @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Siatka - + Create mesh from geometry... Utwórz siatkę z geometrii... - - + + Create mesh from the selected geometry Utwórz siatkę z wybranej geometrii @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Siatka - + Create mesh from shape... Utwórz siatkę z kształtu ... - + Tessellate shape Rozdrobnij kształt @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Siatka - + Harmonize normals Porządkuj wektory normalnych - - + + Harmonizes the normals of the mesh Porządkuje wektory normalne siatki @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Siatka - + Import mesh... Importuj siatkę ... - - + + Imports a mesh from file Importuj siatkę z pliku @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Siatka - + Intersection Przecięcie @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Siatka - + Merge Scal - + Merges selected meshes into one Łączy wybrane siatki @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Siatka - + Cut mesh Przetnij siatkę - - + + Cuts a mesh with a picked polygon Wycina siatkę za pomocą wybranego wielokąta @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Siatka - + Make segment Utwórz segment - - + + Creates a mesh segment Tworzy segment siatki @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Siatka - + Split mesh Podziel siatkę - - + + Splits a mesh into two meshes Rozdziel siatkę na dwie siatki @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Siatka - + Trim mesh Przytnij siatkę - - + + Trims a mesh with a picked polygon Przycina siatkę za pomocą wybranego wielokąta @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Siatka - + Refinement... Ulepsz ... - - + + Refine existing mesh Ulepsza istniejącą siatkę @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Siatka - + Remove components by hand... Usuń fragmenty ręcznie ... - - + + Mark a component to remove it from the mesh Zaznacz fragment do usunięcia z siatki @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Siatka - + Remove components... Usuń fragmenty ... - - + + Remove topologic independent components from the mesh Usuwa topologiczne, niezależne elementy z siatki @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Siatka - + Scale... Skaluj ... - + Scale selected meshes Skaluje zaznaczone siatki @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Siatka - + Create section from mesh and plane Utwórz przekrój siatki płaszczyzną - - + + Section from mesh and plane Przekrój z siatki i płaszczyzny @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Siatka - + Create mesh segments... Utwórz segmenty siatki ... - - + + Create mesh segments Tworzy segmenty siatki @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Siatka - + Create mesh segments from best-fit surfaces... Utwórz segmenty siatki z najlepiej dopasowanych powierzchni ... - - + + Create mesh segments from best-fit surfaces Tworzy segmenty siatki z najlepiej dopasowanych powierzchni @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Siatka - + Smooth... Wygładź ... - - + + Smooth the selected meshes Wygładza zaznaczone siatki @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Siatka - + Split by components Rozbij na komponenty - + Split selected mesh into its components Rozdziela wybrane siatki na niezależne komponenty @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Siatka - + Trim mesh with a plane Przytnij siatkę płaszczyzną - - + + Trims a mesh with a plane Przycina siatkę za pomocą płaszczyzny @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Siatka - + Union Połączenie @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Siatka - + Curvature plot Wykres krzywizny - - + + Calculates the curvature of the vertices of a mesh Oblicza krzywiznę wierzchołków siatki @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Siatka - + Curvature info Informacje o krzywiźnie - - + + Information about curvature Informacje na temat krzywizny @@ -672,144 +672,144 @@ Połączenie siatek - + Mesh difference Różnica siatki - + Mesh intersection Przecięcie siatki - + Import Mesh Importuj siatkę - + Mesh VertexCurvature Krzywa wierzchołka siatki - + Mesh Smoothing Wygładzanie siatki - + Harmonize mesh normals Porządkuj wektory normalne - + Flip mesh normals Odwraca wektory normalne siatki - + Fill up holes Wypełnij otwory - + Mesh merge Scalanie siatki - + Mesh split Rozbicie siatki - + Mesh scale Skala oczek siatki - + Mesh Decimating Upraszczanie siatki - + Harmonize normals Porządkuj wektory normalnych - + Remove non-manifolds Usuń obiekty nie będące typu Manifold - + Fix indices Napraw wskaźniki - + Remove degenerated faces Usuń zniekształcone ściany - + Remove duplicated faces Usuń duplikaty ścian - + Remove duplicated points Usuń duplikaty punktów - + Fix self-intersections Napraw samoprzecięcia - + Remove folds Usuń fałdy - + Repair mesh Napraw siatkę - + Delete selection Usuń zaznaczone - - + + Cut Przetnij - - + + Trim Przytnij - + Split Rozdziel - + Segment Segment - + Delete Usuń - + Fill hole Wypełnij otwór @@ -838,7 +838,7 @@ - + Absolute number Liczba bezwzględna @@ -848,7 +848,7 @@ Tolerancja - + Absolute number (Maximum: %1) Wartość bezwzględna (maksymalnie: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Ustawienia ... - - + + No selection Brak zaznaczenia - - - - - - - - - - - + + + + + + + + + + + No information Brak informacji - + Orientation Orientacja - + No flipped normals Brak odwróconych wektorów normalnych - + %1 flipped normals %1 odwrócone wektory normalne - + No non-manifolds Nie jest typu non-Manifold - + %1 non-manifolds %1 nie jest typu non-Manifold - - + + Non-manifolds Typu non-Manifold - + Cannot remove non-manifolds Nie można usunąć nierozgałęźnych - + Invalid face indices Nieprawidłowe wskaźniki ścian - + Invalid point indices Nieprawidłowe wskaźniki punktu - + Multiple point indices Wielokrotne wskaźniki punktu - + Invalid neighbour indices Nieprawidłowe wskaźniki sąsiedztwa - + No invalid indices Nie ma nieprawidłowych wskaźników - + Indices Wskaźniki - + No degenerations Brak zniekształceń - + %1 degenerated faces %1 zniekształconych ścian - + Degenerations Zniekształcenia - + No duplicated faces Brak zduplikowanych ścian - + %1 duplicated faces %1 zduplikowanych powierzchni - + Duplicated faces Zduplikowane fasetki - + No duplicated points Brak zduplikowanych punktów - - + + Duplicated points Zduplikowane punkty - + No self-intersections Brak samoprzecięć - + Self-intersections Samoprzecięcia - + No folds on surface Brak zagięć na powierzchni - + %1 folds on surface %1 zagięć na powierzchni - + Folds Zagięcia - - + + Mesh repair Naprawa siatek @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Utwórz %1 - + No active document Brak aktywnego dokumentu @@ -1366,7 +1366,7 @@ Wysokość: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Ten parametr wskazuje, czy kompresja ZIP @@ -1551,48 +1551,48 @@ do gładszego wyglądu. MeshGui::GmshWidget - + Automatic Automatycznie - + Adaptive Adaptacyjnie - + Frontal Frontal - + Frontal Quad Przedni czworobok - + Parallelograms Równoległoboki - - + + Time: Czas: - + Running gmsh... Uruchamianie Gmsh... - + Failed to start Nie udało się uruchomić - + Error Błąd @@ -1600,22 +1600,22 @@ do gładszego wyglądu. MeshGui::MeshFaceAddition - + Add triangle Dodaj trójkąt - + Flip normal Odwróć wektory normalne - + Clear Wyczyść - + Finish Zakończ @@ -1623,7 +1623,7 @@ do gładszego wyglądu. MeshGui::MeshFillHole - + Finish Zakończ @@ -1631,47 +1631,47 @@ do gładszego wyglądu. MeshGui::ParametersDialog - + Surface fit Dopasowanie powierzchni - + Parameters Parametry - + Selection Zaznaczanie - + Region Obszar - + Triangle Trójkąt - + Clear Wyczyść - + Compute Oblicz - + No selection Brak zaznaczenia - + Before fitting the surface select an area. Przed dopasowaniem powierzchni wybierz obszar. @@ -1891,7 +1891,7 @@ do gładszego wyglądu. Mesh segmentation - Siatka — segmentacja + Segmentacja siatki @@ -1930,29 +1930,29 @@ do gładszego wyglądu. Sfera - - + + Base Baza - + Normal Normalna - + Axis Oś - - + + Radius Promień - + Center Środek @@ -1986,12 +1986,12 @@ do gładszego wyglądu. Akceptuj tylko trójkąty o normalnych ścian zwrócone w stronę ekranu - + Use a brush tool to select the area Zaznacz obszar za pomocą narzędzia Pędzel - + Clears completely the selected area Czyści całkowicie zaznaczony obszar @@ -1999,14 +1999,14 @@ do gładszego wyglądu. MeshGui::TaskRemoveComponents - - + + Delete Usuń - - + + Invert Odwróć wybór @@ -2014,38 +2014,38 @@ do gładszego wyglądu. MeshInfoWatcher - + Number of points: Ilość punktów: - + Number of facets: Liczba wielokątów: - + Minimum bound: Minimalna wartość graniczna: - + Maximum bound: Maksymalna wartość graniczna: - + Mesh info box Panel informacje o siatce - + Mesh info Informacje o siatce - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ do gładszego wyglądu. Mesh_BoundingBox - + Boundings of %1: Granice %1: @@ -2061,26 +2061,26 @@ do gładszego wyglądu. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Wystąpił nieznany błąd podczas uruchamiania OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD nie został odnaleziony w Twoim systemie. @@ -2090,7 +2090,7 @@ Odwiedź http://www.openscad.org/index.html żeby go zainstalować. QDockWidget - + Evaluate & Repair Mesh Oceń i napraw siatkę @@ -2098,241 +2098,241 @@ Odwiedź http://www.openscad.org/index.html żeby go zainstalować. QObject - + Display Wyświetlanie - + Import-Export Import-Eksport - + All Mesh Files Wszystkie pliki siatek - - + + Binary STL Binarny STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binarny plik siatki - - + + Alias Mesh Jako Siatka (Mesh) - - + + Object File Format Format pliku obiektu - + Inventor V2.1 ASCII Inventor V2.1 w ASCII - - + + Stanford Polygon Stanford Triangle Format - + NASTRAN NASTRAN - - + + All Files Wszystkie pliki - + Import mesh Import siatki - + Simple Model Format Prosty Format Modelu - + Inventor V2.1 ascii Inventor v2.1 w ASCII - + X3D Extensible 3D X3D rozszerzenie 3D (*. x3d) - + Compressed X3D Skompresowany X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Skompresowany VRML 2.0 - + Nastran Nastran - + Python module def Definicje modułów Python - + Asymptote Format Format asymptoty - + 3D Manufacturing Format Format produkcyjny 3D - + Export mesh Eksport siatki - + Meshing Tolerance Tolerancja siatki - + Enter tolerance for meshing geometry: Wprowadź tolerancję dla geometrii siatki: - + The mesh '%1' is not a solid. Siatka '%1' nie jest ciągła. - + The mesh '%1' is a solid. Siatka '%1' jest ciągła. - + Solid Mesh Siatka bryły - + Boundings Granice - + Fill holes Wypełnij otwory - + Fill holes with maximum number of edges: Wypełnij otwory maksymalną liczbą krawędzi: - + Scaling Skalowanie - + Enter scaling factor: Wprowadź współczynnik skalowania: - + [Points: %1, Edges: %2, Faces: %3] [Punktów: %1, Krawędzi: %2, Powierzchni: %3] - + Display components Wyświetl fragmenty - + Display segments Wyświetl segmenty - + Display colors Wyświetlane kolory - - + + Leave info mode Opuść tryb informacyjny - + Index: %1 Indeks :%1 - + Leave hole-filling mode Opuść tryb wypełniania otworu - + Leave removal mode Opuść tryb usuwania - + Delete selected faces Usuń zaznaczone powierzchnie - + Clear selected faces Wyczyść zaznaczone powierzchnie - + Annotation Adnotacja @@ -2382,7 +2382,7 @@ Odwiedź http://www.openscad.org/index.html żeby go zainstalować. Mesh segmentation - Segmentacja siatki + Siatka — segmentacja diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_pt-BR.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_pt-BR.ts index 2ae8355b23..74a806fb51 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_pt-BR.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_pt-BR.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Malha - + Add triangle Adicionar triângulo - - + + Add triangle manually to a mesh Adicionar triângulo manualmente a uma malha @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Malha - + Boundings info... Info caixa de volume... - - + + Shows the boundings of the selected mesh Mostra a caixa de volume da malha selecionada @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Malha - + Regular solid... Sólido regular... - - + + Builds a regular solid Cria um sólido regular @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Malha - + Cross-sections... Secções transversais... - - + + Cross-sections Secções transversais @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Malha - + Decimation... Decimação... - - - + + + Decimates a mesh Decimar uma malha @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Malha - + Difference Diferença @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Malha - + Face info Info face - - + + Information about face Informações sobre a face @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Malha - + Check solid mesh Verificar malha sólida - - + + Checks whether the mesh is a solid Verifica se a malha é um sólido @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Malha - + Evaluate and repair mesh... Analisar e consertar malha... - - + + Opens a dialog to analyze and repair a mesh Abre uma janela para analisar e consertar uma malha @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Malha - + Export mesh... Exportar malha... - - + + Exports a mesh to file Exporta uma malha para um arquivo @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Malha - + Close hole Fechar furo - - + + Close holes interactively Fechar furos interativamente @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Malha - + Fill holes... Preencher furos... - - + + Fill holes of the mesh Preencher furos na malha @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Malha - + Flip normals Inverter normais - - + + Flips the normals of the mesh Inverte as normais da malha @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Malha - + Create mesh from geometry... Criar malha a partir de geometria... - - + + Create mesh from the selected geometry Criar uma malha a partir da geometria selecionada @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Malha - + Create mesh from shape... Criar malha a partir de uma forma... - + Tessellate shape Paginar forma @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Malha - + Harmonize normals Harmonizar as normais - - + + Harmonizes the normals of the mesh Harmoniza as normais da malha @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Malha - + Import mesh... Importar malha... - - + + Imports a mesh from file Importa uma malha a partir de um arquivo @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Malha - + Intersection Intersecção @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Malha - + Merge Fundir - + Merges selected meshes into one Fundir as malhas selecionadas numa só @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Malha - + Cut mesh Cortar malha - - + + Cuts a mesh with a picked polygon Corta uma malha com um polígono escolhido @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Malha - + Make segment Fazer um segmento - - + + Creates a mesh segment Criar um segmento de malha @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Malha - + Split mesh Dividir uma malha - - + + Splits a mesh into two meshes Dividir uma malha em duas @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Malha - + Trim mesh Cortar malha - - + + Trims a mesh with a picked polygon Recorta uma malha com um polígono @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Malha - + Refinement... Refinamento... - - + + Refine existing mesh Refinar malha existente @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Malha - + Remove components by hand... Remover componentes manualmente... - - + + Mark a component to remove it from the mesh Marcar um componente para ser removido da malha @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Malha - + Remove components... Remover componentes... - - + + Remove topologic independent components from the mesh Remover componentes topológicos independentes da malha @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Malha - + Scale... Escala... - + Scale selected meshes Escalar malhas selecionadas @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Malha - + Create section from mesh and plane Criar a seção a partir da malha e plano - - + + Section from mesh and plane Seção a partir da malha e plano @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Malha - + Create mesh segments... Cria segmentos de uma malha... - - + + Create mesh segments Criar segmentos de malha @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Malha - + Create mesh segments from best-fit surfaces... Crie segmentos de malha de superfícies com melhor ajuste... - - + + Create mesh segments from best-fit surfaces Crie segmentos de malha de superfícies com melhor ajuste @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Malha - + Smooth... Suavizar... - - + + Smooth the selected meshes Suavizar as malhas selecionadas @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Malha - + Split by components Dividir por componentes - + Split selected mesh into its components Dividir a malha selecionada em seus componentes @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Malha - + Trim mesh with a plane Aparar malha numa superfície plana - - + + Trims a mesh with a plane Apare uma malha numa superfície plana @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Malha - + Union União @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Malha - + Curvature plot Traçado de curvatura - - + + Calculates the curvature of the vertices of a mesh Calcula a curvatura dos vértices de uma malha @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Malha - + Curvature info Info curvatura - - + + Information about curvature Informações sobre a curvatura @@ -672,144 +672,144 @@ União de malha - + Mesh difference Diferença de malha - + Mesh intersection Interseção de malha - + Import Mesh Importar malha - + Mesh VertexCurvature VertexCurvature Malha - + Mesh Smoothing Suavizar malha - + Harmonize mesh normals Harmonizar normais da malha - + Flip mesh normals Inverter normais da malha - + Fill up holes Preencher os buracos - + Mesh merge Fundir malhas - + Mesh split Dividir malha - + Mesh scale Redimensionar malha - + Mesh Decimating Decimação de malha - + Harmonize normals Harmonizar as normais - + Remove non-manifolds Remover não-manifolds - + Fix indices Corrigir índices - + Remove degenerated faces Remover faces degeneradas - + Remove duplicated faces Remover faces duplicadas - + Remove duplicated points Remover pontos duplicados - + Fix self-intersections Corrigir auto-interseções - + Remove folds Remover dobras - + Repair mesh Consertar malha - + Delete selection Apagar seleção - - + + Cut Recortar - - + + Trim Aparar - + Split Separar - + Segment Segmento - + Delete Excluir - + Fill hole Preencher o buraco @@ -838,7 +838,7 @@ - + Absolute number Número absoluto @@ -848,7 +848,7 @@ Tolerância - + Absolute number (Maximum: %1) Número absoluto (Máximo: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Configurações... - - + + No selection Nenhuma seleção - - - - - - - - - - - + + + + + + + + + + + No information Sem Informação - + Orientation Orientação - + No flipped normals Nenhuma normal invertida - + %1 flipped normals %1 normais invertidas - + No non-manifolds Nenhum não-manifold - + %1 non-manifolds %1 não-manifolds - - + + Non-manifolds Não-manifolds - + Cannot remove non-manifolds Não é possível remover não-manifolds - + Invalid face indices Índices de face inválidos - + Invalid point indices Índices de ponto inválidos - + Multiple point indices Vários índices de pontos - + Invalid neighbour indices Índices de vizinhos inválidos - + No invalid indices Nenhum índice inválido - + Indices Índices - + No degenerations Nenhuma degeneração - + %1 degenerated faces %1 faces degeneradas - + Degenerations Degenerações - + No duplicated faces Nenhuma face duplicada - + %1 duplicated faces %1 faces duplicadas - + Duplicated faces Faces duplicadas - + No duplicated points Nenhum ponto duplicado - - + + Duplicated points Pontos duplicados - + No self-intersections Nenhuma auto-intersecção - + Self-intersections Auto-intersecções - + No folds on surface Nenhuma dobra na superfície - + %1 folds on surface %1 dobras na superfície - + Folds Dobras - - + + Mesh repair Conserto de malha @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Criar %1 - + No active document Nenhum documento ativo @@ -1366,7 +1366,7 @@ Altura: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Este parâmetro indica se a compressão ZIP @@ -1551,48 +1551,48 @@ a uma aparência suavizada. MeshGui::GmshWidget - + Automatic Automática - + Adaptive Adaptável - + Frontal Frontal - + Frontal Quad Quadrângulo frontal - + Parallelograms Paralelogramos - - + + Time: Tempo: - + Running gmsh... Executando gmsh... - + Failed to start Falha ao iniciar - + Error Erro @@ -1600,22 +1600,22 @@ a uma aparência suavizada. MeshGui::MeshFaceAddition - + Add triangle Adicionar triângulo - + Flip normal Inverter normais - + Clear Limpar - + Finish Concluir @@ -1623,7 +1623,7 @@ a uma aparência suavizada. MeshGui::MeshFillHole - + Finish Concluir @@ -1631,47 +1631,47 @@ a uma aparência suavizada. MeshGui::ParametersDialog - + Surface fit Superfície de ajuste - + Parameters Parâmetros - + Selection Seleção - + Region Região - + Triangle Triângulo - + Clear Limpar - + Compute Calcular - + No selection Nenhuma seleção - + Before fitting the surface select an area. Antes de ajustar a superfície selecione uma área. @@ -1930,29 +1930,29 @@ a uma aparência suavizada. Esfera - - + + Base Base - + Normal Normal - + Axis Eixo - - + + Radius Raio - + Center Centro @@ -1986,12 +1986,12 @@ a uma aparência suavizada. Respeitar somente com triângulos com normais direcionadas para a tela - + Use a brush tool to select the area Utilize uma ferramenta de pincel para selecionar a área - + Clears completely the selected area Apaga completamente a área selecionada @@ -1999,14 +1999,14 @@ a uma aparência suavizada. MeshGui::TaskRemoveComponents - - + + Delete Excluir - - + + Invert Inverter @@ -2014,38 +2014,38 @@ a uma aparência suavizada. MeshInfoWatcher - + Number of points: Número de pontos: - + Number of facets: Número de facetas: - + Minimum bound: Limite mínimo: - + Maximum bound: Limite máximo: - + Mesh info box Caixa de informações de malha - + Mesh info Informação da malha - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ a uma aparência suavizada. Mesh_BoundingBox - + Boundings of %1: Limites de %1: @@ -2061,26 +2061,26 @@ a uma aparência suavizada. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Ocorreu um erro desconhecido ao executar o OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. O OpenSCAD não foi encontrado em seu sistema. @@ -2090,7 +2090,7 @@ Favor visitar http://www.openscad.org/index.html para instalá-lo. QDockWidget - + Evaluate & Repair Mesh Avaliar & consertar malha @@ -2098,241 +2098,241 @@ Favor visitar http://www.openscad.org/index.html para instalá-lo. QObject - + Display Tela - + Import-Export Importação e exportação - + All Mesh Files Todos os arquivos de malha - - + + Binary STL Binário STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Malha binária - - + + Alias Mesh Malha de alias - - + + Object File Format Formato de arquivo objeto - + Inventor V2.1 ASCII Inventor v 2.1 ASCII - - + + Stanford Polygon Polígono de Stanford - + NASTRAN NASTRAN - - + + All Files Todos os Arquivos - + Import mesh Importar malha - + Simple Model Format Formato de modelo simples - + Inventor V2.1 ascii Inventor v 2.1 ascii - + X3D Extensible 3D X3D Extensivel 3D - + Compressed X3D Compactação X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML v 2.0 - + Compressed VRML 2.0 VRML 2.0 comprimido - + Nastran Nastran - + Python module def Def de módulo Python - + Asymptote Format Formato Assimptota - + 3D Manufacturing Format Formato de Fabricação 3D - + Export mesh Exportar malha - + Meshing Tolerance Tolerância de malhagem - + Enter tolerance for meshing geometry: Digite tolerância para a malhagem de geometria: - + The mesh '%1' is not a solid. A malha '%1' não é um sólido. - + The mesh '%1' is a solid. A malha '%1' é um sólido. - + Solid Mesh Malha sólida - + Boundings Caixa de volume - + Fill holes Preencher furos - + Fill holes with maximum number of edges: Preenche buracos com um número máximo de arestas: - + Scaling Escalar - + Enter scaling factor: Digite o fator de escala: - + [Points: %1, Edges: %2, Faces: %3] [Pontos: %1, Bordas: %2, Faces: %3] - + Display components Exibir componentes - + Display segments Exibir segmentos - + Display colors Exibir cores - - + + Leave info mode Sair do modo de info - + Index: %1 Índice: %1 - + Leave hole-filling mode Sair do modo de preenchimento de furos - + Leave removal mode Sair do modo de remoção - + Delete selected faces Excluir as faces selecionadas - + Clear selected faces Limpar as faces selecionadas - + Annotation Anotação diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_pt-PT.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_pt-PT.ts index 21ae0ea587..a5c0f2a9f3 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_pt-PT.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_pt-PT.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Malha - + Add triangle Adicionar Triâgulo - - + + Add triangle manually to a mesh Adicionar Manualmente Triângulo p/ uma Malha @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Malha - + Boundings info... Informação de delimitações... - - + + Shows the boundings of the selected mesh Mostra as delimitações da malha selecionada @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Malha - + Regular solid... Sólido Regular - - + + Builds a regular solid Cria um Sólido Regular @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Malha - + Cross-sections... Perfis transversais ... - - + + Cross-sections Perfis transversais @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Malha - + Decimation... Simplificar... - - - + + + Decimates a mesh Simplifica uma malha @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Malha - + Difference Diferença @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Malha - + Face info Informação da Superfície - - + + Information about face Informação Sobre a Superfície @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Malha - + Check solid mesh Verificar Malha Sólida - - + + Checks whether the mesh is a solid Verificar se a malha é ou não um sólido @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Malha - + Evaluate and repair mesh... Avaliar e reparar malha... - - + + Opens a dialog to analyze and repair a mesh Abre uma janela para analisar e reparar a malha @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Malha - + Export mesh... Exportar Malha ... - - + + Exports a mesh to file Exportar Malha para Ficheiro @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Malha - + Close hole Fechar Buraco - - + + Close holes interactively Fechar buracos interativamente @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Malha - + Fill holes... Preencher buracos ... - - + + Fill holes of the mesh Preencher buracos na malha @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Malha - + Flip normals Inverter normais - - + + Flips the normals of the mesh Inverter os normais da malha @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Malha - + Create mesh from geometry... Criar Malha a partir da Geometria - - + + Create mesh from the selected geometry Criar uma malha da geometria selecionada @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Malha - + Create mesh from shape... Criar Malha a Partir da Forma ... - + Tessellate shape Forma Tessellate @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Malha - + Harmonize normals Harmonizar normais - - + + Harmonizes the normals of the mesh Harmoniza os normais da malha @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Malha - + Import mesh... Importar Malha ... - - + + Imports a mesh from file Importar uma malha de um ficheiro @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Malha - + Intersection Interseção @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Malha - + Merge Fundir - + Merges selected meshes into one Fundir as malhas selecionadas numa só @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Malha - + Cut mesh Cortar Malha - - + + Cuts a mesh with a picked polygon Corta uma malha com um polígono selecionado @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Malha - + Make segment Criar Segmento - - + + Creates a mesh segment Cria um segmento de malha @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Malha - + Split mesh Dividir Malha - - + + Splits a mesh into two meshes Divide uma malha em duas @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Malha - + Trim mesh Aparar malha - - + + Trims a mesh with a picked polygon Apara uma malha com um polígono escolhido @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Malha - + Refinement... Melhoria... - - + + Refine existing mesh Optimizar malha existente @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Malha - + Remove components by hand... Remover manualmente os componentes ... - - + + Mark a component to remove it from the mesh Marcar um componente para o remover da malha @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Malha - + Remove components... Remover Componentes ... - - + + Remove topologic independent components from the mesh Remover componentes topológicos independentes da malha @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Malha - + Scale... Escala... - + Scale selected meshes Escalar malhas selecionadas @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Malha - + Create section from mesh and plane Criar secção a partir da malha e plano - - + + Section from mesh and plane Secção a partir da malha e plano @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Malha - + Create mesh segments... Criar segmentos de malha... - - + + Create mesh segments Criar segmentos de malha @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Malha - + Create mesh segments from best-fit surfaces... Crie segmentos de malha de superfícies com melhor ajuste... - - + + Create mesh segments from best-fit surfaces Crie segmentos de malha de superfícies com melhor ajuste @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Malha - + Smooth... Suavizar ... - - + + Smooth the selected meshes Suavizar as Malhas Selecionadas @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Malha - + Split by components Separar por componentes - + Split selected mesh into its components Separa as malhas selecionadas nos seus componentes @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Malha - + Trim mesh with a plane Aparar malha com um plano - - + + Trims a mesh with a plane Aparar malha com um plano @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Malha - + Union União @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Malha - + Curvature plot Tracejado de curvatura - - + + Calculates the curvature of the vertices of a mesh Calcula a curvatura dos vértices da malha @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Malha - + Curvature info Informação de curvatura - - + + Information about curvature Informações sobre a curvatura @@ -672,144 +672,144 @@ União de malha - + Mesh difference Diferença de malha - + Mesh intersection Interseção de malhas - + Import Mesh Importar Malha - + Mesh VertexCurvature Malha VertexCurvatura - + Mesh Smoothing Suavizar Malha - + Harmonize mesh normals Harmonizar direções normais à malha - + Flip mesh normals Inverter direções normais à malha - + Fill up holes Preencher buracos - + Mesh merge Fusão de Malha - + Mesh split Divisão de malha - + Mesh scale Escala da malha - + Mesh Decimating Simplificação de Malha (Decimation) - + Harmonize normals Harmonizar normais - + Remove non-manifolds Remover não-manifolds - + Fix indices Corrigir índices - + Remove degenerated faces Remover faces degeneradas - + Remove duplicated faces Remover faces duplicadas - + Remove duplicated points Remover pontos duplicados - + Fix self-intersections Corrigir auto-interseções - + Remove folds Remover dobras - + Repair mesh Reparar malha - + Delete selection Eliminar seleção - - + + Cut Cortar - - + + Trim Aparar - + Split Separar - + Segment Segmento - + Delete Apagar - + Fill hole Preencher buraco @@ -838,7 +838,7 @@ - + Absolute number Número absoluto @@ -848,7 +848,7 @@ Tolerância - + Absolute number (Maximum: %1) Número absoluto (Máximo: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Configurações... - - + + No selection Nenhuma seleção - - - - - - - - - - - + + + + + + + + + + + No information Nenhuma informação - + Orientation Orientação - + No flipped normals Nenhuns normais invertidos - + %1 flipped normals %1 normais invertidos - + No non-manifolds Nenhuns não-manifolds - + %1 non-manifolds %1 não-manifolds - - + + Non-manifolds Não-manifolds - + Cannot remove non-manifolds Não é possível remover não-manifolds - + Invalid face indices Índices de faces inválido - + Invalid point indices Índices de pontos inválido - + Multiple point indices Vários índices de pontos - + Invalid neighbour indices Índices vizinhos inválidos - + No invalid indices Nenhuns índices inválidos - + Indices índices - + No degenerations Nenhumas degenerações - + %1 degenerated faces %1 faces degeneradas - + Degenerations Degenerações - + No duplicated faces Nenhumas faces duplicadas - + %1 duplicated faces %1 faces duplicadas - + Duplicated faces Faces duplicadas - + No duplicated points Nenhuns pontos duplicados - - + + Duplicated points Pontos duplicados - + No self-intersections Nenhuma auto-intersecção - + Self-intersections Auto-intersecções - + No folds on surface Nenhuma dobra na superfície - + %1 folds on surface %1 dobras na superfície - + Folds Dobras - - + + Mesh repair Reparar malha (mesh) @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Criar %1 - + No active document Nenhum documento ativo @@ -1366,7 +1366,7 @@ Altura: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Este parâmetro indica se a compressão ZIP @@ -1551,48 +1551,48 @@ a uma aparência mais suave. MeshGui::GmshWidget - + Automatic Automática - + Adaptive Adaptativo - + Frontal Frontal - + Frontal Quad Quadro frontal - + Parallelograms Paralelogramos - - + + Time: Tempo: - + Running gmsh... Executando gmsh... - + Failed to start Falha ao iniciar - + Error Erro @@ -1600,22 +1600,22 @@ a uma aparência mais suave. MeshGui::MeshFaceAddition - + Add triangle Adicionar Triâgulo - + Flip normal Inverter normais - + Clear Limpar - + Finish Terminar @@ -1623,7 +1623,7 @@ a uma aparência mais suave. MeshGui::MeshFillHole - + Finish Terminar @@ -1631,47 +1631,47 @@ a uma aparência mais suave. MeshGui::ParametersDialog - + Surface fit Ajustar Superfície - + Parameters Parâmetros - + Selection Seleção - + Region Região - + Triangle Triângulo - + Clear Limpar - + Compute Calcular - + No selection Nenhuma seleção - + Before fitting the surface select an area. Antes de ajustar a superfície selecione uma área. @@ -1930,29 +1930,29 @@ a uma aparência mais suave. Esfera - - + + Base Base - + Normal Normal - + Axis Eixo - - + + Radius Raio - + Center Centro @@ -1986,12 +1986,12 @@ a uma aparência mais suave. Respeitar apenas triângulos com normais de frente para o monitor - + Use a brush tool to select the area Use um pincel para selecionar a área - + Clears completely the selected area Limpa completamente a área selecionada @@ -1999,14 +1999,14 @@ a uma aparência mais suave. MeshGui::TaskRemoveComponents - - + + Delete Apagar - - + + Invert Inverter @@ -2014,38 +2014,38 @@ a uma aparência mais suave. MeshInfoWatcher - + Number of points: Número de pontos: - + Number of facets: Número de faces: - + Minimum bound: Limite mínimo: - + Maximum bound: Limite máximo: - + Mesh info box Caixa de informações de malha - + Mesh info Informação de malha - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ a uma aparência mais suave. Mesh_BoundingBox - + Boundings of %1: Limites de %1: @@ -2061,26 +2061,26 @@ a uma aparência mais suave. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Ocorreu um erro desconhecido ao executar o OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. O OpenSCAD não foi encontrado no seu sistema. @@ -2090,7 +2090,7 @@ Visite http://www.openscad.org/index.html para instalá-lo. QDockWidget - + Evaluate & Repair Mesh Avaliar & Reparar Malha @@ -2098,241 +2098,241 @@ Visite http://www.openscad.org/index.html para instalá-lo. QObject - + Display Visualização - + Import-Export Importar/Exportar - + All Mesh Files Todos os Ficheiros de malha (mesh) - - + + Binary STL Binário STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Malha binária - - + + Alias Mesh Nome alternativo da Malha - - + + Object File Format Formato de ficheiro do objeto - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Polígono de Stanford - + NASTRAN NASTRAN - - + + All Files Todos os Ficheiros - + Import mesh Importar malha - + Simple Model Format Formato do modelo simples - + Inventor V2.1 ascii Inventor v 2.1 ascii - + X3D Extensible 3D X3D Extensivel 3D - + Compressed X3D X3D comprimido - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML v 2.0 - + Compressed VRML 2.0 VRML 2.0 comprimido - + Nastran Nastran - + Python module def Def de módulo Python - + Asymptote Format Formato Assimptota - + 3D Manufacturing Format Formato de manufactora 3D - + Export mesh Exportar malha - + Meshing Tolerance Tolerância da malhagem - + Enter tolerance for meshing geometry: Introduzir a tolerância para a geometria da malhagem: - + The mesh '%1' is not a solid. A malha '%1' não é um sólido. - + The mesh '%1' is a solid. A malha '%1' é um sólido. - + Solid Mesh Malha sólida - + Boundings Delimitações - + Fill holes Preencher buracos - + Fill holes with maximum number of edges: Preencher buracos com número máximo de arestas: - + Scaling A escalar - + Enter scaling factor: Digite o fator de escala: - + [Points: %1, Edges: %2, Faces: %3] [Pontos: %1, Arestas: %2, Faces: %3] - + Display components Exibir componentes - + Display segments Exibir segmentos - + Display colors Cor da tela - - + + Leave info mode Sair do modo de informação - + Index: %1 Índice: %1 - + Leave hole-filling mode Sair do modo de preenchimento de buracos - + Leave removal mode Sair do modo de remoção - + Delete selected faces Apagar as faces selecionadas - + Clear selected faces Limpar faces selecionadas - + Annotation Anotação diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ro.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ro.ts index ca556008d6..08ed738a77 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ro.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ro.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Adauga triunghi - - + + Add triangle manually to a mesh Adaugă manual un triunghi la plasă (rețeaua de discretizare) @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Detalii margini... - - + + Shows the boundings of the selected mesh Afișează marginile plasei selectate @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Solid comun... - - + + Builds a regular solid Creaza un solid comun @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Sectiune transversala... - - + + Cross-sections Sectiune transversala @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Zecimație... - - - + + + Decimates a mesh Decimates a mesh @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Diferenţa @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Informatii fateta - - + + Information about face Informatii despre fata @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Verifică dacă plasa formează un solid - - + + Checks whether the mesh is a solid Verifică dacă plasa formează un solid @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Evaluează şi reparară plasa... - - + + Opens a dialog to analyze and repair a mesh Deschide o casetă de dialog pentru analiza și repararea plasei @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Exportă plasa... - - + + Exports a mesh to file Exportă o plasă într-un fișier @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Inchide gaura - - + + Close holes interactively Inchide o gaura in mod interactiv @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Umple gauri... - - + + Fill holes of the mesh Umple găurile unei plase @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Inversează normalele - - + + Flips the normals of the mesh Inversează normalele unei plase @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Creează o plasă dintr-o geometrie... - - + + Create mesh from the selected geometry Creează o plasă din geometria selectată @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Creaza retea din forma... - + Tessellate shape Divide forma @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Armonizeaza normalele - - + + Harmonizes the normals of the mesh Armonizează normalele plasei @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Importă plasa... - - + + Imports a mesh from file Importa o plasă dintr-un fișier @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Intersecţie @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Fuziune - + Merges selected meshes into one Fuzionează plasele selectate într-o singură plasă @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Taie plasa - - + + Cuts a mesh with a picked polygon Taie plasa cu poligonul ales @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Creează segment - - + + Creates a mesh segment Creează un segment de plasă @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Divide plasa - - + + Splits a mesh into two meshes Imparte o plasă în două plase @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Taie plasa - - + + Trims a mesh with a picked polygon Taie plasa cu un poligon ales @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Rafinare... - - + + Refine existing mesh Rafinează plasa existentă @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Sterge componente interactiv... - - + + Mark a component to remove it from the mesh Selectează o componentă pentru a fi ștearsă din plasă @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Elimina componente... - - + + Remove topologic independent components from the mesh Elimină componentele topologic-independente dintr-o plasă @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Scară... - + Scale selected meshes Mărește la scară plasele selectate @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Creează o secțiune plecând de la la o plasă şi un plan - - + + Section from mesh and plane Secțiune plecând de la la o plasă şi un plan @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Creează segmente de plasă... - - + + Create mesh segments Creează segmente de plasă @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Creaţi segmente ochiurilor de plasă din cele mai adecvate suprafețe... - - + + Create mesh segments from best-fit surfaces Creaţi segmente ochiurilor de plasă din cele mai adecvate suprafețe @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Netezeste... - - + + Smooth the selected meshes Netezește plasele selectate @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Împărțiți de componente - + Split selected mesh into its components Împarte ochiurile selectate în componentele sale @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Tăiaţi plasa cu un plan - - + + Trims a mesh with a plane Tăie o plasă cu un plan @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Reuniune @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Grafic curbura - - + + Calculates the curvature of the vertices of a mesh Calculează curbura vârfurilor unei plase @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Informatii despre curbura - - + + Information about curvature Informatii despre curbura @@ -672,144 +672,144 @@ Sindicatul plasei - + Mesh difference Diferenţa de plasă - + Mesh intersection Intersecţie plasă - + Import Mesh Importă plasa - + Mesh VertexCurvature VertexCurvatura plasei - + Mesh Smoothing Smoothing pentru plasă - + Harmonize mesh normals Armonizeaza normalele - + Flip mesh normals Inversează normalele - + Fill up holes Umple găurile - + Mesh merge Fuzionarea plasei - + Mesh split Divizare plasă - + Mesh scale Scară plasă - + Mesh Decimating Decimare plasă - + Harmonize normals Armonizeaza normalele - + Remove non-manifolds Elimină alte pliuri - + Fix indices Repară indicii - + Remove degenerated faces Elimină fațete degenerate - + Remove duplicated faces Se elimină fișierele duplicat - + Remove duplicated points Se elimină fișierele duplicat - + Fix self-intersections Repară auto-intersecțiile - + Remove folds Elimină îndoiturile - + Repair mesh Reparare plasă - + Delete selection Ştergere - - + + Cut Scădere - - + + Trim Taiere - + Split Divizare - + Segment Segment - + Delete Ştergeţi - + Fill hole Umple gaura @@ -838,7 +838,7 @@ - + Absolute number Număr absolut @@ -848,7 +848,7 @@ Toleranţă - + Absolute number (Maximum: %1) Număr absolut (Maxim: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Configurări... - - + + No selection Nici o selecţie - - - - - - - - - - - + + + + + + + + + + + No information Nici o informatie - + Orientation Orientarea - + No flipped normals Nici o normala inversa - + %1 flipped normals %1 normale inverse - + No non-manifolds Obiecte manufacturabile - + %1 non-manifolds %1 ne manufactuabil - - + + Non-manifolds Obiecte ne-manufacturabile - + Cannot remove non-manifolds Obiect ne manufacturabil - + Invalid face indices Indicii fațetei sunt incorecți - + Invalid point indices Indicii punctului incorecți - + Multiple point indices Indici multipli de punct - + Invalid neighbour indices Indicii elementelor vecine sunt incorecți - + No invalid indices Nici un indice invalid - + Indices Indici - + No degenerations Nici o degenerare - + %1 degenerated faces %1 fete degenerate - + Degenerations Degenerari - + No duplicated faces Nici o fațetă duplicată - + %1 duplicated faces %1 fațete duplicate - + Duplicated faces Fațete duplicate - + No duplicated points Nici un punct duplicat - - + + Duplicated points Puncte duplicate - + No self-intersections Nici o coliziune internă - + Self-intersections Coliziuni interne - + No folds on surface Nici un pliu pe suprafata - + %1 folds on surface %1 pliuri pe suprafata - + Folds Pliuri - - + + Mesh repair Reparare plasă @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Creati %1 - + No active document Nici un document activ @@ -1366,7 +1366,7 @@ Inaltime: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Acesta parametru indică dacă arhivarea ZIP este utilizată la scrierea fișierului în format AMF @@ -1550,48 +1550,48 @@ la un aspect mai uşor. MeshGui::GmshWidget - + Automatic Automat - + Adaptive Adaptiv - + Frontal Față - + Frontal Quad Quad frontal - + Parallelograms Paralelograme - - + + Time: Timp: - + Running gmsh... Rulare gmsh... - + Failed to start Pornirea a eșuat - + Error Eroare @@ -1599,22 +1599,22 @@ la un aspect mai uşor. MeshGui::MeshFaceAddition - + Add triangle Adauga triunghi - + Flip normal Comuta normalele - + Clear Șterge - + Finish Terminare @@ -1622,7 +1622,7 @@ la un aspect mai uşor. MeshGui::MeshFillHole - + Finish Terminare @@ -1630,47 +1630,47 @@ la un aspect mai uşor. MeshGui::ParametersDialog - + Surface fit Suprafaţa se potrivesc - + Parameters Parametrii - + Selection Selecţie - + Region Regiune - + Triangle Triunghi - + Clear Șterge - + Compute Calculez - + No selection Nici o selecţie - + Before fitting the surface select an area. Selectați o zonă înainte de a plasa suprafața. @@ -1929,29 +1929,29 @@ la un aspect mai uşor. Sfera - - + + Base Bază - + Normal Normal - + Axis Axele - - + + Radius Raza - + Center Centru @@ -1985,12 +1985,12 @@ la un aspect mai uşor. Respecta numai triunghiuri cu normalele catre ecran - + Use a brush tool to select the area Utilizați o unealtă pensulă pentru a selecta zona - + Clears completely the selected area Curăță complet zona selectată @@ -1998,14 +1998,14 @@ la un aspect mai uşor. MeshGui::TaskRemoveComponents - - + + Delete Ştergeţi - - + + Invert Inverseaza @@ -2013,38 +2013,38 @@ la un aspect mai uşor. MeshInfoWatcher - + Number of points: Numar de puncte: - + Number of facets: Număr de fațete: - + Minimum bound: Limită minimă: - + Maximum bound: Limita maximă: - + Mesh info box Mesh info box - + Mesh info Informații plasă - - + + X: %1 Y: %2 Z: %3 X: %1 <unk> Y: %2 <unk> Z: %3 @@ -2052,7 +2052,7 @@ la un aspect mai uşor. Mesh_BoundingBox - + Boundings of %1: Límite de %1: @@ -2060,26 +2060,26 @@ la un aspect mai uşor. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. A intervenit o eroare necunoscută în timpul rulării OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD nu poate fi găsit pe sistem. @@ -2089,7 +2089,7 @@ Vizitați http://www.openscad.org/index.html pentru a-l instala. QDockWidget - + Evaluate & Repair Mesh Evaluează și repară plasa @@ -2097,241 +2097,241 @@ Vizitați http://www.openscad.org/index.html pentru a-l instala. QObject - + Display Afișare - + Import-Export Import/Export - + All Mesh Files Toate fişierele tip plasă - - + + Binary STL Binar STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Ochiurilor de plasă binare - - + + Alias Mesh Alias Plasă/Mesh - - + + Object File Format Format de fişier obiect - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford poligon - + NASTRAN NASTRAN - - + + All Files Toate fișierele - + Import mesh Import plasa - + Simple Model Format Formatul Modelului Simplu - + Inventor V2.1 ascii Inventatorul V2.1 ascii - + X3D Extensible 3D X3D extensibil 3D - + Compressed X3D X3D comprimat - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 VRML 2.0 Comprimat - + Nastran Nastran - + Python module def Definiţie de modulul Python - + Asymptote Format Format Asimptote - + 3D Manufacturing Format Format Producție 3D - + Export mesh Exporta plasa - + Meshing Tolerance Toleranta plasei - + Enter tolerance for meshing geometry: Introduceţi toleranţa pentru geometria plasei: - + The mesh '%1' is not a solid. Plasa %1 nu este un solid. - + The mesh '%1' is a solid. Plasa %1 este un solid. - + Solid Mesh Plasă solidă - + Boundings Margini - + Fill holes Umple goluri - + Fill holes with maximum number of edges: Umple goluri cu numarul maxim de margini: - + Scaling Scalarea - + Enter scaling factor: Introduce factorul de scalare: - + [Points: %1, Edges: %2, Faces: %3] [Puncte: %1, margini: %2, fațete: %3] - + Display components Afișează componente - + Display segments Afișare segmente - + Display colors Culoarea afișajului - - + + Leave info mode Parasiti modul informare - + Index: %1 Indice: %1 - + Leave hole-filling mode Parasiti modul de umplere a gaurilor - + Leave removal mode Parasiti modul de stergere - + Delete selected faces Stergeti fetele selectate - + Clear selected faces Curatati fetele selectate - + Annotation Notatie diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ru.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ru.ts index 628065406a..88582b6a94 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_ru.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_ru.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Сеть - + Add triangle Добавить треугольник - - + + Add triangle manually to a mesh Добавить треугольник в полигональную сетку вручную @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh - Сеть + Полигональная сетка - + Boundings info... Информация о структуре... - - + + Shows the boundings of the selected mesh Показывает структуру выбранной полигональной сетки @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Полигональная сетка - + Regular solid... Правильное геометрическое тело... - - + + Builds a regular solid Построение правильного твердого тела @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Полигональная сетка - + Cross-sections... Поперечные сечения... - - + + Cross-sections Поперечные сечения @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Полигональная сетка - + Decimation... Упрощение... - - - + + + Decimates a mesh Проредить полигональную сетку @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Полигональная сетка - + Difference Разность @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Полигональная сетка - + Face info Информация о поверхности - - + + Information about face Информация о поверхности @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Полигональная сетка - + Check solid mesh Проверить полигональную сетку на твердотельность - - + + Checks whether the mesh is a solid Проверяет, является ли полигональная сетка твердотельным объектом @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Полигональная сетка - + Evaluate and repair mesh... Оценить и восстановить полигональную сетку... - - + + Opens a dialog to analyze and repair a mesh Открывает диалог для анализа и ремонта полигональной сетки @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Полигональная сетка - + Export mesh... Экспорт полигональной сетки... - - + + Exports a mesh to file Экспорт полигональной сетки в файл @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Полигональная сетка - + Close hole Закрыть отверстие - - + + Close holes interactively Закрыть отверстия интерактивно @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Полигональная сетка - + Fill holes... Заполнить отверстия ... - - + + Fill holes of the mesh Заполнить дырки полигональной сетки @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Полигональная сетка - + Flip normals Развернуть направление нормалей - - + + Flips the normals of the mesh Меняет направление нормалей полигональной сетки на противоположное @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Полигональная сетка - + Create mesh from geometry... Создать полигональную сетку по геометрии... - - + + Create mesh from the selected geometry Создание полигональной сетки из выбранной геометрии @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Полигональная сетка - + Create mesh from shape... Создать полигональную сетку из фигуры... - + Tessellate shape Мозаика из фигуры @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Полигональная сетка - + Harmonize normals Согласовать нормали - - + + Harmonizes the normals of the mesh Согласует нормали полигональной сетки @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Полигональная сетка - + Import mesh... Импортировать полигональную сетку... - - + + Imports a mesh from file Импорт полигональной сетки из файла @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Полигональная сетка - + Intersection Пересечение @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Полигональная сетка - + Merge Объединить - + Merges selected meshes into one Объединить выбранные полигональные сетки в одну @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Полигональная сетка - + Cut mesh Обрезать полигональную сетку - - + + Cuts a mesh with a picked polygon Обрезать полигональную сетку выбранным многоугольником @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Полигональная сетка - + Make segment Создать сегмент - - + + Creates a mesh segment Создает сегмент полигональной сетки @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Полигональная сетка - + Split mesh Разделить полигональную сетку - - + + Splits a mesh into two meshes Разделяет полигональную сетку на две полигональные сетки @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Полигональная сетка - + Trim mesh Подрезать полигональную сетку - - + + Trims a mesh with a picked polygon Подрезает полигональную сетку выбранным многоугольником @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Полигональная сетка - + Refinement... Улучшение... - - + + Refine existing mesh Улучшить существующую сетку @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Полигональная сетка - + Remove components by hand... Удалить компоненты вручную ... - - + + Mark a component to remove it from the mesh Пометить компонент для удаления из полигональной сетки @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Полигональная сетка - + Remove components... Удалить компоненты... - - + + Remove topologic independent components from the mesh Удалить топологически-независимые компоненты из полигональной сетки @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Полигональная сетка - + Scale... Масштаб... - + Scale selected meshes Масштабирование выбранных полигональных сеток @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Полигональная сетка - + Create section from mesh and plane Создать секцию из полигональной сетки и плоскости - - + + Section from mesh and plane Секция из полигональной сетки и плоскости @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Полигональная сетка - + Create mesh segments... Создать сегменты полигональной сетки... - - + + Create mesh segments Создать сегменты полигональной сетки @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Полигональная сетка - + Create mesh segments from best-fit surfaces... Создать сегменты полигональной сетки из наилучшего соответствия поверхностям... - - + + Create mesh segments from best-fit surfaces Создать сегменты полигональной сетки из наилучшего соответствия поверхностям @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Полигональная сетка - + Smooth... Сгладить ... - - + + Smooth the selected meshes Сгладить, выбранные полигональные сетки @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Полигональная сетка - + Split by components Разделить по компонентам - + Split selected mesh into its components Разделить выбранную полигональную сетку на её компоненты @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Полигональная сетка - + Trim mesh with a plane Подрезать полигональную сетку плоскостью - - + + Trims a mesh with a plane Подрезает полигональную сетку выбранной плоскостью @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Полигональная сетка - + Union Объединение @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Полигональная сетка - + Curvature plot График кривизны - - + + Calculates the curvature of the vertices of a mesh Вычисляет кривизну вершин полигональной сетки @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh - Полигональная сетка + Сеть - + Curvature info Данные о кривизне - - + + Information about curvature Информация о кривизне @@ -672,144 +672,144 @@ Объединить полигональные сетки - + Mesh difference Разница между полигональными сетками - + Mesh intersection Пересечение полигональных сеток - + Import Mesh Импортировать полигональную сетку - + Mesh VertexCurvature Определить кривизну вершин полигональной сетки - + Mesh Smoothing Сгладить полигональную сетку - + Harmonize mesh normals Согласовать нормали полигональной сетки - + Flip mesh normals Отразить нормали полигональной сетки - + Fill up holes Заполнение отверстий - + Mesh merge Слияние полигональных сеток - + Mesh split Разделить полигональную сетку - + Mesh scale Масштабировать полигональную сетку - + Mesh Decimating Упрощение сетки - + Harmonize normals Согласовать нормали - + Remove non-manifolds Удаление неоднообразных - + Fix indices Исправление индексов - + Remove degenerated faces Удаление поврежденных поверхностей - + Remove duplicated faces Удалить дублированные грани - + Remove duplicated points Удалить дублированные точки - + Fix self-intersections Исправление авто-пересечений - + Remove folds Удаление складок - + Repair mesh Ремонт сетки - + Delete selection Удалить выделение - - + + Cut Обрезать - - + + Trim Обрезка - + Split Разделить - + Segment Сегмент - + Delete Удалить - + Fill hole Заполнить отверстие @@ -838,7 +838,7 @@ - + Absolute number Абсолютный номер @@ -848,7 +848,7 @@ Допуск - + Absolute number (Maximum: %1) Абсолютный номер (Максимум: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Настройки... - - + + No selection Нет выбора - - - - - - - - - - - + + + + + + + + + + + No information Информация отсутствует - + Orientation Ориентация - + No flipped normals Нет перевернутых нормалей - + %1 flipped normals %1 перевернутых нормалей - + No non-manifolds Нет однообразий - + %1 non-manifolds %1 однообразий - - + + Non-manifolds Однообразная - + Cannot remove non-manifolds Не могу удалить однообразие - + Invalid face indices Индексы неверных граней - + Invalid point indices Индексы неверных точек - + Multiple point indices Индексы множественных точек - + Invalid neighbour indices Индексы неверных соседних элементов - + No invalid indices Нет ошибочных индексов - + Indices Индексы - + No degenerations Нет повреждений - + %1 degenerated faces %1 поврежденных граней - + Degenerations Повреждения - + No duplicated faces Нет повторяющихся граней - + %1 duplicated faces повторяющихся граней: %1 - + Duplicated faces Повторяющиеся грани - + No duplicated points Нет повторяющихся точек - - + + Duplicated points Повторяющиеся точки - + No self-intersections Нет самопересечений - + Self-intersections Самопересечения - + No folds on surface Нет складок на поверхности - + %1 folds on surface %1 складок на поверхности - + Folds Складки - - + + Mesh repair Восстановление полигональной сетки @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Создать %1 - + No active document Нет активного документа @@ -1366,7 +1366,7 @@ Высота: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Этот параметр указывает на использование ZIP сжатия во время записи в AMF формат @@ -1548,48 +1548,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Автоматически - + Adaptive Адаптивный - + Frontal Фронтальный - + Frontal Quad Передний квадрат - + Parallelograms Параллелограммы - - + + Time: Время: - + Running gmsh... Запуск gmsh... - + Failed to start Не удалось запустить - + Error Ошибка @@ -1597,22 +1597,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Добавить треугольник - + Flip normal Направить нормаль в противоположную сторону - + Clear Очистить - + Finish Завершить @@ -1620,7 +1620,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Завершить @@ -1628,47 +1628,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Соответствие поверхности - + Parameters Параметры - + Selection Выделение - + Region Область - + Triangle Треугольник - + Clear Очистить - + Compute Вычислить - + No selection - Нет выбора + Ничего не выбрано - + Before fitting the surface select an area. Перед градуированием поверхности выберите область. @@ -1907,7 +1907,7 @@ to a smoother appearance. Tolerance - Допуск + Точность @@ -1927,29 +1927,29 @@ to a smoother appearance. Сфера - - + + Base База - + Normal Обычный (либо Нормаль) - + Axis Ось - - + + Radius Радиус - + Center Центр @@ -1983,12 +1983,12 @@ to a smoother appearance. Предпочитать только треугольники повернутые нормалями к экрану - + Use a brush tool to select the area Использовать инструмент «кисть» для выбора области - + Clears completely the selected area Полностью очистить выделенную область @@ -1996,14 +1996,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Удалить - - + + Invert Инвертировать @@ -2011,38 +2011,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Количество точек: - + Number of facets: Количество граней: - + Minimum bound: Минимальная граница: - + Maximum bound: Максимальная граница: - + Mesh info box Окно информации о полигональной сетке - + Mesh info Информация о полигональной сетке - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2050,7 +2050,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Привязка %1: @@ -2058,26 +2058,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Произошла неизвестная ошибка при выполнении OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. Приложение OpenSCAD не обнаружено в системе. @@ -2087,7 +2087,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Оценить и восстановить полигональную сетку @@ -2095,241 +2095,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Отображение - + Import-Export Импорт/экспорт - + All Mesh Files Все файлы полигональных сеток - - + + Binary STL Двоичный STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Двоичная полигональная сетка - - + + Alias Mesh Псевдоним сетки - - + + Object File Format Формат файла Object - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files Все файлы - + Import mesh Импортировать полигональную сетку - + Simple Model Format Простой формат модели - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D (*. x3d - + Compressed X3D Сжатый X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Сжатый VRML 2.0 - + Nastran Nastran - + Python module def Python модуль - + Asymptote Format Формат Асимптоты - + 3D Manufacturing Format Формат 3D-производства - + Export mesh Экспортировать полигональную сетку - + Meshing Tolerance Возможное отклонение полигональной сетки - + Enter tolerance for meshing geometry: Введите возможное отклонение создаваемой полигональной сетки для геометрии: - + The mesh '%1' is not a solid. Полигональная сетка '%1' не является твердым телом. - + The mesh '%1' is a solid. Полигональная сетка '%1' является твердым телом. - + Solid Mesh Полигональная сетка объемного тела - + Boundings Ограничения - + Fill holes Заполнить отверстия - + Fill holes with maximum number of edges: Заполнить отверстия максимальным числом ребер: - + Scaling Масштабирование - + Enter scaling factor: Введите коэффициент масштабирования: - + [Points: %1, Edges: %2, Faces: %3] [Точек: %1, рёбер: %2, граней: %3] - + Display components Показать компоненты - + Display segments Отобразить сегменты - + Display colors Отображаемые цвета - - + + Leave info mode Выйти из информационного режима - + Index: %1 Индекс: %1 - + Leave hole-filling mode Выйти из режима заполнения отверстий - + Leave removal mode Выйти из режима удаления - + Delete selected faces Удалить выбранные грани - + Clear selected faces Снять выделение выбранных граней - + Annotation Заметка diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_sl.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_sl.ts index 3d6a826197..39685d0df7 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_sl.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_sl.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Dodaj trikotnik - - + + Add triangle manually to a mesh Ročno dodaj v ploskovje trikotnik @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh - Mesh + Ploskovje - + Boundings info... Podatki o mejah … - - + + Shows the boundings of the selected mesh Prikaže meje izbranega ploskovja @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Ploskovje - + Regular solid... Preprosto telo … - - + + Builds a regular solid Zgradi preprosto telo @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Ploskovje - + Cross-sections... Prečni prerezi … - - + + Cross-sections Prečni prerezi @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Ploskovje - + Decimation... Desetkanje ... - - - + + + Decimates a mesh Zdesetka ploskovje @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Ploskovje - + Difference Razlika @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Ploskovje - + Face info Podatki ploskve - - + + Information about face Podatki o ploskvi @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Ploskovje - + Check solid mesh Preveri ploskovje telesa - - + + Checks whether the mesh is a solid Preveri, ali je ploskovje telo @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Ploskovje - + Evaluate and repair mesh... Ovrednoti in popravi ploskovje... - - + + Opens a dialog to analyze and repair a mesh Odpre pogovorno okno za analizo in popravilo ploskovja @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Ploskovje - + Export mesh... Izvozi ploskovje … - - + + Exports a mesh to file Izvozi ploskovje v datoteko @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Ploskovje - + Close hole Zapri luknjo - - + + Close holes interactively Zapri luknjo sodejno @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Ploskovje - + Fill holes... Zapolni luknje … - - + + Fill holes of the mesh Zapolni luknje ploskovja @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Ploskovje - + Flip normals Obrni normale - - + + Flips the normals of the mesh Obrne normale ploskovja @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Ploskovje - + Create mesh from geometry... Ustvari ploskovje iz geometrije … - - + + Create mesh from the selected geometry Ustvari ploskovje iz izbrane geometrije @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Ploskovje - + Create mesh from shape... Ustvari ploskovje iz oblike … - + Tessellate shape Poplošči obliko @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Ploskovje - + Harmonize normals Uskladi normale - - + + Harmonizes the normals of the mesh Uskladi normale ploskovja @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Ploskovje - + Import mesh... Uvozi ploskovje … - - + + Imports a mesh from file Uvozi ploskovje iz datoteke @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Ploskovje - + Intersection Sečišče @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Ploskovje - + Merge Združi - + Merges selected meshes into one Združi izbrana ploskovja v eno @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Ploskovje - + Cut mesh Reži ploskovje - - + + Cuts a mesh with a picked polygon Reže ploskovje z izbranim mnogokotnikom @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Ploskovje - + Make segment Ustvari odsek - - + + Creates a mesh segment Ustvari mrežni odsek @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Ploskovje - + Split mesh Razcepi ploskovje - - + + Splits a mesh into two meshes Razcepi ploskovje v dve @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Ploskovje - + Trim mesh Prireži mrežo - - + + Trims a mesh with a picked polygon Prireže ploskovje z izbranim mnogokotnikom @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Ploskovje - + Refinement... Dodelava ... - - + + Refine existing mesh Dodelaj obstoječe ploskovje @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Ploskovje - + Remove components by hand... Ročno odstrani sestavine … - - + + Mark a component to remove it from the mesh Označite sestavino, ki jo želite odstraniti iz ploskovja @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Ploskovje - + Remove components... Odstrani sestavine … - - + + Remove topologic independent components from the mesh Odstrani zvezno neodvisne sestavine iz ploskovja @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Ploskovje - + Scale... Povečava... - + Scale selected meshes Spremeni velikost izbranega ploskovja @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Ploskovje - + Create section from mesh and plane Ustvari prerez iz ploskovja in ravnine - - + + Section from mesh and plane Prerez iz ploskovja in ravnine @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Ploskovje - + Create mesh segments... Ustvari odseke ploskovja … - - + + Create mesh segments Ustvari odseke ploskovja @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Ploskovje - + Create mesh segments from best-fit surfaces... Ustvari dele ploskovja iz najbolje prilegajočih se površij... - - + + Create mesh segments from best-fit surfaces Ustvari dele ploskovja iz najbolje prilegajočih se površij @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Ploskovje - + Smooth... Zgladi … - - + + Smooth the selected meshes Zgladi izbrana ploskovja @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Ploskovje - + Split by components Razcepi na sestavine - + Split selected mesh into its components Razcepi izbrano ploskovje na sestavine @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Ploskovje - + Trim mesh with a plane Prireži ploskovje z ravnino - - + + Trims a mesh with a plane Prireže ploskovje z ravnino @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Ploskovje - + Union Seštevek @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Ploskovje - + Curvature plot Izriši ukrivljenost - - + + Calculates the curvature of the vertices of a mesh Izračuna ukrivljenost temen ploskovja @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh - Ploskovje + Mesh - + Curvature info Podatki ukrivljenosti - - + + Information about curvature Podatki o ukrivljenosti @@ -672,144 +672,144 @@ Seštevek ploskovja - + Mesh difference Razlika ploskovja - + Mesh intersection Presek ploskovja - + Import Mesh Uvozi ploskovje - + Mesh VertexCurvature OgliščnaUkrivljenost ploskovja - + Mesh Smoothing Glajenje ploskovja - + Harmonize mesh normals Uskladi normale ploskovja - + Flip mesh normals Obrni normale ploskovja - + Fill up holes Zapolni luknje - + Mesh merge Združi ploskovje - + Mesh split Razcepi ploskovje - + Mesh scale Velikost ploskovja - + Mesh Decimating Desetkanje ploskovja - + Harmonize normals Uskladi normale - + Remove non-manifolds Odstrani nemnogoterosti - + Fix indices Popravi kazala - + Remove degenerated faces Odstrani izrojene ploskve - + Remove duplicated faces Odstrani podvojene ploskve - + Remove duplicated points Odstrani podvojene točke - + Fix self-intersections Popravi samosečnosti - + Remove folds Odstrani pregibe - + Repair mesh Popravi ploskovje - + Delete selection Izbriši izbor - - + + Cut Izreži - - + + Trim Prireži - + Split Razcepi - + Segment Odsek - + Delete Izbriši - + Fill hole Zapolni luknjo @@ -838,7 +838,7 @@ - + Absolute number Neodnosno število @@ -848,7 +848,7 @@ Dopustno odstopanje - + Absolute number (Maximum: %1) Neodnosno število (Največ: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Nastavitve... - - + + No selection Brez izbora - - - - - - - - - - - + + + + + + + + + + + No information Ni podatkov - + Orientation Usmerjenost - + No flipped normals Ni obrnjenih normal - + %1 flipped normals %1 obrnjenih normal - + No non-manifolds Ni nemnogoternosti - + %1 non-manifolds %1 nemnogoternosti - - + + Non-manifolds Nemnogoterosti - + Cannot remove non-manifolds Nemnogoternosti ni mogoče odstraniti - + Invalid face indices Neveljavna kazala ploskve - + Invalid point indices Neveljavna kazala točke - + Multiple point indices Večkratna kazala točke - + Invalid neighbour indices Neveljavna sosednja kazala - + No invalid indices Ni neveljavnih kazal - + Indices Kazala - + No degenerations Ni popačenj - + %1 degenerated faces %1 izrojenih ploskev - + Degenerations Popačenja - + No duplicated faces Ni podvojenih ploskev - + %1 duplicated faces %1 podvojenih ploskev - + Duplicated faces Podvojene ploskve - + No duplicated points Ni podvojenih točk - - + + Duplicated points Podvojene točke - + No self-intersections Ni samosečišč - + Self-intersections Samosečišča - + No folds on surface Ni pregibov na površju - + %1 folds on surface %1 pregibov na površju - + Folds Pregibi - - + + Mesh repair Popravilo ploskovja @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Ustvari %1 - + No active document Ni dejavnega dokumenta @@ -1366,7 +1366,7 @@ Višina: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Ta določilka nakazuje ali je pri zapisovanju datoteke @@ -1551,48 +1551,48 @@ s Phongovim senčenjem doseže gladkejši videz. MeshGui::GmshWidget - + Automatic Samodejno - + Adaptive Prilagodljivo - + Frontal Čelno - + Frontal Quad Čelni četverokotnik - + Parallelograms Paralelogrami - - + + Time: Čas: - + Running gmsh... Zaganjanje Gmsh-ja ... - + Failed to start Zagon spodletel - + Error Napaka @@ -1600,22 +1600,22 @@ s Phongovim senčenjem doseže gladkejši videz. MeshGui::MeshFaceAddition - + Add triangle Dodaj trikotnik - + Flip normal Obrni normalo - + Clear Počisti - + Finish Končaj @@ -1623,7 +1623,7 @@ s Phongovim senčenjem doseže gladkejši videz. MeshGui::MeshFillHole - + Finish Končaj @@ -1631,47 +1631,47 @@ s Phongovim senčenjem doseže gladkejši videz. MeshGui::ParametersDialog - + Surface fit Prileganje površja - + Parameters Določilke  - + Selection Izbor - + Region Območje - + Triangle Trikotnik - + Clear Počisti - + Compute Izračunaj - + No selection Brez izbora - + Before fitting the surface select an area. Pred prilagajanjem površja izberite območje. @@ -1891,7 +1891,7 @@ s Phongovim senčenjem doseže gladkejši videz. Mesh segmentation - Razčlenitev ploskovja  + Razčlenitev ploskovja @@ -1930,29 +1930,29 @@ s Phongovim senčenjem doseže gladkejši videz. Krogla - - + + Base Osnova - + Normal Normalno - + Axis Os - - + + Radius Polmer - + Center Središče @@ -1986,12 +1986,12 @@ s Phongovim senčenjem doseže gladkejši videz. Upoštevaj samo trikotnike, katerih normale kažejo proti zaslonu - + Use a brush tool to select the area Uporabite orodje čopiča za izbiro področja - + Clears completely the selected area Popolnoma počisti izbrano področje @@ -1999,14 +1999,14 @@ s Phongovim senčenjem doseže gladkejši videz. MeshGui::TaskRemoveComponents - - + + Delete Izbriši - - + + Invert Obrni @@ -2014,38 +2014,38 @@ s Phongovim senčenjem doseže gladkejši videz. MeshInfoWatcher - + Number of points: Število točk: - + Number of facets: Število ploskvic: - + Minimum bound: Najmanjša razsežnost: - + Maximum bound: Največja razsežnost: - + Mesh info box Podatkovno polje ploskovja - + Mesh info Podatki ploskovja - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ s Phongovim senčenjem doseže gladkejši videz. Mesh_BoundingBox - + Boundings of %1: Meje %1: @@ -2061,26 +2061,26 @@ s Phongovim senčenjem doseže gladkejši videz. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Med izvajanjem OpenSCADa je prišlo do neznane napake. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. V vašem sistemu ni mogoče najti OpenSCADa. @@ -2090,7 +2090,7 @@ Za namestitev obiščite http://www.openscad.org/index.html. QDockWidget - + Evaluate & Repair Mesh Ovrednoti in popravi ploskovje @@ -2098,241 +2098,241 @@ Za namestitev obiščite http://www.openscad.org/index.html. QObject - + Display Prikaz - + Import-Export Uvozi-Izvozi - + All Mesh Files Vse datoteke ploskovij - - + + Binary STL Dvojiški STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Dvojiško ploskovje - - + + Alias Mesh Vzdevek mreže - - + + Object File Format Zapis datoteke predmeta - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Mnogokotnik Stanford - + NASTRAN NASTRAN - - + + All Files Vse datoteke - + Import mesh Uvozi ploskovje - + Simple Model Format Oblika preprostega modela - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D razširljiv 3D - + Compressed X3D Stisnjen X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Stisnjen VRML 2.0 - + Nastran Nastran - + Python module def Določilo modula Python - + Asymptote Format Oblika približevalnice - + 3D Manufacturing Format Zapis za 3D izdelavo (3MF) - + Export mesh Izvozi ploskovje - + Meshing Tolerance Dopustna odstopanja ploskovjenja - + Enter tolerance for meshing geometry: Vnesite dopustno odstopanju pri ploskovjenju geometrije: - + The mesh '%1' is not a solid. Ploskovje '%1' ni telo. - + The mesh '%1' is a solid. Ploskovje '%1' je telo. - + Solid Mesh Telesno ploskovje - + Boundings Meje - + Fill holes Zapolni luknje - + Fill holes with maximum number of edges: Zapolni luknje z največjim številom robov: - + Scaling Skaliranje - + Enter scaling factor: Vnesite skalirni faktor: - + [Points: %1, Edges: %2, Faces: %3] [točk: %1, robov: %2, ploskev: %3] - + Display components Prikaži sestavine - + Display segments Prikaži odseke - + Display colors Barve prikaza - - + + Leave info mode Zapusti podatkovni način - + Index: %1 Kazalo: %1 - + Leave hole-filling mode Zapusti način zapolnjevanja lukenj - + Leave removal mode Zapusti odstranjevalni način - + Delete selected faces Izbriši izbrane ploskve - + Clear selected faces Počisti izbrane ploskve - + Annotation Opis @@ -2382,7 +2382,7 @@ Za namestitev obiščite http://www.openscad.org/index.html. Mesh segmentation - Razčlenitev ploskovja + Razčlenitev ploskovja  diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_sr-CS.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_sr-CS.ts index f0536595f9..734f6e1b13 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_sr-CS.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_sr-CS.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Dodaj trougao - - + + Add triangle manually to a mesh Dodaj ručno trougao u mrežu @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Informacije o granicama... - - + + Shows the boundings of the selected mesh Pokazuje granice odabrane mreže @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Pravilno puno telo... - - + + Builds a regular solid Pravi pravilno puno telo @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Poprečni presek... - - + + Cross-sections Poprečni presek @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Uprošćavanje... - - - + + + Decimates a mesh Uprošćava mrežu @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Razlika @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Informacije o stranici - - + + Information about face Informacije o stranici @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Proveri mrežu punog tela - - + + Checks whether the mesh is a solid Proverava da li je mreža puno telo @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Proceni i popravi mrežu... - - + + Opens a dialog to analyze and repair a mesh Otvara dijalog da analiziranje i popravku mreže @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Izvezi mrežu... - - + + Exports a mesh to file Izvozi mrežu u datoteku @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Zatvori rupu - - + + Close holes interactively Zatvori rupe interaktivno @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Popuni rupe... - - + + Fill holes of the mesh Popuni rupe mreže @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Preokreni normale - - + + Flips the normals of the mesh Preokreće normale mreže @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Napravi mrežu od geometrije... - - + + Create mesh from the selected geometry Napravi mrežu od izabrane geometrije @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Napravi mrežu od oblika... - + Tessellate shape Popločaj oblik @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Uskladi normale - - + + Harmonizes the normals of the mesh Usklađuje normale mreže @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Uvezi mrežu... - - + + Imports a mesh from file Uvozi mrežu iz datoteke @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Presek @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Objedini - + Merges selected meshes into one Objedini odabrane modele u jedan @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Iseci mrežu - - + + Cuts a mesh with a picked polygon Seče mrežu sa izabranim poligonom @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Napravi segment - - + + Creates a mesh segment Pravi segment mreže @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Podeli mrežu - - + + Splits a mesh into two meshes Deli mrežu na dve mreže @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Opseci mrežu - - + + Trims a mesh with a picked polygon Opseca mrežu sa odabranim mnogouglom @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Prečisti... - - + + Refine existing mesh Prečisti postojeću mrežu @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Ručno ukloni komponente... - - + + Mark a component to remove it from the mesh Označi komponentu radi uklanjanja iz mreže @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Ukloni komponente... - - + + Remove topologic independent components from the mesh Ukloni topološki nezavisne komponente iz mreže @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Razmera... - + Scale selected meshes Skaliraj odabrane mreže @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Napravi presek od mreže i ravni - - + + Section from mesh and plane Presek od mreže i ravni @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Napravi segmente mreže... - - + + Create mesh segments Napravi segmente mreže @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Napravi segmente mreže od stranica koje najbolje odgovaraju... - - + + Create mesh segments from best-fit surfaces Napravi segmente mreže od stranica koje najbolje odgovaraju @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Glatko... - - + + Smooth the selected meshes Zagladi izabrane mreže @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Podeli po komponentama - + Split selected mesh into its components Podeli izabranu mrežu na njene komponente @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Opseci mrežu pomoću ravni - - + + Trims a mesh with a plane Opseca mrežu pomoći ravni @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Unija @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Grafikon zakrivljenosti - - + + Calculates the curvature of the vertices of a mesh Izračunava zakrivljenost temena mreže @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Informacije o zakrivlljenosti - - + + Information about curvature Informacije o zakrivljenosti @@ -672,144 +672,144 @@ Unija mreža - + Mesh difference Razlika mreža - + Mesh intersection Presek mreža - + Import Mesh Uvezi mrežu - + Mesh VertexCurvature Zakrivljenost temena mreže - + Mesh Smoothing Glačanje mreže - + Harmonize mesh normals Uskladi normale - + Flip mesh normals Okreni normale - + Fill up holes Popuni rupe - + Mesh merge Objedini mreže - + Mesh split Podeli mrežu - + Mesh scale Skaliraj mrežu - + Mesh Decimating Uprosti mrežu - + Harmonize normals Uskladi normale - + Remove non-manifolds Ukloni loše-mnogostrukosti - + Fix indices Popravi indekse - + Remove degenerated faces Ukloni degenerisane stranice - + Remove duplicated faces Ukloni duplirane stranice - + Remove duplicated points Ukloni duplirane tačke - + Fix self-intersections Popravi samo-ukrštanja - + Remove folds Ukloni nabore - + Repair mesh Popravi mrežu - + Delete selection Obriši izabrano - - + + Cut Isecanje - - + + Trim Opseci - + Split Podeli - + Segment Segment - + Delete Obriši - + Fill hole Popuni rupu @@ -838,7 +838,7 @@ - + Absolute number Apsolutni broj @@ -848,7 +848,7 @@ Tolerancija - + Absolute number (Maximum: %1) Apsolutni broj (Maksimalno: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Podešavanja... - - + + No selection Ništa izabrano - - - - - - - - - - - + + + + + + + + + + + No information Nema informacija - + Orientation Orijentacija - + No flipped normals Nema preokrenutih normala - + %1 flipped normals %1 preokrenute normale - + No non-manifolds Nema loše-mnogostrukosti - + %1 non-manifolds %1 loša-mnogostrukost - - + + Non-manifolds Loša-mnogostrukost - + Cannot remove non-manifolds Ne mogu ukloniti loše-mnogostrukosti - + Invalid face indices Nevažeći indeksi površi - + Invalid point indices Nevažeći indeksi tačke - + Multiple point indices Višestruki indeksi tačaka - + Invalid neighbour indices Nevažeći susedni indeksi - + No invalid indices Nema nevažećih indeksa - + Indices Indeksi - + No degenerations Nema degeneracija - + %1 degenerated faces %1 degenerisane stranice - + Degenerations Degeneracije - + No duplicated faces Nema dupliranih stranica - + %1 duplicated faces %1 duplirane stranice - + Duplicated faces Duplirane stranice - + No duplicated points Nema dupliranih tačaka - - + + Duplicated points Duplirane tačke - + No self-intersections Nema samo-ukrštanja - + Self-intersections Samo-ukrštanje - + No folds on surface Nema nabora na površini - + %1 folds on surface %1 nabori na površini - + Folds Nabori - - + + Mesh repair Popravka mreže @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Napravi %1 - + No active document Nema aktivnog dokumenta @@ -1366,7 +1366,7 @@ Visina: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Ovaj parametar pokazuje da li se ZIP kompresija @@ -1551,48 +1551,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Automatski - + Adaptive Prilagodljiv - + Frontal Prednji - + Frontal Quad Prednji četvorougao - + Parallelograms Paralelogrami - - + + Time: Vreme: - + Running gmsh... Pokretanje gmsh... - + Failed to start Pokretanje nije uspelo - + Error Greška @@ -1600,22 +1600,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Dodaj trougao - + Flip normal Okreni normalu - + Clear Obriši - + Finish Završi @@ -1623,7 +1623,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Završi @@ -1631,47 +1631,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Surface fit - + Parameters Parametri - + Selection Izbor - + Region Region - + Triangle Trougao - + Clear Obriši - + Compute Izračunaj - + No selection Ništa izabrano - + Before fitting the surface select an area. Before fitting the surface select an area. @@ -1930,29 +1930,29 @@ to a smoother appearance. Lopta - - + + Base Baza - + Normal Obične - + Axis Osa - - + + Radius Poluprečnik - + Center Po sredini @@ -1986,12 +1986,12 @@ to a smoother appearance. Uvažite samo trouglove sa normalama okrenutim prema ekranu - + Use a brush tool to select the area Koristi kist alat da izaberete oblast - + Clears completely the selected area Potpuno briše izabranu oblast @@ -1999,14 +1999,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Obriši - - + + Invert Invertuj @@ -2014,38 +2014,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Broj tačaka: - + Number of facets: Broj faseta: - + Minimum bound: Minimalne granice: - + Maximum bound: Maksimalne granice: - + Mesh info box Mesh info box - + Mesh info Informacije o mreži - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Granice %1: @@ -2061,26 +2061,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Došlo je do nepoznate greške prilikom pokretanja OpenSCAD-a. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD nije moguće pronaći na tvom sistemu. @@ -2090,7 +2090,7 @@ Poseti http://www.openscad.org/index.html da instaliraš. QDockWidget - + Evaluate & Repair Mesh Proceni & Popravi Mrežu @@ -2098,241 +2098,241 @@ Poseti http://www.openscad.org/index.html da instaliraš. QObject - + Display Prikaz - + Import-Export Uvoz/Izvoz - + All Mesh Files Sve datoteke mreže - - + + Binary STL Binary STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binary Mesh - - + + Alias Mesh Alias Mesh - - + + Object File Format Object format datoteke - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files Sve datoteke - + Import mesh Uvezi mrežu - + Simple Model Format Simple Model Format - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Compressed X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Compressed VRML 2.0 - + Nastran Nastran - + Python module def Python modul - + Asymptote Format Asymptote Format - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh Izvezi mrežu - + Meshing Tolerance Tolerancija pravljenja mreže - + Enter tolerance for meshing geometry: Unesi toleranciju pravljenja mreže na osnovu geometrije: - + The mesh '%1' is not a solid. Mreža '%1' nije puno telo. - + The mesh '%1' is a solid. Mreža '%1' je puno telo. - + Solid Mesh Mreža punog tela - + Boundings Informacije o granicama - + Fill holes Popuni rupe - + Fill holes with maximum number of edges: Popuni rupe maksimalnim brojem ivica: - + Scaling Skaliranje - + Enter scaling factor: Unesi razmeru: - + [Points: %1, Edges: %2, Faces: %3] [Tačke: %1, Ivice: %2, Stranice: %3] - + Display components Prikaži komponente - + Display segments Prikaži segmente - + Display colors Prikaži boje - - + + Leave info mode Napusti info režim - + Index: %1 Indeks: %1 - + Leave hole-filling mode Napusti režim popunjavanja rupa - + Leave removal mode Napusti režim uklanjanja - + Delete selected faces Izbriši odabrane stranice - + Clear selected faces Očisti izabrane stranice - + Annotation Napomena diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_sr.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_sr.ts index dc612350a1..a96fa90e8f 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_sr.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_sr.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Додај троугао - - + + Add triangle manually to a mesh Додај ручно троугао у мрежу @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Информације о границама... - - + + Shows the boundings of the selected mesh Показује границе одабране мреже @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Правилно пуно тело... - - + + Builds a regular solid Прави правилно пуно тело @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Попречни пресек... - - + + Cross-sections Попречни пресек @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Упрошћавање... - - - + + + Decimates a mesh Упрошћава мрежу @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Разлика @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Информације о страници - - + + Information about face Информације о страници @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Провери мрежу пуног тела - - + + Checks whether the mesh is a solid Проверава да ли је мрежа пуно тело @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Процени и поправи мрежу... - - + + Opens a dialog to analyze and repair a mesh Отвара дијалог да анализирање и поправку мреже @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Извези мрежу... - - + + Exports a mesh to file Извози мрежу у датотеку @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Затвори рупу - - + + Close holes interactively Затвори рупе интерактивно @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Попуни рупе... - - + + Fill holes of the mesh Попуни рупе мреже @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Преокрени нормале - - + + Flips the normals of the mesh Преокреће нормале мреже @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Направи мрежу од геометрије... - - + + Create mesh from the selected geometry Направи мрежу од изабране геометрије @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Креирање мреже од облика ... - + Tessellate shape Поплочајте облик @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Усклади нормале - - + + Harmonizes the normals of the mesh Уcклађује нормале мреже @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Увези мрежу... - - + + Imports a mesh from file Увози мрежу из датотеке @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Пресек @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Обједини - + Merges selected meshes into one Обједини одабране моделе у један @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Исеци мрежу - - + + Cuts a mesh with a picked polygon Сече мрежу са изабраним полигоном @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Направи сегмент - - + + Creates a mesh segment Прави cсегмент мреже @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Подели мрежу - - + + Splits a mesh into two meshes Дели мражу на две мреже @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Опсеци мрежу - - + + Trims a mesh with a picked polygon Опсеца мрежу са одабраним многоуглом @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Пречисти... - - + + Refine existing mesh Пречисти постојећу мрежу @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Ручно уклони компоненте... - - + + Mark a component to remove it from the mesh Означи компоненту ради уклањања из мреже @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Уклони компоненте... - - + + Remove topologic independent components from the mesh Уклони тополошки независне компоненте из мреже @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Размера... - + Scale selected meshes Скалирај одабране мреже @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Направи пресек од мреже и равни - - + + Section from mesh and plane Пресек од мреже и равни @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Направи сегмент мреже... - - + + Create mesh segments Направи сегмент мреже @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Направи сегменте мреже од страница које најбоље одговарају... - - + + Create mesh segments from best-fit surfaces Направи сегменте мреже од страница које најбоље одговарају @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Глатко... - - + + Smooth the selected meshes Заглади изабране мреже @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Подели по компонентама - + Split selected mesh into its components Подели изабрану мрежу на њене компоненте @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Опсеци мрежу помоћу равни - - + + Trims a mesh with a plane Опсеца мрежу помоћи равни @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Унија @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Графикон закривљености - - + + Calculates the curvature of the vertices of a mesh Израчунава закривљеност темена мреже @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Информације о закривлљености - - + + Information about curvature Информације о закривљености @@ -672,144 +672,144 @@ Унија мрежа - + Mesh difference Разлика мрежа - + Mesh intersection Пресек мрежа - + Import Mesh Увези мрежу - + Mesh VertexCurvature Закривљеност темена мреже - + Mesh Smoothing Глачање мреже - + Harmonize mesh normals Усклади нормале - + Flip mesh normals Окрени нормале - + Fill up holes Попуни рупе - + Mesh merge Обједини мреже - + Mesh split Подели мрежу - + Mesh scale Скалирај мрежу - + Mesh Decimating Упрости мрежу - + Harmonize normals Усклади нормале - + Remove non-manifolds Уклони лоше-многострукости - + Fix indices Поправи индексе - + Remove degenerated faces Уклони дегенерисане странице - + Remove duplicated faces Уклони дуплиране странице - + Remove duplicated points Уклони дуплиране тачке - + Fix self-intersections Поправи само-укрштања - + Remove folds Уклони наборе - + Repair mesh Поправи мрежу - + Delete selection Обриши изабрано - - + + Cut Исецање - - + + Trim Опсеци - + Split Подели - + Segment Сегмент - + Delete Обриши - + Fill hole Попуни рупу @@ -838,7 +838,7 @@ - + Absolute number Апсолутни број @@ -848,7 +848,7 @@ Толеранција - + Absolute number (Maximum: %1) Апсолутни број (Максимално: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Подешавања... - - + + No selection Ништа изабрано - - - - - - - - - - - + + + + + + + + + + + No information Нема информација - + Orientation Оријентација - + No flipped normals Нема преокренутих нормала - + %1 flipped normals %1 преокренуте нормале - + No non-manifolds Нема лоше-многострукости - + %1 non-manifolds %1 лоша-многострукост - - + + Non-manifolds Лоша-многострукост - + Cannot remove non-manifolds Не могу уклонити лошу-многострукост - + Invalid face indices Неважећи индекси површи - + Invalid point indices Неважећи индекси тачке - + Multiple point indices Вишеструки индекси тачака - + Invalid neighbour indices Неважећи суседни индекси - + No invalid indices Нема неважећих индекса - + Indices Индекси - + No degenerations Нема дегенерација - + %1 degenerated faces %1 дегенерисане странице - + Degenerations Дегенерације - + No duplicated faces Нема дуплираних страница - + %1 duplicated faces %1 дуплиране странице - + Duplicated faces Дуплиране странице - + No duplicated points Нема дуплираних тачака - - + + Duplicated points Дуплиране тачке - + No self-intersections Нема само-укрштања - + Self-intersections Само-укрштање - + No folds on surface Нема набора на површини - + %1 folds on surface %1 набори на површини - + Folds Набори - - + + Mesh repair Поправка мреже @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Направи %1 - + No active document Нема активног документа @@ -1366,7 +1366,7 @@ Висина: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Овај параметар показује да ли се ZIP компресија @@ -1551,48 +1551,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Аутоматски - + Adaptive Прилагодљив - + Frontal Предњи - + Frontal Quad Предњи четвороугао - + Parallelograms Паралелограми - - + + Time: Време: - + Running gmsh... Покретање gmsh... - + Failed to start Покретање није успело - + Error Грешка @@ -1600,22 +1600,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Додај троугао - + Flip normal Окрени нормалу - + Clear Обриши - + Finish Заврши @@ -1623,7 +1623,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Заврши @@ -1631,47 +1631,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Surface fit - + Parameters Параметри - + Selection Избор - + Region Регион - + Triangle Троугао - + Clear Обриши - + Compute Израчунај - + No selection Ништа изабрано - + Before fitting the surface select an area. Before fitting the surface select an area. @@ -1930,29 +1930,29 @@ to a smoother appearance. Лопта - - + + Base База - + Normal Обичне - + Axis Оса - - + + Radius Полупречник - + Center По средини @@ -1986,12 +1986,12 @@ to a smoother appearance. Уважи само троуглове са нормалама окренутим према екрану - + Use a brush tool to select the area Користи кист алат да изаберете област - + Clears completely the selected area Потпуно брише изабрану област @@ -1999,14 +1999,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Обриши - - + + Invert Инвертуј @@ -2014,38 +2014,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Број тачака: - + Number of facets: Број фасета: - + Minimum bound: Минималне границе: - + Maximum bound: Максималне границе: - + Mesh info box Mesh info box - + Mesh info Информације о мрежи - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Границе %1: @@ -2061,26 +2061,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Дошло је до непознате грешке приликом покретања OpenSCAD-а. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD није могуће пронаћи на твом систему. @@ -2090,7 +2090,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Процени & Поправи Мрежу @@ -2098,241 +2098,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Приказ - + Import-Export Увоз/извоз - + All Mesh Files Све датотеке мреже - - + + Binary STL Binary STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binary Mesh - - + + Alias Mesh Alias Mesh - - + + Object File Format Object Формат датотеке - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files Све датотеке - + Import mesh Увези мрежу - + Simple Model Format Simple Model Format - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3Д Extensible 3Д - + Compressed X3D Compressed X3Д - + WebGL/X3D WebGL/X3Д - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Compressed VRML 2.0 - + Nastran Nastran - + Python module def Python модул - + Asymptote Format Asymptote Format - + 3D Manufacturing Format 3Д Manufacturing Format - + Export mesh Извези мрежу - + Meshing Tolerance Толеранција прављења мреже - + Enter tolerance for meshing geometry: Унеси толеранцију прављења мреже на основу геометрије: - + The mesh '%1' is not a solid. Мрежа '%1' није пуно тело. - + The mesh '%1' is a solid. Мрежа '%1' је пуно тело. - + Solid Mesh Мрежа пуног тела - + Boundings Информације о границама - + Fill holes Попуни рупе - + Fill holes with maximum number of edges: Попуни рупе максималним бројем ивица: - + Scaling Скалирање - + Enter scaling factor: Унеси размеру: - + [Points: %1, Edges: %2, Faces: %3] [Тачке: %1, Ивице: %2, Странице: %3] - + Display components Прикажи компоненте - + Display segments Прикажи сегменте - + Display colors Прикажи боје - - + + Leave info mode Напусти инфо режим - + Index: %1 Индекс: %1 - + Leave hole-filling mode Напусти режим попуњавања рупа - + Leave removal mode Напусти режим уклањања - + Delete selected faces Избриши изабране странице - + Clear selected faces Очисти изабране странице - + Annotation Напомена diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_sv-SE.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_sv-SE.ts index fd21878a14..90cfed02f7 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_sv-SE.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_sv-SE.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Nät - + Add triangle Addera triangel - - + + Add triangle manually to a mesh Addera triangel manuellt till ett nät @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Nät - + Boundings info... Begränsningsinfo... - - + + Shows the boundings of the selected mesh Visar begränsningarna på det valda nätet @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Nät - + Regular solid... Reguljär solid... - - + + Builds a regular solid Skapar en reguljär solid @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Nät - + Cross-sections... Tvärsnitt... - - + + Cross-sections Tvärsnitt @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Nät - + Decimation... Decimering... - - - + + + Decimates a mesh Decimerar ett nät @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Nät - + Difference Skillnad @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Nät - + Face info Ytinformation - - + + Information about face Information om yta @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Nät - + Check solid mesh Kontrolera solidnät - - + + Checks whether the mesh is a solid Kontrollerar om nätet är en solid @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Nät - + Evaluate and repair mesh... Utvärdera och reparera nät... - - + + Opens a dialog to analyze and repair a mesh Öppnar en dialog för att analysera och reparera ett nät @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Nät - + Export mesh... Exportera nät... - - + + Exports a mesh to file Exporterar ett nät till fil @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Nät - + Close hole Stäng hål - - + + Close holes interactively Stäng hål interaktivt @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Nät - + Fill holes... Fyll hål... - - + + Fill holes of the mesh Fyll nätets hål @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Nät - + Flip normals Invertera normaler - - + + Flips the normals of the mesh Invertera nätets normaler @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Nät - + Create mesh from geometry... Skapa nät från geometri... - - + + Create mesh from the selected geometry Skapa nät från den valda geometrin @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Nät - + Create mesh from shape... Skapa nät från form... - + Tessellate shape Tessellera form @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Nät - + Harmonize normals Anpassa normaler - - + + Harmonizes the normals of the mesh Anpassa nätets normaler @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Nät - + Import mesh... Importera nät... - - + + Imports a mesh from file Importerar ett nät från fil @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Nät - + Intersection Skärning @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Nät - + Merge Förena - + Merges selected meshes into one Förenar de markerade näten till ett nät @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Nät - + Cut mesh Klipp nät - - + + Cuts a mesh with a picked polygon Klipper ett nät med en vald polygon @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Nät - + Make segment Skapa segment - - + + Creates a mesh segment Skapar ett nätsegment @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Nät - + Split mesh Dela nät - - + + Splits a mesh into two meshes Delar ett nät till två nät @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Nät - + Trim mesh Trimma nät - - + + Trims a mesh with a picked polygon Trimmar ett nät med en vald polygon @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Nät - + Refinement... Raffinering... - - + + Refine existing mesh Förfina befintligt nät @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Nät - + Remove components by hand... Ta bort komponenter för hand... - - + + Mark a component to remove it from the mesh Markera en komponent för att ta bort den från nätet @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Nät - + Remove components... Ta bort komponenter... - - + + Remove topologic independent components from the mesh Ta bort topologiskt oberoende komponenter från nätet @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Nät - + Scale... Skala... - + Scale selected meshes Skala markerade nät @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Nät - + Create section from mesh and plane Skapa snitt från nät och plan - - + + Section from mesh and plane Snitt från nät och plan @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Nät - + Create mesh segments... Skapa nät segment... - - + + Create mesh segments Skapa nät segment @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Nät - + Create mesh segments from best-fit surfaces... Skapa nätsegment från bästa-passform-ytor... - - + + Create mesh segments from best-fit surfaces Skapa nätsegment från bästa-passform-ytor @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Nät - + Smooth... Jämna ut... - - + + Smooth the selected meshes Jämna ut de valda näten @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Nät - + Split by components Split by components - + Split selected mesh into its components Dela upp markerat nät i dess komponenter @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Nät - + Trim mesh with a plane Trimma nät med ett plan - - + + Trims a mesh with a plane Trimmar ett nät med ett plan @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Nät - + Union Förening @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Nät - + Curvature plot Krökningsplott - - + + Calculates the curvature of the vertices of a mesh Beräknar hörnens krökning på ett nät @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Nät - + Curvature info Krökningsinfo - - + + Information about curvature Information om krökning @@ -672,144 +672,144 @@ Förena nät - + Mesh difference Mesh difference - + Mesh intersection Mesh intersection - + Import Mesh Importera nät - + Mesh VertexCurvature Mesh VertexCurvature - + Mesh Smoothing Nätutjämning - + Harmonize mesh normals Harmonisera närnormaler - + Flip mesh normals Vänd nät normaler - + Fill up holes Fyll hål - + Mesh merge Slå samman nät - + Mesh split Dela nät - + Mesh scale Skala nät - + Mesh Decimating Mesh Decimating - + Harmonize normals Anpassa normaler - + Remove non-manifolds Remove non-manifolds - + Fix indices Fix indices - + Remove degenerated faces Ta bort degenererade ytor - + Remove duplicated faces Ta bort duplicerade ytor - + Remove duplicated points Ta bort duplicerade punkter - + Fix self-intersections Fix self-intersections - + Remove folds Ta bort vik - + Repair mesh Reparera nät - + Delete selection Ta bort val - - + + Cut Klipp - - + + Trim Trimma - + Split Dela - + Segment Segment - + Delete Radera - + Fill hole Fyll hål @@ -838,7 +838,7 @@ - + Absolute number Absolut tal @@ -848,7 +848,7 @@ Tolerans - + Absolute number (Maximum: %1) Absolute number (Maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Inställningar... - - + + No selection Inget val - - - - - - - - - - - + + + + + + + + + + + No information Ingen Information - + Orientation Orientering - + No flipped normals Inga inverterade normaler - + %1 flipped normals %1 inverterade normaler - + No non-manifolds Inga icke-mångfalder - + %1 non-manifolds %1 icke-mångfalder - - + + Non-manifolds Icke-mångfalder - + Cannot remove non-manifolds Kan inte ta bort icke-mångfalder - + Invalid face indices Ogiltiga ytindex - + Invalid point indices Ogiltiga punktindex - + Multiple point indices Multipla punktindex - + Invalid neighbour indices Ogiltiga grannindex - + No invalid indices Ingen ogiltig index - + Indices Index - + No degenerations Inga degenerationer - + %1 degenerated faces %1 degenererade ytor - + Degenerations Degenerationer - + No duplicated faces Inga duplicerade ytor - + %1 duplicated faces %1 duplicerade ytor - + Duplicated faces Duplicerade ytor - + No duplicated points Inga duplicerade punkter - - + + Duplicated points Duplicerade punkter - + No self-intersections Inga självskärningar - + Self-intersections Självskärningar - + No folds on surface Inga veck på ytan - + %1 folds on surface %1 veck på ytan - + Folds Veck - - + + Mesh repair Nätreparation @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Skapa %1 - + No active document Inget aktivt dokument @@ -1366,7 +1366,7 @@ Höjd: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Denna parameter anger om ZIP-kompression @@ -1551,48 +1551,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Automatisk - + Adaptive Anpassad - + Frontal Frontal - + Frontal Quad Frontal Quad - + Parallelograms Parallelogram - - + + Time: Tid: - + Running gmsh... Kör gmsh... - + Failed to start Det gick inte att starta - + Error Fel @@ -1600,22 +1600,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Addera triangel - + Flip normal Vänd normal - + Clear Rensa - + Finish Slutför @@ -1623,7 +1623,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Gör klart @@ -1631,47 +1631,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Ytpassning - + Parameters Parametrar - + Selection Markering - + Region Område - + Triangle Triangel - + Clear Rensa - + Compute Beräkna - + No selection Inget val - + Before fitting the surface select an area. Innan passning av ytan markera en area. @@ -1930,29 +1930,29 @@ to a smoother appearance. Sfär - - + + Base Bas - + Normal Normal - + Axis Axel - - + + Radius Radie - + Center Centrum @@ -1986,12 +1986,12 @@ to a smoother appearance. Respekt endast trianglar med normaler vända mot skärmen - + Use a brush tool to select the area Använd penselverktyget för att markera området - + Clears completely the selected area Rensar helt det markerade området @@ -1999,14 +1999,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Radera - - + + Invert Invertera @@ -2014,38 +2014,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Antal punkter: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Mesh info - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Begränsningar för %1: @@ -2061,26 +2061,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Ett okänt fel inträffade under körningen av OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD kunde inte hittas på datorn. @@ -2090,7 +2090,7 @@ Besök http://www.openscad.org/index.html för att installera det. QDockWidget - + Evaluate & Repair Mesh Utvärdera & reparera Nät @@ -2098,241 +2098,241 @@ Besök http://www.openscad.org/index.html för att installera det. QObject - + Display Fönster - + Import-Export Importera/Exportera - + All Mesh Files Alla Mesh-filer - - + + Binary STL Binär STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Binärt Mesh - - + + Alias Mesh Alias nät - - + + Object File Format Object Filformat - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford-polygon - + NASTRAN NASTRAN - - + + All Files Alla filer - + Import mesh Importera nät - + Simple Model Format Enkelt modellformat - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Komprimerad X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Komprimerad VRML 2.0 - + Nastran Nastran - + Python module def Python-modul def - + Asymptote Format Asymptote Format - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh Exportera nät - + Meshing Tolerance Nät tolerans - + Enter tolerance for meshing geometry: Mata in tolerans för nätning av geometri: - + The mesh '%1' is not a solid. Nätet '%1' är ingen solid. - + The mesh '%1' is a solid. Nätet '%1' är en solid. - + Solid Mesh Solid nät - + Boundings Gränser - + Fill holes Fyll hål - + Fill holes with maximum number of edges: Fyll hål med maximalt antal kanter: - + Scaling Skalning - + Enter scaling factor: Ange skalfaktor: - + [Points: %1, Edges: %2, Faces: %3] [Punkter: %1, Kanter: %2, Ytor: %3] - + Display components Visa komponenter - + Display segments Visa segment - + Display colors Visa färger - - + + Leave info mode Lämna info läge - + Index: %1 Index: %1 - + Leave hole-filling mode Lämna hålfyllningsläge - + Leave removal mode Lämna borttagningsläge - + Delete selected faces Ta bort markerade ytor - + Clear selected faces Rensa valda ytor - + Annotation Annotering diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_tr.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_tr.ts index 0d4900ecd4..c92d2bd1dd 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_tr.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_tr.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Üçgen Ekle - - + + Add triangle manually to a mesh Bir kafese elle Üçgen Ekle Bir kafese manuel üçgen ekle @@ -24,19 +24,19 @@ Bir kafese manuel üçgen ekle CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Sınır bilgileri.. Sınırlamala Bilgisi... - - + + Shows the boundings of the selected mesh Seçilen kafesin sınırlarını gösterir @@ -44,18 +44,18 @@ Sınırlamala Bilgisi... CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Düzenli katı... - - + + Builds a regular solid Düzenli bir katı oluştur @@ -63,18 +63,18 @@ Sınırlamala Bilgisi... CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Kesitler... - - + + Cross-sections Kesit @@ -82,19 +82,19 @@ Sınırlamala Bilgisi... CmdMeshDecimating - + Mesh Mesh - + Decimation... Seyreltme... - - - + + + Decimates a mesh Bir ağı seyreltir @@ -102,12 +102,12 @@ Sınırlamala Bilgisi... CmdMeshDifference - + Mesh Mesh - + Difference Fark @@ -115,18 +115,18 @@ Sınırlamala Bilgisi... CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Yüz bilgisi - - + + Information about face Yüz hakkında bilgi @@ -134,18 +134,18 @@ Sınırlamala Bilgisi... CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Katı kafesi kontrol edin - - + + Checks whether the mesh is a solid Örgünün katı olup olmadığını kontrol eder @@ -153,18 +153,18 @@ Sınırlamala Bilgisi... CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Değerlendir ve kafesi onar... - - + + Opens a dialog to analyze and repair a mesh Çözümlemek ve bir kafes onarmak için bir iletişim kutusu açar @@ -172,18 +172,18 @@ Sınırlamala Bilgisi... CmdMeshExport - + Mesh Mesh - + Export mesh... Kafesi Dışa Aktar... - - + + Exports a mesh to file Bir Kafes yapıyı, dosyaya (dışa) aktarır @@ -191,18 +191,18 @@ Sınırlamala Bilgisi... CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Deliği kapat - - + + Close holes interactively Etkileşimli olarak delikleri doldur @@ -210,18 +210,18 @@ Sınırlamala Bilgisi... CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Delikleri doldur... - - + + Fill holes of the mesh Ağdaki delikleri doldur @@ -229,18 +229,18 @@ Sınırlamala Bilgisi... CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Normale Çevir - - + + Flips the normals of the mesh Kafes Olarak Normale Çevir @@ -248,18 +248,18 @@ Sınırlamala Bilgisi... CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Geometriden Kafes Oluştur... - - + + Create mesh from the selected geometry Seçilen geometriden kafes oluştur @@ -267,17 +267,17 @@ Sınırlamala Bilgisi... CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Şekilden metal örgü oluştur... - + Tessellate shape Mozaik şekil döşe @@ -285,18 +285,18 @@ Sınırlamala Bilgisi... CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Normları uyumlu hale getirin - - + + Harmonizes the normals of the mesh Kafes Normlarına uyumlu hale getirin @@ -304,18 +304,18 @@ Sınırlamala Bilgisi... CmdMeshImport - + Mesh Mesh - + Import mesh... Kafesi içeri aktar... - - + + Imports a mesh from file Dosyadan bir kafes içeri aktarır @@ -323,12 +323,12 @@ Sınırlamala Bilgisi... CmdMeshIntersection - + Mesh Mesh - + Intersection Kesişim @@ -336,17 +336,17 @@ Sınırlamala Bilgisi... CmdMeshMerge - + Mesh Mesh - + Merge Birleştir - + Merges selected meshes into one Seçilen eklemeleri bir kafeste topla @@ -354,18 +354,18 @@ Sınırlamala Bilgisi... CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Kafesi kes - - + + Cuts a mesh with a picked polygon Kafesi seçilen bir çokgen ile kes @@ -373,18 +373,18 @@ Sınırlamala Bilgisi... CmdMeshPolySegm - + Mesh Mesh - + Make segment Parça oluştur - - + + Creates a mesh segment Kafes parçası oluştur @@ -392,18 +392,18 @@ Sınırlamala Bilgisi... CmdMeshPolySplit - + Mesh Mesh - + Split mesh Kafesi ayır - - + + Splits a mesh into two meshes Kafesi ikiye ayır @@ -411,18 +411,18 @@ Sınırlamala Bilgisi... CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Kafesi kırp - - + + Trims a mesh with a picked polygon Alınan çokgenli bir örgü parçala @@ -430,18 +430,18 @@ Sınırlamala Bilgisi... CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... İnceltme... - - + + Refine existing mesh Mevcut ağ yapısını incelt @@ -449,18 +449,18 @@ Sınırlamala Bilgisi... CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Parçaları elle çıkarın... - - + + Mark a component to remove it from the mesh Örgü parçasını çıkarmak için bir bileşene işaretlemm @@ -468,18 +468,18 @@ Sınırlamala Bilgisi... CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Bileşeni kaldır... - - + + Remove topologic independent components from the mesh Kafesten bağımsız bileşenleri çıkarın @@ -487,17 +487,17 @@ Sınırlamala Bilgisi... CmdMeshScale - + Mesh Mesh - + Scale... Ölçeklendir... - + Scale selected meshes Seçilen kafesleri ölçeklendir @@ -505,18 +505,18 @@ Sınırlamala Bilgisi... CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Örgü ve düzlemden kesit oluştur - - + + Section from mesh and plane Örgü ve düzlemden kesit @@ -524,18 +524,18 @@ Sınırlamala Bilgisi... CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Kafes bölümleri oluştur... - - + + Create mesh segments Kafes bölümleri oluştur @@ -543,18 +543,18 @@ Sınırlamala Bilgisi... CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... En uygun yüzeylerden kafes kesimleri oluşturun... - - + + Create mesh segments from best-fit surfaces En uygun yüzeylerden kafes kesimleri oluşturun @@ -562,18 +562,18 @@ Sınırlamala Bilgisi... CmdMeshSmoothing - + Mesh Mesh - + Smooth... Pürüzsüz... - - + + Smooth the selected meshes Seçili örgüler pürüzsüz @@ -581,17 +581,17 @@ Sınırlamala Bilgisi... CmdMeshSplitComponents - + Mesh Mesh - + Split by components Bileşenlere göre ayır - + Split selected mesh into its components Seçilen mesh'i bileşenlerine ayır @@ -599,18 +599,18 @@ Sınırlamala Bilgisi... CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Bir düzlem ile örgü bölme - - + + Trims a mesh with a plane Bir düzlemle örgü kesme @@ -618,12 +618,12 @@ Sınırlamala Bilgisi... CmdMeshUnion - + Mesh Mesh - + Union Birleştir @@ -631,18 +631,18 @@ Sınırlamala Bilgisi... CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Eğrilik grafiği - - + + Calculates the curvature of the vertices of a mesh Örgü köşelerinin eğriliğini hesaplar @@ -650,18 +650,18 @@ Sınırlamala Bilgisi... CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Eğrilik bilgisi - - + + Information about curvature Eğrilik hakkında bilgi @@ -674,144 +674,144 @@ Sınırlamala Bilgisi... Mesh birleşimi - + Mesh difference Mesh farkı - + Mesh intersection Mesh kesişimi - + Import Mesh Mesh içe aktar - + Mesh VertexCurvature Mesh NoktaEğriliği - + Mesh Smoothing Mesh Yumuşat - + Harmonize mesh normals Mesh normallerini uyumlu hale getirin - + Flip mesh normals Mesh normallerini ters çevir - + Fill up holes Delikleri doldurun - + Mesh merge Mesh birleşimi - + Mesh split Mesh ayrımı - + Mesh scale Mesh ölçekle - + Mesh Decimating Mesh Yok Et - + Harmonize normals Normları uyumlu hale getirin - + Remove non-manifolds Manifold olmayanları kaldır - + Fix indices Endeksleri düzeltin - + Remove degenerated faces Bozulmuş yüzeyleri kaldırın - + Remove duplicated faces Yinelenen yüzeyleri kaldır - + Remove duplicated points Yinelenen noktaları kaldır - + Fix self-intersections Kendiliğinden kesişmeleri düzelt - + Remove folds Kıvrımları kaldır - + Repair mesh Mesh onarımı - + Delete selection Seçimi sil - - + + Cut Kes - - + + Trim Kırp - + Split Ayır - + Segment Bölüm - + Delete Sil - + Fill hole Deliği doldur @@ -840,7 +840,7 @@ Sınırlamala Bilgisi... - + Absolute number Tam sayı @@ -850,7 +850,7 @@ Sınırlamala Bilgisi... Tolerans - + Absolute number (Maximum: %1) Tam sayı (En fazla:: %1) @@ -982,166 +982,166 @@ Sınırlamala Bilgisi... MeshGui::DlgEvaluateMeshImp - + Settings... Ayarlar... - - + + No selection Seçim yok - - - - - - - - - - - + + + + + + + + + + + No information Bilgi yok - + Orientation Yönlendirme - + No flipped normals Çarpıtılmış standartlar yok - + %1 flipped normals %1 normaller ters çevrildi - + No non-manifolds Manifoldlar yok - + %1 non-manifolds %1 manifoldlar yok - - + + Non-manifolds Çoğaltılamayan Manifoldlar - + Cannot remove non-manifolds Kaldırılamayan Manifoldlar - + Invalid face indices Geçersiz yüz endeksleri - + Invalid point indices Geçersiz nokta endeksleri - + Multiple point indices Çoklu nokta endeksleri - + Invalid neighbour indices Geçersiz komşu dizinleri - + No invalid indices Geçersiz dizin yok - + Indices Endeksler - + No degenerations Dejenerasyon yok - + %1 degenerated faces %1 bozulmuş yüzeyler - + Degenerations Dejenerasyonlar - + No duplicated faces Yinelenen yüz yok - + %1 duplicated faces %1 Çoğaltılan Yüzeyler - + Duplicated faces Yinelenen yüzler - + No duplicated points Yinelenen nokta yok - - + + Duplicated points Yinelenen Noktalar - + No self-intersections Kendiliğinden kesişme yok - + Self-intersections Kendine Doğru kesişim noktaları - + No folds on surface Yüzeyde kıvrım yok - + %1 folds on surface Yüzeyde %1 kıvrım var - + Folds Kıvrımlar - - + + Mesh repair Ağı onar @@ -1293,14 +1293,14 @@ Sınırlamala Bilgisi... MeshGui::DlgRegularSolidImp - - - + + + Create %1 %1 Oluşturmak - + No active document Etkin belge yok @@ -1368,7 +1368,7 @@ Sınırlamala Bilgisi... Yükseklik: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Bu parametre, AMF formatında bir dosya yazarken ZIP sıkıştırmasının kullanılıp kullanılmayacağını gösterir @@ -1547,48 +1547,48 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılır MeshGui::GmshWidget - + Automatic Otomatik - + Adaptive Uyarlanan - + Frontal Cephe - + Frontal Quad Ön Dörtlü - + Parallelograms Paralelkenarlar - - + + Time: Zaman: - + Running gmsh... Gmsh çalışıyor... - + Failed to start Başlatma başarısız - + Error Hata @@ -1596,22 +1596,22 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılır MeshGui::MeshFaceAddition - + Add triangle Üçgen Ekle - + Flip normal Normal çevir - + Clear Temizle - + Finish Bitir @@ -1619,7 +1619,7 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılır MeshGui::MeshFillHole - + Finish Bitir @@ -1627,47 +1627,47 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılır MeshGui::ParametersDialog - + Surface fit Uygun yüzey - + Parameters Parametreler - + Selection seçim - + Region Bölge - + Triangle Üçgen - + Clear Temizle - + Compute Hesapla - + No selection Seçim yok - + Before fitting the surface select an area. Yüzeye uydurmadan önce bir alan seçin. @@ -1926,29 +1926,29 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılırKüre - - + + Base Baz - + Normal Olağan - + Axis Eksen - - + + Radius Yarıçap - + Center Ortala @@ -1982,12 +1982,12 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılırEkrana bakan normallere sahip yalnızca üçgenlere saygı gösterin - + Use a brush tool to select the area Alanı seçmek için fırça aracını kullanın - + Clears completely the selected area Seçilen alanı tamamen temizler @@ -1995,14 +1995,14 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılır MeshGui::TaskRemoveComponents - - + + Delete Sil - - + + Invert Evir @@ -2010,38 +2010,38 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılır MeshInfoWatcher - + Number of points: Noktaların sayısı: - + Number of facets: Yön sayısı: - + Minimum bound: En küçük sınır: - + Maximum bound: En büyük sınır: - + Mesh info box Mesh bilgi kutusu - + Mesh info Mesh bilgisi - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2049,7 +2049,7 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılır Mesh_BoundingBox - + Boundings of %1: %1'in limiti: @@ -2057,26 +2057,26 @@ Yüz açısı < kıvrım açısı ise, pürüzsüz gölgeleme kullanılır Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. OpenSCAD çalıştırılırken bilinmeyen hata oluştu. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD sisteminizde bulunamadı. @@ -2086,7 +2086,7 @@ Yüklemek için lütfen http://www.openscad.org/index.html adresini ziyaret edin QDockWidget - + Evaluate & Repair Mesh Ağı Değerlendir ve Onar @@ -2094,241 +2094,241 @@ Yüklemek için lütfen http://www.openscad.org/index.html adresini ziyaret edin QObject - + Display Ekran - + Import-Export İçe-Dışa Aktar - + All Mesh Files Tüm Örgü Dosyaları - - + + Binary STL İkili STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh İkili Örgü - - + + Alias Mesh Alias Örgü - - + + Object File Format Nesne Dosyası Biçimi - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Poligonu - + NASTRAN NASTRAN - - + + All Files Tüm Dosyalar - + Import mesh Kafesi içe aktar - + Simple Model Format Basit Model biçimi - + Inventor V2.1 ascii Ascii V2.1 mucidi - + X3D Extensible 3D X3D Genişletilebilir 3D - + Compressed X3D Sıkıştırılmış X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Sıkıştırılmış VRML 2.0 - + Nastran Nastran - + Python module def Python def modülü - + Asymptote Format Asimptot Biçimi - + 3D Manufacturing Format 3D Üretim Formatı - + Export mesh Kafesi Dışa Aktar - + Meshing Tolerance Örgü Toleransı - + Enter tolerance for meshing geometry: Örgü geometrisi için toleransı girin: - + The mesh '%1' is not a solid. Örgü '%1' sağlam değil. - + The mesh '%1' is a solid. Örüü '%1' sağlam bir yapıdadır. - + Solid Mesh Katı örgü - + Boundings Sınırlayıcılar - + Fill holes Doldurma delikleri - + Fill holes with maximum number of edges: Delikleri maksimum sayıda kenarla doldurun: - + Scaling Ölçekleme - + Enter scaling factor: Ölçeklendirme faktörünü girin: - + [Points: %1, Edges: %2, Faces: %3] [Noktalar: %1, Kenarlar: %2, Yüzler: %3] - + Display components Ekran bileşenleri - + Display segments Parçaları görüntüle - + Display colors Ekran renkleri - - + + Leave info mode Bilgi modundan çık - + Index: %1 Dizin: %1 - + Leave hole-filling mode Delik dolumu modundan çık - + Leave removal mode Yaprak kaldırma modu - + Delete selected faces Seçilen yüzleri sil - + Clear selected faces Seçili yüzleri temizle - + Annotation Not diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_uk.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_uk.ts index b42347e297..43ec285848 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_uk.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_uk.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Сітка(Меш) - + Add triangle Додати трикутник - - + + Add triangle manually to a mesh Вручну додати трикутник до сітки @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Сітка(Меш) - + Boundings info... Інформація про обмеження... - - + + Shows the boundings of the selected mesh Показує структуру вибраної мережі @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Сітка(Меш) - + Regular solid... Правильне суцільне тіло... - - + + Builds a regular solid Створює правильне суцільне тіло @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Сітка(Меш) - + Cross-sections... Поперечні перерізи... - - + + Cross-sections Створює поперечні перерізи @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Сітка(Меш) - + Decimation... Децимація... - - - + + + Decimates a mesh Проріджує сітку @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Сітка(Меш) - + Difference Різниця @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Сітка(Меш) - + Face info Інформація про грань - - + + Information about face Інформація про грань @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Сітка(Меш) - + Check solid mesh Перевірити суцільність сітки - - + + Checks whether the mesh is a solid Перевірити чи сітка суцільна @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Сітка(Меш) - + Evaluate and repair mesh... Оцінити і відновити полигональную сітку... - - + + Opens a dialog to analyze and repair a mesh Відкриває діалог для аналізу та ремонту сітки @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Сітка(Меш) - + Export mesh... Експорт сітки... - - + + Exports a mesh to file Експорт сітки до файлу @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Сітка(Меш) - + Close hole Закрити отвір - - + + Close holes interactively Закрити отвори в діалоговому режимі @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Сітка(Меш) - + Fill holes... Заповнити отвори... - - + + Fill holes of the mesh Заповнити отвори сітки @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Сітка(Меш) - + Flip normals Змінити напрямок нормалей на протилежний - - + + Flips the normals of the mesh Змінити напрямок нормалей сітки на протилежний @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Сітка(Меш) - + Create mesh from geometry... Створити сітку з геометрії ... - - + + Create mesh from the selected geometry Створити сітку з обраної геометрії @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Сітка(Меш) - + Create mesh from shape... Створення сітки з форми ... - + Tessellate shape Теселяція форми @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Сітка(Меш) - + Harmonize normals Узгодити нормалі - - + + Harmonizes the normals of the mesh Узгодити нормалі сітки @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Сітка(Меш) - + Import mesh... Імпорт сітки... - - + + Imports a mesh from file Імпорт сітки з файлу @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Сітка(Меш) - + Intersection Перетин @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Сітка(Меш) - + Merge Об'єднання - + Merges selected meshes into one Об'єднати вибрані полігональні сітки в одну @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Сітка(Меш) - + Cut mesh Вирізати сітку - - + + Cuts a mesh with a picked polygon Вирізати сітку з обраного багатокутника @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Сітка(Меш) - + Make segment Зробити сегмент - - + + Creates a mesh segment Створити сегмент сітки @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Сітка(Меш) - + Split mesh Розбити сітку - - + + Splits a mesh into two meshes Розділити сітку на дві сітки @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Сітка(Меш) - + Trim mesh Обрізати сітку - - + + Trims a mesh with a picked polygon Обрізати сітку обраним багатокутником @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Сітка(Меш) - + Refinement... Refinement... - - + + Refine existing mesh Refine existing mesh @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Сітка(Меш) - + Remove components by hand... Видалити компоненти вручну... - - + + Mark a component to remove it from the mesh Позначити компонент для видалення його із сітки @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Сітка(Меш) - + Remove components... Видалити компоненти... - - + + Remove topologic independent components from the mesh Видалити топологічно-незалежні компоненти з сітки @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Сітка(Меш) - + Scale... Масштаб... - + Scale selected meshes Масштабування вибраних полігональних сіток @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Сітка(Меш) - + Create section from mesh and plane Створити секцію з полігональної сітки і площини - - + + Section from mesh and plane Секція з полігональної сітки і площини @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Сітка(Меш) - + Create mesh segments... Створити сегменти сітки... - - + + Create mesh segments Створити сегменти сітки @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Сітка(Меш) - + Create mesh segments from best-fit surfaces... Створити сегменти полігональної сітка з найкращої відповідності поверхонь... - - + + Create mesh segments from best-fit surfaces Створити сегменти полігональної сітка з найкращої відповідності поверхонь @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Сітка(Меш) - + Smooth... Згладжувати... - - + + Smooth the selected meshes Згладжувати вибрані сітки @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Сітка(Меш) - + Split by components Розділити на компоненти - + Split selected mesh into its components Розділяє обрану сітку на компоненти @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Сітка(Меш) - + Trim mesh with a plane Обрізати сітки площиною - - + + Trims a mesh with a plane Обрізати сітку площиною @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Сітка(Меш) - + Union Об'єднання @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Сітка(Меш) - + Curvature plot Ділянка викривлення - - + + Calculates the curvature of the vertices of a mesh Розрахунок викривлення для вершин сітка @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Сітка(Меш) - + Curvature info Інформація викривлення - - + + Information about curvature Інформація про викривлення @@ -672,144 +672,144 @@ Об'єднання сіток - + Mesh difference Різниця сіток - + Mesh intersection Перетин сіток - + Import Mesh Імпортувати сітку - + Mesh VertexCurvature Mesh VertexCurvature - + Mesh Smoothing Згладжування сітки - + Harmonize mesh normals Гармонізувати нормалі сітки - + Flip mesh normals Віддзеркалити нормалі сітки - + Fill up holes Заповнити отвори - + Mesh merge Об'єднати сітку - + Mesh split Розділити сітку - + Mesh scale Масштабувати сітку - + Mesh Decimating Децимація сітки - + Harmonize normals Узгодити нормалі - + Remove non-manifolds Вилучити одноманітності - + Fix indices Виправити індекси - + Remove degenerated faces Вилучити пошкоджені поверхні - + Remove duplicated faces Вилучити дубльовані поверхні - + Remove duplicated points Вилучити дубльовані точки - + Fix self-intersections Виправити самоперетини - + Remove folds Вилучити складки - + Repair mesh Ремонт сітки - + Delete selection Видалити обране - - + + Cut Вирізати - - + + Trim Обрізати - + Split Розділити - + Segment Відрізок - + Delete Видалити - + Fill hole Заповнити отвір @@ -838,7 +838,7 @@ - + Absolute number Абсолютне число @@ -848,7 +848,7 @@ Точність - + Absolute number (Maximum: %1) Абсолютне число (максимум: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Налаштування... - - + + No selection Нічого не вибрано - - - - - - - - - - - + + + + + + + + + + + No information Інформація відсутня - + Orientation Орієнтація - + No flipped normals Перевернутих нормалей немає - + %1 flipped normals %1 перевернути нормалі - + No non-manifolds Відсутня одноманітність - + %1 non-manifolds %1 одноманітний - - + + Non-manifolds Небагатовидний - + Cannot remove non-manifolds Неможливо видалити одноманітності - + Invalid face indices Хибний індекс переднього плану - + Invalid point indices Хибний індекс точки - + Multiple point indices Індекси множинних точок - + Invalid neighbour indices Хибні сусідні індекси - + No invalid indices Невірні індекси відсутні - + Indices Індекси - + No degenerations Погіршені грані відсутні - + %1 degenerated faces %1 погіршених граней - + Degenerations Погіршення - + No duplicated faces Дубльовані грані відсутні - + %1 duplicated faces %1 дубльованих граней - + Duplicated faces Дубльовані грані - + No duplicated points Дубльовані точки відсутні - - + + Duplicated points Дубльовані точки - + No self-intersections Самоперетин відсутній - + Self-intersections Самоперетинання - + No folds on surface Згинів на поверхні немає - + %1 folds on surface %1 згинів на поверхні - + Folds Складки - - + + Mesh repair Ремонт сітки @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Створити %1 - + No active document Немає активного документу @@ -1366,7 +1366,7 @@ Висота: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Цей параметр вказує чи використовується ZIP стиснення @@ -1550,48 +1550,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic Автоматичний - + Adaptive Адаптивний - + Frontal Frontal - + Frontal Quad Frontal Quad - + Parallelograms Паралелограми - - + + Time: Час: - + Running gmsh... Running gmsh... - + Failed to start Не вдалося почати - + Error Помилка @@ -1599,22 +1599,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle Додати трикутник - + Flip normal Відображення по нормалі - + Clear Очистити - + Finish Завершити @@ -1622,7 +1622,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish Завершити @@ -1630,47 +1630,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Відповідність поверхні - + Parameters Параметри - + Selection Виділення - + Region Область - + Triangle Трикутник - + Clear Очистити - + Compute Обчислити - + No selection Нічого не вибрано - + Before fitting the surface select an area. Перед градуюванням поверхні виберіть область. @@ -1929,29 +1929,29 @@ to a smoother appearance. Сфера - - + + Base Основа - + Normal Звичайна - + Axis Вісь - - + + Radius Радіус - + Center Центр @@ -1985,12 +1985,12 @@ to a smoother appearance. Поважати лише трикутники з нормалями на передньому плані - + Use a brush tool to select the area Для виділення області використовуйте інструмент "Пензель" - + Clears completely the selected area Повністю очищає виділену область @@ -1998,14 +1998,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete Видалити - - + + Invert Інвертувати @@ -2013,38 +2013,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: Кількість точок: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Інформація про сітку - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2052,7 +2052,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Прив'язка %1: @@ -2060,26 +2060,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Виникла невідома помилка при виконанні OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. OpenSCAD не знайдений на вашій системі. Будь ласка, відвідайте http://www.openscad.org/index.html щоб встановити цю програму. @@ -2088,7 +2088,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Оцінити та відновити сітку @@ -2096,241 +2096,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Показ - + Import-Export Імпорт-експорт - + All Mesh Files Всі файли полігональних сіток - - + + Binary STL Двійковий STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh Двійкова полигональная сітка - - + + Alias Mesh Ім'я користувача сітки - - + + Object File Format Формат файлу Object - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files Всі файли - + Import mesh Імпорт сітки - + Simple Model Format Простий формат моделі - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Стиснутий X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 Стиснутий VRML 2.0 - + Nastran Nastran - + Python module def Python модуль - + Asymptote Format Asymptote Format - + 3D Manufacturing Format Формат виробництва в 3D - + Export mesh Експорт сітки - + Meshing Tolerance Відхилення сітки - + Enter tolerance for meshing geometry: Введіть відхилення для геометрії сітки: - + The mesh '%1' is not a solid. Сітка '%1' не суцільна. - + The mesh '%1' is a solid. Сітка '%1' є суцільною. - + Solid Mesh Суцільна сітка - + Boundings Прив'язки - + Fill holes Заповнити отвори - + Fill holes with maximum number of edges: Заповнити отвори з максимальною кількістю ребер: - + Scaling Масштабування - + Enter scaling factor: Введіть коефіцієнт масштабування: - + [Points: %1, Edges: %2, Faces: %3] [Точок: %1, Ребер: %2, Граней: %3] - + Display components Відобразити компоненти - + Display segments Показати відрізки - + Display colors Display colors - - + + Leave info mode Вийти з інформаційного режиму - + Index: %1 Індекс: %1 - + Leave hole-filling mode Вийти з режиму заповнення отворів - + Leave removal mode Вийти з режиму видалення - + Delete selected faces Знищити обрані грані - + Clear selected faces Очистити обрані грані - + Annotation Анотація diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_val-ES.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_val-ES.ts index cb9256b114..83bd5b2896 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_val-ES.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_val-ES.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle Afig un triangle - - + + Add triangle manually to a mesh Afig un triangle manualment a malla @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... Informació de límits... - - + + Shows the boundings of the selected mesh Mostra els límits de la malla seleccionada @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... Sòlid regular... - - + + Builds a regular solid Construeix un sòlid regular @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... Seccions... - - + + Cross-sections Seccions @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... Decimation... - - - + + + Decimates a mesh Decimates a mesh @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference Diferència @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info Informació de la cara - - + + Information about face Informació sobre la cara @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh Comprova el sòlid malla - - + + Checks whether the mesh is a solid Comprova si la malla és un sòlid @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... Avalua i repara la malla... - - + + Opens a dialog to analyze and repair a mesh Obri un diàleg per a analitzar i reparar una malla @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... Exporta la malla... - - + + Exports a mesh to file Exporta una malla a un fitxer @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole Tanca el forat - - + + Close holes interactively Tanca forats interactivament @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... Ompli els forats... - - + + Fill holes of the mesh Ompli els forats de la malla @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals Inverteix les normals - - + + Flips the normals of the mesh Inverteix les normals de la malla @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... Crea una malla a partir de la geometria... - - + + Create mesh from the selected geometry Crea una malla a partir de la geometria seleccionada @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... Crea una malla a partir d'una forma... - + Tessellate shape Tesel·la la forma @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals Harmonitza les normals - - + + Harmonizes the normals of the mesh Harmonitza les normals de la malla @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... Importa la malla... - - + + Imports a mesh from file Importa una malla des d'un fitxer @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection Intersecció @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge Fusiona - + Merges selected meshes into one Fusiona les malles seleccionades en una @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh Retalla la malla - - + + Cuts a mesh with a picked polygon Retalla una malla amb un polígon seleccionat @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment Fes un segment - - + + Creates a mesh segment Crea un segment de malla @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh Divideix la malla - - + + Splits a mesh into two meshes Divideix una malla en dues malles @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh Retalla la malla - - + + Trims a mesh with a picked polygon Retalla una malla amb un polígon seleccionat @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... Millora... - - + + Refine existing mesh Millora la malla existent @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... Elimina components manualment... - - + + Mark a component to remove it from the mesh Marca un component per a eliminar-lo de la malla @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... Elimina components... - - + + Remove topologic independent components from the mesh Suprimeix els components topològics independents de la malla @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... Redimensiona... - + Scale selected meshes Redimensiona les malles seleccionades @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane Crea una secció a partir d'una malla i un pla - - + + Section from mesh and plane Secció a partir d'una malla i un pla @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... Crea segments de malla... - - + + Create mesh segments Crea segments de malla @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... Crea segments de malla a partir de les superfícies que s'ajusten millor... - - + + Create mesh segments from best-fit surfaces Crea segments de malla a partir de les superfícies que s'ajusten millor @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... Suavitza... - - + + Smooth the selected meshes Suavitza les malles seleccionades @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components Split by components - + Split selected mesh into its components Split selected mesh into its components @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane Retalla la malla amb un pla - - + + Trims a mesh with a plane Retalla una malla amb un pla @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union Unió @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot Gràfic de curvatura - - + + Calculates the curvature of the vertices of a mesh Calcula la curvatura dels vèrtexs d'una malla @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info Info de la curvatura - - + + Information about curvature Informació de la curvatura @@ -672,144 +672,144 @@ Mesh union - + Mesh difference Mesh difference - + Mesh intersection Mesh intersection - + Import Mesh Import Mesh - + Mesh VertexCurvature Mesh VertexCurvature - + Mesh Smoothing Mesh Smoothing - + Harmonize mesh normals Harmonize mesh normals - + Flip mesh normals Flip mesh normals - + Fill up holes Fill up holes - + Mesh merge Mesh merge - + Mesh split Mesh split - + Mesh scale Mesh scale - + Mesh Decimating Mesh Decimating - + Harmonize normals Harmonitza les normals - + Remove non-manifolds Remove non-manifolds - + Fix indices Fix indices - + Remove degenerated faces Remove degenerated faces - + Remove duplicated faces Remove duplicated faces - + Remove duplicated points Remove duplicated points - + Fix self-intersections Fix self-intersections - + Remove folds Remove folds - + Repair mesh Repair mesh - + Delete selection Delete selection - - + + Cut Retalla - - + + Trim Retalla - + Split Divideix - + Segment Segment - + Delete Elimina - + Fill hole Fill hole @@ -838,7 +838,7 @@ - + Absolute number Absolute number @@ -848,7 +848,7 @@ Tolerància - + Absolute number (Maximum: %1) Absolute number (Maximum: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... Paràmetres... - - + + No selection No hi ha cap selecció. - - - - - - - - - - - + + + + + + + + + + + No information Sense informació - + Orientation Orientació - + No flipped normals No hi ha cap normal invertida. - + %1 flipped normals %1 normals invertides - + No non-manifolds No hi ha cap no-multiplicitat. - + %1 non-manifolds %1 no-multiplicitat - - + + Non-manifolds No-multiplicitat - + Cannot remove non-manifolds No es pot suprimir la no-multiplicitat. - + Invalid face indices Els índexs de cara no són vàlids. - + Invalid point indices Els índexs de punt no són vàlids. - + Multiple point indices Índexs de punt múltiples - + Invalid neighbour indices Els índexs veïns no són vàlids. - + No invalid indices No hi ha cap índex invàlid. - + Indices Índexs - + No degenerations No hi ha cap degeneració. - + %1 degenerated faces %1 cares degenerades - + Degenerations Degeneracions - + No duplicated faces No hi ha cap cara duplicada. - + %1 duplicated faces %1 cares duplicades - + Duplicated faces Cares duplicades - + No duplicated points No hi ha cap punt duplicat. - - + + Duplicated points Punts duplicats - + No self-intersections No hi ha cap autointersecció. - + Self-intersections Autointerseccions - + No folds on surface No hi ha cap plec en la superfície. - + %1 folds on surface %1 plecs en la superfície - + Folds Plecs - - + + Mesh repair Reparació de malla @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 Crea %1 - + No active document No hi ha cap document actiu. @@ -1366,7 +1366,7 @@ Alçària: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format Aquest paràmetre indica si la compressió ZIP s'utilitza en escriure un fitxer en format AMF @@ -1544,48 +1544,48 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::GmshWidget - + Automatic Automàtica - + Adaptive Adaptable - + Frontal Frontal - + Frontal Quad Quadrilàter frontal - + Parallelograms Paral·lelograms - - + + Time: Temps: - + Running gmsh... S'està executant gmsh... - + Failed to start No s'ha pogut iniciar - + Error Error @@ -1593,22 +1593,22 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::MeshFaceAddition - + Add triangle Afig un triangle - + Flip normal Inverteix les normals - + Clear Neteja - + Finish Finalitza @@ -1616,7 +1616,7 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::MeshFillHole - + Finish Finalitza @@ -1624,47 +1624,47 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::ParametersDialog - + Surface fit Ajustament de la superfície - + Parameters Paràmetres - + Selection Selecció - + Region Regió - + Triangle Triangle - + Clear Neteja - + Compute Calcula - + No selection No hi ha cap selecció. - + Before fitting the surface select an area. Abans d'ajustar la superfície, seleccioneu una àrea. @@ -1923,29 +1923,29 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suauEsfera - - + + Base Base - + Normal Normal - + Axis Eix - - + + Radius Radi - + Center Centre @@ -1979,12 +1979,12 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suauRespecta només els triangles amb les normals enfront de la pantalla - + Use a brush tool to select the area Utilitza un pinzell per a seleccionar l'àrea - + Clears completely the selected area Esborra completament l'àrea seleccionada @@ -1992,14 +1992,14 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshGui::TaskRemoveComponents - - + + Delete Elimina - - + + Invert Inverteix @@ -2007,38 +2007,38 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau MeshInfoWatcher - + Number of points: Nombre de punts: - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Mesh info - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2046,7 +2046,7 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau Mesh_BoundingBox - + Boundings of %1: Límits de %1: @@ -2054,26 +2054,26 @@ Si angle de la cara < l'angle de plec, s'utilitza un ombrejat suau Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. S'ha produït un error mentre s'executava l'OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. L'OpenSCAD no s'ha pogut trobar al vostre sistema. Visiteu http://www.openscad.org/index.html per a instal·lar-lo. @@ -2082,7 +2082,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh Avalua i repara una malla @@ -2090,241 +2090,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display Visualització - + Import-Export Importació-exportació - + All Mesh Files Tots els fitxers de malla - - + + Binary STL STL binari - - - + + + ASCII STL STL ASCII - - + + Binary Mesh Malla en binari - - + + Alias Mesh Malla d'àlies - - + + Object File Format Format del fitxer d'objecte - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Polígon Stanford - + NASTRAN NASTRAN - - + + All Files Tots els fitxers - + Import mesh Importa la malla - + Simple Model Format Format de model senzill - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Compressed X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 VRML 2.0 comprimit - + Nastran Nastran - + Python module def Mòdul def de Python - + Asymptote Format Asymptote Format - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh Exporta la malla - + Meshing Tolerance Tolerància de mallat - + Enter tolerance for meshing geometry: Introdueix la tolerància per a la goemetria de mallat: - + The mesh '%1' is not a solid. La malla '%1' no és un sòlid. - + The mesh '%1' is a solid. La malla '%1' és un sòlid. - + Solid Mesh Malla sòlida - + Boundings Límits envoltants - + Fill holes Ompli els forats - + Fill holes with maximum number of edges: Ompli els forats amb un nombre màxim de vores: - + Scaling Escalat - + Enter scaling factor: Introduïu el factor d'escala: - + [Points: %1, Edges: %2, Faces: %3] [Punts: %1, Arestes: %2, Cares: %3] - + Display components Mostra els components - + Display segments Mostra els segments - + Display colors Display colors - - + + Leave info mode Ix del mode info - + Index: %1 Índex: %1 - + Leave hole-filling mode Ix del mode d'emplenament de forats - + Leave removal mode Ix del mode de supressió - + Delete selected faces Elimina les cares seleccionades - + Clear selected faces Esborra les cares seleccionades - + Annotation Anotació diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_zh-CN.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_zh-CN.ts index e3f8bb65f9..c124234fb4 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_zh-CN.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_zh-CN.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh 网格 - + Add triangle 增加三角形 - - + + Add triangle manually to a mesh 手动给网格添加三角形 @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh 网格 - + Boundings info... 边界信息... - - + + Shows the boundings of the selected mesh 显示所选网格的边界 @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh 网格 - + Regular solid... 正多面体实体... - - + + Builds a regular solid 建立正多面体实体 @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh 网格 - + Cross-sections... 横截面... - - + + Cross-sections 横截面 @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh 网格 - + Decimation... 十进制... - - - + + + Decimates a mesh 破坏 网格 @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh 网格 - + Difference 差集 @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh 网格 - + Face info 表面信息 - - + + Information about face 表面信息 @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh 网格 - + Check solid mesh 检查实体网格 - - + + Checks whether the mesh is a solid 检查网格是否为实体 @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh 网格 - + Evaluate and repair mesh... 评估和修复网格... - - + + Opens a dialog to analyze and repair a mesh 打开一个对话框,分析并修复网格 @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh 网格 - + Export mesh... 导出网格... - - + + Exports a mesh to file 导出网格到文件 @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh 网格 - + Close hole 封闭孔 - - + + Close holes interactively 交互式封闭孔 @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh 网格 - + Fill holes... 填充孔... - - + + Fill holes of the mesh 填充网格孔 @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh 网格 - + Flip normals 翻转法线 - - + + Flips the normals of the mesh 翻转网格法线 @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh 网格 - + Create mesh from geometry... 从几何体创建网格... - - + + Create mesh from the selected geometry 从选定的几何体创建网格 @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh 网格 - + Create mesh from shape... 从形体创建网格... - + Tessellate shape 细分形状 @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh 网格 - + Harmonize normals 统一法线 - - + + Harmonizes the normals of the mesh 平滑网格法线 @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh 网格 - + Import mesh... 导入网格... - - + + Imports a mesh from file 从文件中导入网格 @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh 网格 - + Intersection 交集 @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh 网格 - + Merge 合并 - + Merges selected meshes into one 将所选网格合而为一 @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh 网格 - + Cut mesh 切割网格 - - + + Cuts a mesh with a picked polygon 使用多边形切割网格 @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh 网格 - + Make segment 创建片段 - - + + Creates a mesh segment 创建网格 @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh 网格 - + Split mesh 拆分网格 - - + + Splits a mesh into two meshes 拆分成两个网格 @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh 网格 - + Trim mesh 修剪网格 - - + + Trims a mesh with a picked polygon 使用选定多边形修建网格 @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh 网格 - + Refinement... 精制... - - + + Refine existing mesh 优化现有网格 @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh 网格 - + Remove components by hand... 手动删除组件... - - + + Mark a component to remove it from the mesh 标记要从网格中删除组件 @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh 网格 - + Remove components... 删除组件... - - + + Remove topologic independent components from the mesh 从网格中删除拓扑独立部件 @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh 网格 - + Scale... 缩放... - + Scale selected meshes 缩放所选网格 @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh 网格 - + Create section from mesh and plane 从网格和平面创建剖面 - - + + Section from mesh and plane 从网格和平面的剖面 @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh 网格 - + Create mesh segments... 建立网格分割... - - + + Create mesh segments 建立网格分割 @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh 网格 - + Create mesh segments from best-fit surfaces... 从最适合的表面创建网格分割... - - + + Create mesh segments from best-fit surfaces 从最适合的表面创建网格分割 @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh 网格 - + Smooth... 平滑... - - + + Smooth the selected meshes 平滑选定的网格 @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh 网格 - + Split by components 按组件拆分 - + Split selected mesh into its components 将所选网格拆分到组件中 @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh 网格 - + Trim mesh with a plane 以平面修剪网格 - - + + Trims a mesh with a plane 以平面修剪网格 @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh 网格 - + Union 并集 @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh 网格 - + Curvature plot 曲率图 - - + + Calculates the curvature of the vertices of a mesh 计算网格顶点的曲率 @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh 网格 - + Curvature info 曲率信息 - - + + Information about curvature 曲率信息 @@ -672,144 +672,144 @@ 网格合并 - + Mesh difference 网格差异 - + Mesh intersection 网格交点 - + Import Mesh 导入网格 - + Mesh VertexCurvature 网格顶点曲率 - + Mesh Smoothing 网格平滑化 - + Harmonize mesh normals 适合网格法线 - + Flip mesh normals 翻转网格法线 - + Fill up holes 填充孔 - + Mesh merge 网格合并 - + Mesh split 网格拆分 - + Mesh scale 网格缩放 - + Mesh Decimating 网格削减 - + Harmonize normals 统一法线 - + Remove non-manifolds 删除非流形 - + Fix indices 修复指数 - + Remove degenerated faces 移除退化的面 - + Remove duplicated faces 删除重复的面 - + Remove duplicated points 删除重复的点 - + Fix self-intersections 修复自相交 - + Remove folds 移除折叠 - + Repair mesh 修复网格 - + Delete selection 删除所选项 - - + + Cut 剪切 - - + + Trim 修剪 - + Split 分割 - + Segment 段 - + Delete 删除 - + Fill hole 填充孔 @@ -838,7 +838,7 @@ - + Absolute number 绝对值 @@ -848,7 +848,7 @@ 公差 - + Absolute number (Maximum: %1) 绝对值 (最大值: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... 设置... - - + + No selection 无选择 - - - - - - - - - - - + + + + + + + + + + + No information 无信息 - + Orientation 方向 - + No flipped normals 无翻转法线 - + %1 flipped normals %1 翻转法线 - + No non-manifolds 无非流形 - + %1 non-manifolds 非流形 %1 - - + + Non-manifolds 非流形 - + Cannot remove non-manifolds 不能删除非流形 - + Invalid face indices 无效的面指数 - + Invalid point indices 无效点指数 - + Multiple point indices 多点指数 - + Invalid neighbour indices 无相邻指数 - + No invalid indices 没有无效指数 - + Indices 指数 - + No degenerations 无退化 - + %1 degenerated faces 退化面 %1 - + Degenerations 退化 - + No duplicated faces 无重复面 - + %1 duplicated faces 重复面 %1 - + Duplicated faces 重复面 - + No duplicated points 无重复点 - - + + Duplicated points 重复点 - + No self-intersections 无自干涉 - + Self-intersections 自干涉 - + No folds on surface 面无折叠 - + %1 folds on surface 面折叠 %1 - + Folds 折叠 - - + + Mesh repair 修复网格 @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 创建 %1 - + No active document 无活动文档 @@ -1366,7 +1366,7 @@ 高度: - + This parameter indicates whether ZIP compression is used when writing a file in AMF format 此参数指示采用 AMF 格式写文件时，是否使用 ZIP 压缩 @@ -1549,48 +1549,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic 自动 - + Adaptive 自适应 - + Frontal 正面 - + Frontal Quad 正面四边形 - + Parallelograms 平行四边形 - - + + Time: 时间： - + Running gmsh... 正在运行 gmsh ... - + Failed to start 未能启动 - + Error 错误 @@ -1598,22 +1598,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle 增加三角形 - + Flip normal 翻转法线 - + Clear 清除 - + Finish 完成 @@ -1621,7 +1621,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish 完成 @@ -1629,47 +1629,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit 表面适合 - + Parameters 参数 - + Selection 选择 - + Region 区域 - + Triangle 三角形 - + Clear 清除 - + Compute 计算 - + No selection 无选择 - + Before fitting the surface select an area. 在拟合表面之前选择区域。 @@ -1928,29 +1928,29 @@ to a smoother appearance. 球体 - - + + Base 基本 - + Normal 法向 - + Axis 轴线 - - + + Radius 半径 - + Center 中心 @@ -1984,12 +1984,12 @@ to a smoother appearance. 仅考虑屏幕常规法线三角形 - + Use a brush tool to select the area 使用刷子工具来选取区域 - + Clears completely the selected area 完全清除所选的区域 @@ -1997,14 +1997,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete 删除 - - + + Invert 反转 @@ -2012,38 +2012,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: 点数: - + Number of facets: 小面的数量 - + Minimum bound: 最小边界 - + Maximum bound: 最大边界 - + Mesh info box 网格信息框 - + Mesh info 网格信息 - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2051,7 +2051,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: %1的边界: @@ -2059,26 +2059,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. 运行 OpenSCAD 时发生未知错误。 - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. 在您的系统上未发现 OpenSCAD @@ -2088,7 +2088,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh 检测并修复网格 @@ -2096,241 +2096,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display 显示 - + Import-Export Import-Export - + All Mesh Files 所有网格文档 - - + + Binary STL 二进制 STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh 二进制的网格 - - + + Alias Mesh Alias 网格 - - + + Object File Format 对象文件格式 - + Inventor V2.1 ASCII Inventor V2.1 ascii - - + + Stanford Polygon 斯坦福多边形 - + NASTRAN NASTRAN - - + + All Files 所有文件 - + Import mesh 导入网格 - + Simple Model Format 简单模型格式 - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D 压缩的 X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 压缩的 VRML 2.0 - + Nastran Nastran - + Python module def Python 模块设定 - + Asymptote Format 渐变格式 - + 3D Manufacturing Format 3D制造格式 - + Export mesh 导出网格 - + Meshing Tolerance 网格化公差 - + Enter tolerance for meshing geometry: 输入网格化几何体公差: - + The mesh '%1' is not a solid. 网格 '%1' 不是实体. - + The mesh '%1' is a solid. 网格 '%1' 是实体. - + Solid Mesh 实体网格 - + Boundings 边界 - + Fill holes 填充孔 - + Fill holes with maximum number of edges: 使用最大边数填充孔: - + Scaling 缩放 - + Enter scaling factor: 输入缩放系数： - + [Points: %1, Edges: %2, Faces: %3] [点： %1，边线： %2，面： %3] - + Display components 显示组件 - + Display segments 显示段 - + Display colors 显示颜色 - - + + Leave info mode 退出查询模式 - + Index: %1 索引： %1 - + Leave hole-filling mode 退出孔填充模式 - + Leave removal mode 退出删除模式 - + Delete selected faces 删除选定的面 - + Clear selected faces 清除选中的面 - + Annotation 注释 diff --git a/src/Mod/Mesh/Gui/Resources/translations/Mesh_zh-TW.ts b/src/Mod/Mesh/Gui/Resources/translations/Mesh_zh-TW.ts index c35a8acbea..0dd99b53da 100644 --- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_zh-TW.ts +++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_zh-TW.ts @@ -4,18 +4,18 @@ CmdMeshAddFacet - + Mesh Mesh - + Add triangle 加入三角形 - - + + Add triangle manually to a mesh 手動於網格中加入三角形 @@ -23,18 +23,18 @@ CmdMeshBoundingBox - + Mesh Mesh - + Boundings info... 範圍資訊... - - + + Shows the boundings of the selected mesh 顯示所選網格範圍 @@ -42,18 +42,18 @@ CmdMeshBuildRegularSolid - + Mesh Mesh - + Regular solid... 標準實體... - - + + Builds a regular solid 建立一標準實體 @@ -61,18 +61,18 @@ CmdMeshCrossSections - + Mesh Mesh - + Cross-sections... 剖面... - - + + Cross-sections 剖面 @@ -80,19 +80,19 @@ CmdMeshDecimating - + Mesh Mesh - + Decimation... 十進制... - - - + + + Decimates a mesh 十進制網格 @@ -100,12 +100,12 @@ CmdMeshDifference - + Mesh Mesh - + Difference 差集 @@ -113,18 +113,18 @@ CmdMeshEvaluateFacet - + Mesh Mesh - + Face info 面資訊 - - + + Information about face 面之資訊 @@ -132,18 +132,18 @@ CmdMeshEvaluateSolid - + Mesh Mesh - + Check solid mesh 檢查固體網格 - - + + Checks whether the mesh is a solid 不論網格是否為實體均檢查 @@ -151,18 +151,18 @@ CmdMeshEvaluation - + Mesh Mesh - + Evaluate and repair mesh... 評估及修復網格... - - + + Opens a dialog to analyze and repair a mesh 開啟分析及修復網格對話窗 @@ -170,18 +170,18 @@ CmdMeshExport - + Mesh Mesh - + Export mesh... 匯出網格... - - + + Exports a mesh to file 匯出網格至檔案 @@ -189,18 +189,18 @@ CmdMeshFillInteractiveHole - + Mesh Mesh - + Close hole 封閉空洞 - - + + Close holes interactively 以交集封閉孔洞 @@ -208,18 +208,18 @@ CmdMeshFillupHoles - + Mesh Mesh - + Fill holes... 填滿空洞... - - + + Fill holes of the mesh 充填網格孔洞 @@ -227,18 +227,18 @@ CmdMeshFlipNormals - + Mesh Mesh - + Flip normals 翻轉法線 - - + + Flips the normals of the mesh 翻轉網格法線 @@ -246,18 +246,18 @@ CmdMeshFromGeometry - + Mesh Mesh - + Create mesh from geometry... 從幾何建立網格... - - + + Create mesh from the selected geometry 由所選幾何建立網格 @@ -265,17 +265,17 @@ CmdMeshFromPartShape - + Mesh Mesh - + Create mesh from shape... 由造型建立網格... - + Tessellate shape 格紋造型 @@ -283,18 +283,18 @@ CmdMeshHarmonizeNormals - + Mesh Mesh - + Harmonize normals 統一法線 - - + + Harmonizes the normals of the mesh 統一網格法線 @@ -302,18 +302,18 @@ CmdMeshImport - + Mesh Mesh - + Import mesh... 匯入網格... - - + + Imports a mesh from file 從檔案中匯入網格 @@ -321,12 +321,12 @@ CmdMeshIntersection - + Mesh Mesh - + Intersection 交集 @@ -334,17 +334,17 @@ CmdMeshMerge - + Mesh Mesh - + Merge 合併 - + Merges selected meshes into one 將所選網格合而為一 @@ -352,18 +352,18 @@ CmdMeshPolyCut - + Mesh Mesh - + Cut mesh 切割網格 - - + + Cuts a mesh with a picked polygon 以選取之多邊形切割網格 @@ -371,18 +371,18 @@ CmdMeshPolySegm - + Mesh Mesh - + Make segment 建立分割 - - + + Creates a mesh segment 建立網格分割 @@ -390,18 +390,18 @@ CmdMeshPolySplit - + Mesh Mesh - + Split mesh 分割網格 - - + + Splits a mesh into two meshes 分為兩個網格 @@ -409,18 +409,18 @@ CmdMeshPolyTrim - + Mesh Mesh - + Trim mesh 修剪網格 - - + + Trims a mesh with a picked polygon 依選定之多邊形修剪網格 @@ -428,18 +428,18 @@ CmdMeshRemeshGmsh - + Mesh Mesh - + Refinement... 精煉化... - - + + Refine existing mesh 精煉既有網格 @@ -447,18 +447,18 @@ CmdMeshRemoveCompByHand - + Mesh Mesh - + Remove components by hand... 手動移除元件... - - + + Mark a component to remove it from the mesh 使元件由網格中移出 @@ -466,18 +466,18 @@ CmdMeshRemoveComponents - + Mesh Mesh - + Remove components... 刪除元件... - - + + Remove topologic independent components from the mesh 自網格移除拓樸獨立元件 @@ -485,17 +485,17 @@ CmdMeshScale - + Mesh Mesh - + Scale... 比例... - + Scale selected meshes 縮放所選網格 @@ -503,18 +503,18 @@ CmdMeshSectionByPlane - + Mesh Mesh - + Create section from mesh and plane 由網格和平面建立截面 - - + + Section from mesh and plane 由網格和平面的截面 @@ -522,18 +522,18 @@ CmdMeshSegmentation - + Mesh Mesh - + Create mesh segments... 建立網格分割... - - + + Create mesh segments 建立網格分割 @@ -541,18 +541,18 @@ CmdMeshSegmentationBestFit - + Mesh Mesh - + Create mesh segments from best-fit surfaces... 由最適合的表面建立網格分割... - - + + Create mesh segments from best-fit surfaces 由最適合的表面建立網格分割 @@ -560,18 +560,18 @@ CmdMeshSmoothing - + Mesh Mesh - + Smooth... 平滑... - - + + Smooth the selected meshes 平滑化所選網格 @@ -579,17 +579,17 @@ CmdMeshSplitComponents - + Mesh Mesh - + Split by components 依元件分割 - + Split selected mesh into its components Split selected mesh into its components @@ -597,18 +597,18 @@ CmdMeshTrimByPlane - + Mesh Mesh - + Trim mesh with a plane 以平面修剪網格 - - + + Trims a mesh with a plane 以平面修剪網格 @@ -616,12 +616,12 @@ CmdMeshUnion - + Mesh Mesh - + Union 聯集 @@ -629,18 +629,18 @@ CmdMeshVertexCurvature - + Mesh Mesh - + Curvature plot 曲率圖 - - + + Calculates the curvature of the vertices of a mesh 計算網格的頂點的曲率 @@ -648,18 +648,18 @@ CmdMeshVertexCurvatureInfo - + Mesh Mesh - + Curvature info 曲率資訊 - - + + Information about curvature 曲率資訊 @@ -672,144 +672,144 @@ 網格合併 - + Mesh difference 網格差異 - + Mesh intersection 網格相交 - + Import Mesh 匯入網格 - + Mesh VertexCurvature Mesh VertexCurvature - + Mesh Smoothing Mesh Smoothing - + Harmonize mesh normals Harmonize mesh normals - + Flip mesh normals Flip mesh normals - + Fill up holes Fill up holes - + Mesh merge Mesh merge - + Mesh split Mesh split - + Mesh scale Mesh scale - + Mesh Decimating Mesh Decimating - + Harmonize normals 統一法線 - + Remove non-manifolds Remove non-manifolds - + Fix indices Fix indices - + Remove degenerated faces Remove degenerated faces - + Remove duplicated faces Remove duplicated faces - + Remove duplicated points Remove duplicated points - + Fix self-intersections Fix self-intersections - + Remove folds Remove folds - + Repair mesh Repair mesh - + Delete selection Delete selection - - + + Cut 切割 - - + + Trim 修剪 - + Split Split - + Segment Segment - + Delete 刪除 - + Fill hole Fill hole @@ -838,7 +838,7 @@ - + Absolute number 絕對值 @@ -848,7 +848,7 @@ 公差 - + Absolute number (Maximum: %1) 絕對值 (最大值: %1) @@ -980,166 +980,166 @@ MeshGui::DlgEvaluateMeshImp - + Settings... 設定... - - + + No selection 未選取 - - - - - - - - - - - + + + + + + + + + + + No information 沒有資訊 - + Orientation 定位 - + No flipped normals 無旋轉法線 - + %1 flipped normals %1無旋轉法線 - + No non-manifolds 無非重疊網格 - + %1 non-manifolds %1非重疊網格 - - + + Non-manifolds 非重疊網格 - + Cannot remove non-manifolds 無法移除非重疊網格 - + Invalid face indices 錯誤之面索引 - + Invalid point indices 錯誤之點索引 - + Multiple point indices 多點索引 - + Invalid neighbour indices 錯誤之相鄰索引 - + No invalid indices 無錯誤索引 - + Indices 指數 - + No degenerations 無簡化 - + %1 degenerated faces %1簡化面 - + Degenerations 簡化 - + No duplicated faces 無重疊面 - + %1 duplicated faces %1重疊面 - + Duplicated faces 複製之面 - + No duplicated points 無重疊點 - - + + Duplicated points 複製之點 - + No self-intersections 無內部交錯 - + Self-intersections 自我交錯 - + No folds on surface 於面上無重疊 - + %1 folds on surface 於面上有%1的重疊 - + Folds 折疊 - - + + Mesh repair 修復網格 @@ -1291,14 +1291,14 @@ MeshGui::DlgRegularSolidImp - - - + + + Create %1 創建%1 - + No active document 無可用文件 @@ -1358,15 +1358,15 @@ Width: - 寬度: + 寬度： Height: - 高度: + 高度： - + This parameter indicates whether ZIP compression is used when writing a file in AMF format This parameter indicates whether ZIP compression @@ -1551,48 +1551,48 @@ to a smoother appearance. MeshGui::GmshWidget - + Automatic 自動 - + Adaptive Adaptive - + Frontal Frontal - + Frontal Quad Frontal Quad - + Parallelograms Parallelograms - - + + Time: 時間： - + Running gmsh... Running gmsh... - + Failed to start Failed to start - + Error 錯誤 @@ -1600,22 +1600,22 @@ to a smoother appearance. MeshGui::MeshFaceAddition - + Add triangle 加入三角形 - + Flip normal 翻轉正常面 - + Clear 清除 - + Finish 完成 @@ -1623,7 +1623,7 @@ to a smoother appearance. MeshGui::MeshFillHole - + Finish 結束 @@ -1631,47 +1631,47 @@ to a smoother appearance. MeshGui::ParametersDialog - + Surface fit Surface fit - + Parameters 參數 - + Selection 選擇 - + Region 面域 - + Triangle 三角形 - + Clear 清除 - + Compute Compute - + No selection 未選取 - + Before fitting the surface select an area. Before fitting the surface select an area. @@ -1930,29 +1930,29 @@ to a smoother appearance. 球體 - - + + Base 基礎 - + Normal 垂直 - + Axis 軸 - - + + Radius 半徑 - + Center 中心 @@ -1986,12 +1986,12 @@ to a smoother appearance. 僅就法線正對畫面的三角形 - + Use a brush tool to select the area 使用刷子工具來選取範圍 - + Clears completely the selected area 完全清除所有範圍 @@ -1999,14 +1999,14 @@ to a smoother appearance. MeshGui::TaskRemoveComponents - - + + Delete 刪除 - - + + Invert 反轉 @@ -2014,38 +2014,38 @@ to a smoother appearance. MeshInfoWatcher - + Number of points: 點的數目： - + Number of facets: Number of facets: - + Minimum bound: Minimum bound: - + Maximum bound: Maximum bound: - + Mesh info box Mesh info box - + Mesh info Mesh info - - + + X: %1 Y: %2 Z: %3 X: %1 Y: %2 Z: %3 @@ -2053,7 +2053,7 @@ to a smoother appearance. Mesh_BoundingBox - + Boundings of %1: Boundings of %1: @@ -2061,26 +2061,26 @@ to a smoother appearance. Mesh_Union - - - - - + + + + + OpenSCAD OpenSCAD - - - + + + Unknown error occurred while running OpenSCAD. Unknown error occurred while running OpenSCAD. - - - + + + OpenSCAD cannot be found on your system. Please visit http://www.openscad.org/index.html to install it. 於您的系統上未發現OpenSCAD @@ -2090,7 +2090,7 @@ Please visit http://www.openscad.org/index.html to install it. QDockWidget - + Evaluate & Repair Mesh 評估和修復網格 @@ -2098,241 +2098,241 @@ Please visit http://www.openscad.org/index.html to install it. QObject - + Display 顯示 - + Import-Export 匯入-匯出 - + All Mesh Files 所有網格檔 - - + + Binary STL 二進位 STL - - - + + + ASCII STL ASCII STL - - + + Binary Mesh 二進位網格 - - + + Alias Mesh Alias 網格 - - + + Object File Format Obj檔案格式 - + Inventor V2.1 ASCII Inventor V2.1 ASCII - - + + Stanford Polygon Stanford Polygon - + NASTRAN NASTRAN - - + + All Files 所有檔案 - + Import mesh 匯入網格 - + Simple Model Format Simple Model Format - + Inventor V2.1 ascii Inventor V2.1 ascii - + X3D Extensible 3D X3D Extensible 3D - + Compressed X3D Compressed X3D - + WebGL/X3D WebGL/X3D - + VRML V2.0 VRML V2.0 - + Compressed VRML 2.0 壓縮之 VRML 2.0 - + Nastran Nastran - + Python module def Python模組設定 - + Asymptote Format Asymptote Format - + 3D Manufacturing Format 3D Manufacturing Format - + Export mesh 匯出網格 - + Meshing Tolerance 網格公差 - + Enter tolerance for meshing geometry: 輸入製作網格幾何公差： - + The mesh '%1' is not a solid. 網格'%1'不為實體 - + The mesh '%1' is a solid. 網格'%1'為實體 - + Solid Mesh 固體網格 - + Boundings 範圍 - + Fill holes 填充孔 - + Fill holes with maximum number of edges: 填充開口藉由最多邊之數量： - + Scaling Scaling - + Enter scaling factor: Enter scaling factor: - + [Points: %1, Edges: %2, Faces: %3] [點：%1, 線：%2, 面：%3] - + Display components 顯示元件 - + Display segments Display segments - + Display colors 顯示顏色 - - + + Leave info mode 離開訊息模式 - + Index: %1 索引：%1 - + Leave hole-filling mode 離開填充孔模式 - + Leave removal mode 離開移除模式 - + Delete selected faces 刪除選定面 - + Clear selected faces 清除所選面 - + Annotation 注釋 diff --git a/src/Mod/Mesh/Gui/Segmentation.cpp b/src/Mod/Mesh/Gui/Segmentation.cpp index 434a294f53..081e09932a 100644 --- a/src/Mod/Mesh/Gui/Segmentation.cpp +++ b/src/Mod/Mesh/Gui/Segmentation.cpp @@ -41,9 +41,9 @@ using namespace MeshGui; Segmentation::Segmentation(Mesh::Feature* mesh, QWidget* parent, Qt::WindowFlags fl) : QWidget(parent, fl) + , ui(new Ui_Segmentation) , myMesh(mesh) { - ui = new Ui_Segmentation; ui->setupUi(this); ui->numPln->setRange(1, INT_MAX); ui->numPln->setValue(100); @@ -158,7 +158,7 @@ void Segmentation::changeEvent(QEvent* e) TaskSegmentation::TaskSegmentation(Mesh::Feature* mesh) { - widget = new Segmentation(mesh); + widget = new Segmentation(mesh); // NOLINT taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp index c7c8acc9a1..bb1537ba07 100644 --- a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp +++ b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp @@ -52,7 +52,6 @@ class PlaneFitParameter: public FitParameter { public: PlaneFitParameter() = default; - ~PlaneFitParameter() override = default; std::vector getParameter(FitParameter::Points pts) const override { std::vector values; @@ -76,7 +75,6 @@ class CylinderFitParameter: public FitParameter { public: CylinderFitParameter() = default; - ~CylinderFitParameter() override = default; std::vector getParameter(FitParameter::Points pts) const override { std::vector values; @@ -142,7 +140,6 @@ class SphereFitParameter: public FitParameter { public: SphereFitParameter() = default; - ~SphereFitParameter() override = default; std::vector getParameter(FitParameter::Points pts) const override { std::vector values; @@ -169,60 +166,61 @@ ParametersDialog::ParametersDialog(std::vector& val, : QDialog(parent) , values(val) , fitParameter(fitPar) - , parameter(par) + , parameter(std::move(par)) , myMesh(mesh) { this->setWindowTitle(tr("Surface fit")); - QGridLayout* gridLayout; + QGridLayout* gridLayout {}; gridLayout = new QGridLayout(this); - QGroupBox* groupBox; + QGroupBox* groupBox {}; groupBox = new QGroupBox(this); groupBox->setTitle(tr("Parameters")); gridLayout->addWidget(groupBox, 0, 0, 1, 1); - QGroupBox* selectBox; + QGroupBox* selectBox {}; selectBox = new QGroupBox(this); selectBox->setTitle(tr("Selection")); gridLayout->addWidget(selectBox, 1, 0, 1, 1); - QVBoxLayout* selectLayout; + QVBoxLayout* selectLayout {}; selectLayout = new QVBoxLayout(selectBox); - QPushButton* regionButton; + QPushButton* regionButton {}; regionButton = new QPushButton(this); regionButton->setText(tr("Region")); regionButton->setObjectName(QString::fromLatin1("region")); selectLayout->addWidget(regionButton); - QPushButton* singleButton; + QPushButton* singleButton {}; singleButton = new QPushButton(this); singleButton->setText(tr("Triangle")); singleButton->setObjectName(QString::fromLatin1("single")); selectLayout->addWidget(singleButton); - QPushButton* clearButton; + QPushButton* clearButton {}; clearButton = new QPushButton(this); clearButton->setText(tr("Clear")); clearButton->setObjectName(QString::fromLatin1("clear")); selectLayout->addWidget(clearButton); - QPushButton* computeButton; + QPushButton* computeButton {}; computeButton = new QPushButton(this); computeButton->setText(tr("Compute")); computeButton->setObjectName(QString::fromLatin1("compute")); gridLayout->addWidget(computeButton, 2, 0, 1, 1); - QDialogButtonBox* buttonBox; + QDialogButtonBox* buttonBox {}; buttonBox = new QDialogButtonBox(this); buttonBox->setOrientation(Qt::Horizontal); buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok); gridLayout->addWidget(buttonBox, 3, 0, 1, 1); int index = 0; - QGridLayout* layout; + QGridLayout* layout {}; layout = new QGridLayout(groupBox); + groupBox->setLayout(layout); for (const auto& it : parameter) { QLabel* label = new QLabel(groupBox); label->setText(it.first); @@ -331,9 +329,9 @@ void ParametersDialog::reject() SegmentationBestFit::SegmentationBestFit(Mesh::Feature* mesh, QWidget* parent, Qt::WindowFlags fl) : QWidget(parent, fl) + , ui(new Ui_SegmentationBestFit) , myMesh(mesh) { - ui = new Ui_SegmentationBestFit; ui->setupUi(this); setupConnections(); @@ -453,7 +451,7 @@ void SegmentationBestFit::accept() std::vector segm; if (ui->groupBoxCyl->isChecked()) { - MeshCore::AbstractSurfaceFit* fitter; + MeshCore::AbstractSurfaceFit* fitter {}; if (cylinderParameter.size() == 7) { std::vector& p = cylinderParameter; fitter = new MeshCore::CylinderSurfaceFit(Base::Vector3f(p[0], p[1], p[2]), @@ -470,7 +468,7 @@ void SegmentationBestFit::accept() ui->tolCyl->value())); } if (ui->groupBoxSph->isChecked()) { - MeshCore::AbstractSurfaceFit* fitter; + MeshCore::AbstractSurfaceFit* fitter {}; if (sphereParameter.size() == 4) { std::vector& p = sphereParameter; fitter = new MeshCore::SphereSurfaceFit(Base::Vector3f(p[0], p[1], p[2]), p[3]); @@ -485,7 +483,7 @@ void SegmentationBestFit::accept() ui->tolSph->value())); } if (ui->groupBoxPln->isChecked()) { - MeshCore::AbstractSurfaceFit* fitter; + MeshCore::AbstractSurfaceFit* fitter {}; if (planeParameter.size() == 6) { std::vector& p = planeParameter; fitter = new MeshCore::PlaneSurfaceFit(Base::Vector3f(p[0], p[1], p[2]), @@ -545,7 +543,7 @@ void SegmentationBestFit::changeEvent(QEvent* e) TaskSegmentationBestFit::TaskSegmentationBestFit(Mesh::Feature* mesh) { - widget = new SegmentationBestFit(mesh); + widget = new SegmentationBestFit(mesh); // NOLINT taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.h b/src/Mod/Mesh/Gui/SegmentationBestFit.h index 3339129725..2a552c70ca 100644 --- a/src/Mod/Mesh/Gui/SegmentationBestFit.h +++ b/src/Mod/Mesh/Gui/SegmentationBestFit.h @@ -23,14 +23,14 @@ #ifndef MESHGUI_SEGMENTATIONBESTFIT_H #define MESHGUI_SEGMENTATIONBESTFIT_H -#include #include +#include #include #include -#include "MeshSelection.h" #include +#include "MeshSelection.h" class QDoubleSpinBox; @@ -53,7 +53,12 @@ public: std::vector points; std::vector normals; }; + FitParameter() = default; virtual ~FitParameter() = default; + FitParameter(const FitParameter&) = delete; + FitParameter(FitParameter&&) = delete; + FitParameter& operator=(const FitParameter&) = delete; + FitParameter& operator=(FitParameter&&) = delete; virtual std::vector getParameter(Points) const = 0; }; diff --git a/src/Mod/Mesh/Gui/Selection.h b/src/Mod/Mesh/Gui/Selection.h index 9df6f396a5..0e14d3f1db 100644 --- a/src/Mod/Mesh/Gui/Selection.h +++ b/src/Mod/Mesh/Gui/Selection.h @@ -23,8 +23,8 @@ #ifndef MESHGUI_SELECTION_H #define MESHGUI_SELECTION_H -#include #include +#include #include diff --git a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp index f29e59f20f..5b8fd7ce23 100644 --- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp +++ b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.cpp @@ -564,14 +564,14 @@ void SoFCIndexedFaceSet::drawFaces(SoGLRenderAction* action) SoMaterialBindingElement::Binding matbind = SoMaterialBindingElement::get(state); int32_t binding = (int32_t)(matbind); - const SoCoordinateElement* coords; - const SbVec3f* normals; - const int32_t* cindices; - int numindices; - const int32_t* nindices; - const int32_t* tindices; - const int32_t* mindices; - SbBool normalCacheUsed; + const SoCoordinateElement* coords = nullptr; + const SbVec3f* normals = nullptr; + const int32_t* cindices = nullptr; + int numindices = 0; + const int32_t* nindices = nullptr; + const int32_t* tindices = nullptr; + const int32_t* mindices = nullptr; + SbBool normalCacheUsed {}; SoMaterialBundle mb(action); @@ -648,7 +648,7 @@ void SoFCIndexedFaceSet::drawCoords(const SoGLCoordinateElement* const vertexlis int ct = 0; const int32_t* viptr = vertexindices; - int32_t v1, v2, v3; + int32_t v1 {}, v2 {}, v3 {}; SbVec3f dummynormal(0, 0, 1); const SbVec3f* currnormal = &dummynormal; if (normals) { @@ -720,16 +720,16 @@ void SoFCIndexedFaceSet::invalidate() void SoFCIndexedFaceSet::generateGLArrays(SoGLRenderAction* action) { - const SoCoordinateElement* coords; - const SbVec3f* normals; - const int32_t* cindices; + const SoCoordinateElement* coords = nullptr; + const SbVec3f* normals = nullptr; + const int32_t* cindices = nullptr; const SbColor* pcolors = nullptr; const float* transp = nullptr; - int numindices, numcolors = 0, numtransp = 0; - const int32_t* nindices; - const int32_t* tindices; - const int32_t* mindices; - SbBool normalCacheUsed; + int numindices = 0, numcolors = 0, numtransp = 0; + const int32_t* nindices = nullptr; + const int32_t* tindices = nullptr; + const int32_t* mindices = nullptr; + SbBool normalCacheUsed {}; SbBool sendNormals = true; @@ -1062,7 +1062,7 @@ void SoFCIndexedFaceSet::renderSelectionGeometry(const SbVec3f* coords3d) const int32_t* cindices = this->coordIndex.getValues(0); int fcnt = 0; - int32_t v1, v2, v3; + int32_t v1 {}, v2 {}, v3 {}; for (int index = 0; index < numfaces; index++, cindices++) { glLoadName(fcnt); glBegin(GL_TRIANGLES); @@ -1116,10 +1116,10 @@ void SoFCIndexedFaceSet::renderVisibleFaces(const SbVec3f* coords3d) uint32_t numfaces = this->coordIndex.getNum() / 4; const int32_t* cindices = this->coordIndex.getValues(0); - int32_t v1, v2, v3; + int32_t v1 {}, v2 {}, v3 {}; for (uint32_t index = 0; index < numfaces; index++, cindices++) { glBegin(GL_TRIANGLES); - float t; + float t {}; SbColor c; c.setPackedValue(index << 8, t); glColor3f(c[0], c[1], c[2]); diff --git a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h index 37e762e690..a6a765bc1b 100644 --- a/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h +++ b/src/Mod/Mesh/Gui/SoFCIndexedFaceSet.h @@ -27,6 +27,7 @@ #include #include #include +#include #ifndef MESH_GLOBAL_H #include #endif @@ -42,6 +43,7 @@ using GLfloat = float; namespace MeshGui { +// NOLINTBEGIN class MeshRenderer { public: @@ -142,6 +144,7 @@ private: MeshRenderer render; GLuint* selectBuf {nullptr}; }; +// NOLINTEND } // namespace MeshGui diff --git a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp index f56cf1dd1e..426d89292e 100644 --- a/src/Mod/Mesh/Gui/SoFCMeshObject.cpp +++ b/src/Mod/Mesh/Gui/SoFCMeshObject.cpp @@ -38,9 +38,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -120,7 +120,7 @@ protected: return *gptr(); } - int numPutback; + int numPutback {}; numPutback = gptr() - eback(); if (numPutback > pbSize) { numPutback = pbSize; @@ -130,7 +130,7 @@ protected: int num = 0; for (int i = 0; i < bufSize; i++) { - char c; + char c {}; SbBool ok = inp->get(c); if (ok) { num++; @@ -152,7 +152,7 @@ protected: private: static const int pbSize = 4; static const int bufSize = 1024; - char buffer[bufSize + pbSize]; + char buffer[bufSize + pbSize] {}; SoInput* inp; }; @@ -166,6 +166,10 @@ public: this->rdbuf(&buf); } ~SoInputStream() override = default; + SoInputStream(const SoInputStream&) = delete; + SoInputStream(SoInputStream&&) = delete; + SoInputStream& operator=(const SoInputStream&) = delete; + SoInputStream& operator=(SoInputStream&&) = delete; private: SoInputStreambuf buf; @@ -203,7 +207,7 @@ SbBool SoSFMeshObject::readValue(SoInput* in) return true; } - int32_t countPt; + int32_t countPt {}; in->read(countPt); std::vector verts(countPt); in->readBinaryArray(&(verts[0]), countPt); @@ -221,7 +225,7 @@ SbBool SoSFMeshObject::readValue(SoInput* in) rPoints.push_back(p); } - int32_t countFt; + int32_t countFt {}; in->read(countFt); std::vector faces(countFt); in->readBinaryArray(&(faces[0]), countFt); @@ -396,7 +400,7 @@ void SoFCMeshPickNode::pick(SoPickAction* action) const SbVec3f& dir = line.getDirection(); Base::Vector3f pt(pos[0], pos[1], pos[2]); Base::Vector3f dr(dir[0], dir[1], dir[2]); - Mesh::FacetIndex index; + Mesh::FacetIndex index {}; if (alg.NearestFacetOnRay(pt, dr, *meshGrid, pt, index)) { SoPickedPoint* pp = raypick->addIntersection(SbVec3f(pt.x, pt.y, pt.z)); if (pp) { @@ -439,11 +443,11 @@ void SoFCMeshGridNode::GLRender(SoGLRenderAction* /*action*/) const SbVec3f& min = minGrid.getValue(); const SbVec3f& max = maxGrid.getValue(); const SbVec3s& len = lenGrid.getValue(); - short u, v, w; + short u {}, v {}, w {}; len.getValue(u, v, w); - float minX, minY, minZ; + float minX {}, minY {}, minZ {}; min.getValue(minX, minY, minZ); - float maxX, maxY, maxZ; + float maxX {}, maxY {}, maxZ {}; max.getValue(maxX, maxY, maxZ); float dx = (maxX - minX) / (float)u; float dy = (maxY - minY) / (float)v; @@ -1688,7 +1692,7 @@ void SoFCMeshObjectBoundary::drawLines(const Mesh::MeshObject* mesh) const const MeshCore::MeshFacetArray& rFacets = mesh->getKernel().GetFacets(); // When rendering open edges use the given line width * 3 - GLfloat lineWidth; + GLfloat lineWidth {}; glGetFloatv(GL_LINE_WIDTH, &lineWidth); glLineWidth(3.0f * lineWidth); diff --git a/src/Mod/Mesh/Gui/SoFCMeshObject.h b/src/Mod/Mesh/Gui/SoFCMeshObject.h index 8dd008c233..5ca888c3cd 100644 --- a/src/Mod/Mesh/Gui/SoFCMeshObject.h +++ b/src/Mod/Mesh/Gui/SoFCMeshObject.h @@ -44,6 +44,7 @@ class MeshFacetGrid; namespace MeshGui { +// NOLINTBEGIN(cppcoreguidelines-special-member-functions,cppcoreguidelines-virtual-class-destructor) class MeshGuiExport SoSFMeshObject: public SoSField { using inherited = SoSField; @@ -77,7 +78,9 @@ public: protected: ~SoFCMeshObjectElement() override; - const Mesh::MeshObject* mesh; + +private: + const Mesh::MeshObject* mesh {}; }; // ------------------------------------------------------- @@ -93,7 +96,7 @@ public: SoFCMeshPickNode(); void notify(SoNotList*) override; - SoSFMeshObject mesh; + SoSFMeshObject mesh; // NOLINT void rayPick(SoRayPickAction* action) override; void pick(SoPickAction* action) override; @@ -181,7 +184,7 @@ public: static void initClass(); SoFCMeshObjectShape(); - unsigned int renderTriangleLimit; + unsigned int renderTriangleLimit; // NOLINT protected: void doAction(SoAction* action) override; @@ -299,6 +302,7 @@ protected: private: void drawLines(const Mesh::MeshObject*) const; }; +// NOLINTEND(cppcoreguidelines-special-member-functions,cppcoreguidelines-virtual-class-destructor) } // namespace MeshGui diff --git a/src/Mod/Mesh/Gui/SoPolygon.h b/src/Mod/Mesh/Gui/SoPolygon.h index 0801d99ae2..95e9352c3a 100644 --- a/src/Mod/Mesh/Gui/SoPolygon.h +++ b/src/Mod/Mesh/Gui/SoPolygon.h @@ -35,6 +35,7 @@ namespace MeshGui { +// NOLINTBEGIN class MeshGuiExport SoPolygon: public SoShape { using inherited = SoShape; @@ -60,6 +61,7 @@ protected: private: void drawPolygon(const SbVec3f*, int32_t) const; }; +// NOLINTEND } // namespace MeshGui diff --git a/src/Mod/Mesh/Gui/ViewProvider.cpp b/src/Mod/Mesh/Gui/ViewProvider.cpp index a2dbc6c431..e1759373f3 100644 --- a/src/Mod/Mesh/Gui/ViewProvider.cpp +++ b/src/Mod/Mesh/Gui/ViewProvider.cpp @@ -22,32 +22,32 @@ #include "PreCompiled.h" #ifndef _PreComp_ +#include #include #include -#include #include #include #include #include -#include #include #include #include #include #include #include +#include #include #include -#include #include #include #include #include #include -#include #include +#include #include +#include #endif #include @@ -234,6 +234,7 @@ PROPERTY_SOURCE(MeshGui::ViewProviderMesh, Gui::ViewProviderGeometryObject) ViewProviderMesh::ViewProviderMesh() : highlightMode {HighlighMode::None} { + // NOLINTBEGIN static const char* osgroup = "Object Style"; ADD_PROPERTY_TYPE(LineTransparency, (0), osgroup, App::Prop_None, "Set line transparency."); @@ -334,6 +335,7 @@ ViewProviderMesh::ViewProviderMesh() } Coloring.setStatus(App::Property::Hidden, true); + // NOLINTEND } ViewProviderMesh::~ViewProviderMesh() @@ -850,7 +852,7 @@ bool ViewProviderMesh::createToolMesh(const std::vector& rclPoly, const Base::Vector3f& rcNormal, std::vector& aFaces) { - float fX, fY, fZ; + float fX {}, fY {}, fZ {}; SbVec3f pt1, pt2, pt3, pt4; MeshGeomFacet face; std::vector top, bottom, polygon; @@ -944,10 +946,10 @@ class MeshSplit { public: MeshSplit(ViewProviderMesh* mesh, - const std::vector& poly, + std::vector poly, const Gui::ViewVolumeProjection& proj) : mesh(mesh) - , poly(poly) + , poly(std::move(poly)) , proj(proj) {} void cutMesh() @@ -1001,7 +1003,7 @@ void ViewProviderMesh::clipMeshCallback(void* ud, SoEventCallback* n) view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), clipMeshCallback, ud); n->setHandled(); - Gui::SelectionRole role; + Gui::SelectionRole role {}; std::vector clPoly = view->getGLPolygon(&role); if (clPoly.size() < 3) { return; @@ -1071,7 +1073,7 @@ void ViewProviderMesh::trimMeshCallback(void* ud, SoEventCallback* n) view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), trimMeshCallback, ud); n->setHandled(); - Gui::SelectionRole role; + Gui::SelectionRole role {}; std::vector clPoly = view->getGLPolygon(&role); if (clPoly.size() < 3) { return; @@ -1141,7 +1143,7 @@ void ViewProviderMesh::partMeshCallback(void* ud, SoEventCallback* cb) view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), partMeshCallback, ud); cb->setHandled(); - Gui::SelectionRole role; + Gui::SelectionRole role {}; std::vector clPoly = view->getGLPolygon(&role); if (clPoly.size() < 3) { return; @@ -1214,7 +1216,7 @@ void ViewProviderMesh::segmMeshCallback(void* ud, SoEventCallback* cb) view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), segmMeshCallback, ud); cb->setHandled(); - Gui::SelectionRole role; + Gui::SelectionRole role {}; std::vector clPoly = view->getGLPolygon(&role); if (clPoly.size() < 3) { return; @@ -1291,7 +1293,7 @@ void ViewProviderMesh::selectGLCallback(void* ud, SoEventCallback* n) const SoEvent* ev = n->getEvent(); SbVec2f pos = clPoly[0]; - float pX, pY; + float pX {}, pY {}; pos.getValue(pX, pY); const SbVec2s& sz = view->getSoRenderManager()->getViewportRegion().getViewportSizePixels(); float fRatio = view->getSoRenderManager()->getViewportRegion().getViewportAspectRatio(); @@ -1423,7 +1425,7 @@ void ViewProviderMesh::boxZoom(const SbBox2s& box, const SbViewportRegion& vp, S { SbViewVolume vv = cam->getViewVolume(vp.getViewportAspectRatio()); - short sizeX, sizeY; + short sizeX {}, sizeY {}; box.getSize(sizeX, sizeY); SbVec2s size = vp.getViewportSizePixels(); @@ -1434,7 +1436,7 @@ void ViewProviderMesh::boxZoom(const SbBox2s& box, const SbViewportRegion& vp, S } // Get the new center in normalized pixel coordinates - short xmin, xmax, ymin, ymax; + short xmin {}, xmax {}, ymin {}, ymax {}; box.getBounds(xmin, ymin, xmax, ymax); const SbVec2f center((float)((xmin + xmax) / 2) / (float)std::max((int)(size[0] - 1), 1), (float)(size[1] - (ymin + ymax) / 2) @@ -1525,7 +1527,7 @@ std::vector ViewProviderMesh::getVisibleFacets(const SbViewpor mat->diffuseColor.setNum(count); SbColor* diffcol = mat->diffuseColor.startEditing(); for (uint32_t i = 0; i < count; i++) { - float t; + float t {}; diffcol[i].setPackedValue(i << 8, t); } @@ -2464,8 +2466,10 @@ PROPERTY_SOURCE(MeshGui::ViewProviderIndexedFaceSet, MeshGui::ViewProviderMesh) ViewProviderIndexedFaceSet::ViewProviderIndexedFaceSet() { + // NOLINTBEGIN pcMeshCoord = nullptr; pcMeshFaces = nullptr; + // NOLINTEND } ViewProviderIndexedFaceSet::~ViewProviderIndexedFaceSet() = default; @@ -2558,8 +2562,10 @@ PROPERTY_SOURCE(MeshGui::ViewProviderMeshObject, MeshGui::ViewProviderMesh) ViewProviderMeshObject::ViewProviderMeshObject() { + // NOLINTBEGIN pcMeshNode = nullptr; pcMeshShape = nullptr; + // NOLINTEND } ViewProviderMeshObject::~ViewProviderMeshObject() = default; diff --git a/src/Mod/Mesh/Gui/ViewProvider.h b/src/Mod/Mesh/Gui/ViewProvider.h index 1da1023638..30bda1c157 100644 --- a/src/Mod/Mesh/Gui/ViewProvider.h +++ b/src/Mod/Mesh/Gui/ViewProvider.h @@ -126,7 +126,8 @@ public: ViewProviderMesh(); ~ViewProviderMesh() override; - // Display properties + // NOLINTBEGIN + // Display properties App::PropertyPercent LineTransparency; App::PropertyFloatConstraint LineWidth; App::PropertyFloatConstraint PointSize; @@ -135,6 +136,7 @@ public: App::PropertyBool Coloring; App::PropertyEnumeration Lighting; App::PropertyColor LineColor; + // NOLINTEND void attach(App::DocumentObject*) override; void updateData(const App::Property*) override; diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp index 985cd7ae87..6e1f35104d 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp @@ -22,16 +22,16 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include -#include #include #include #include #include +#include +#include #include -#include #include +#include #include #include #include @@ -73,6 +73,7 @@ PROPERTY_SOURCE(MeshGui::ViewProviderMeshCurvature, Gui::ViewProviderDocumentObj ViewProviderMeshCurvature::ViewProviderMeshCurvature() { + // NOLINTBEGIN pcColorRoot = new SoSeparator(); pcColorRoot->ref(); pcColorMat = new SoMaterial; @@ -86,9 +87,10 @@ ViewProviderMeshCurvature::ViewProviderMeshCurvature() pcColorBar->setRange(-0.5f, 0.5f, 3); pcLinkRoot = new SoGroup; pcLinkRoot->ref(); + // NOLINTEND App::Material mat; - const SbColor* cols; + const SbColor* cols {}; if (pcColorMat->ambientColor.getNum() == 1) { cols = pcColorMat->ambientColor.getValues(0); mat.ambientColor.setPackedValue(cols[0].getPackedValue()); diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.h b/src/Mod/Mesh/Gui/ViewProviderCurvature.h index b1199d8949..483e8cf5dc 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.h +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.h @@ -72,7 +72,9 @@ public: ViewProviderMeshCurvature(); ~ViewProviderMeshCurvature() override; + // NOLINTBEGIN App::PropertyMaterial TextureMaterial; + // NOLINTEND /// Extracts the mesh data from the feature \a pcFeature and creates an Inventor node \a SoNode /// with these data. @@ -115,7 +117,7 @@ private: void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop) override; -protected: +private: SoMaterial* pcColorMat; SoGroup* pcLinkRoot; Gui::SoFCColorBar* pcColorBar; diff --git a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp index 992ce876bd..41f89a5381 100644 --- a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp @@ -35,9 +35,9 @@ #include #include #include +#include #include #include -#include #include "ViewProviderDefects.h" @@ -95,8 +95,10 @@ void ViewProviderMeshDefects::onChanged(const App::Property* prop) ViewProviderMeshOrientation::ViewProviderMeshOrientation() { + // NOLINTBEGIN pcFaces = new SoFaceSet; pcFaces->ref(); + // NOLINTEND } ViewProviderMeshOrientation::~ViewProviderMeshOrientation() @@ -171,8 +173,10 @@ void ViewProviderMeshOrientation::showDefects(const std::vectorref(); + // NOLINTEND } ViewProviderMeshNonManifolds::~ViewProviderMeshNonManifolds() @@ -242,8 +246,10 @@ void ViewProviderMeshNonManifolds::showDefects(const std::vectorref(); + // NOLINTEND } ViewProviderMeshNonManifoldPoints::~ViewProviderMeshNonManifoldPoints() @@ -303,8 +309,10 @@ void ViewProviderMeshNonManifoldPoints::showDefects(const std::vectorref(); + // NOLINTEND } ViewProviderMeshDuplicatedFaces::~ViewProviderMeshDuplicatedFaces() @@ -378,8 +386,10 @@ void ViewProviderMeshDuplicatedFaces::showDefects(const std::vectorref(); + // NOLINTEND } ViewProviderMeshDuplicatedPoints::~ViewProviderMeshDuplicatedPoints() @@ -439,8 +449,10 @@ void ViewProviderMeshDuplicatedPoints::showDefects(const std::vectorref(); + // NOLINTEND } ViewProviderMeshDegenerations::~ViewProviderMeshDegenerations() @@ -548,8 +560,10 @@ void ViewProviderMeshDegenerations::showDefects(const std::vectorref(); + // NOLINTEND } ViewProviderMeshIndices::~ViewProviderMeshIndices() @@ -625,8 +639,10 @@ void ViewProviderMeshIndices::showDefects(const std::vector& ViewProviderMeshSelfIntersections::ViewProviderMeshSelfIntersections() { + // NOLINTBEGIN pcLines = new SoLineSet; pcLines->ref(); + // NOLINTEND } ViewProviderMeshSelfIntersections::~ViewProviderMeshSelfIntersections() @@ -705,8 +721,10 @@ void ViewProviderMeshSelfIntersections::showDefects(const std::vectorref(); + // NOLINTEND } ViewProviderMeshFolds::~ViewProviderMeshFolds() diff --git a/src/Mod/Mesh/Gui/ViewProviderDefects.h b/src/Mod/Mesh/Gui/ViewProviderDefects.h index c94daf67f5..8a06a0a5e5 100644 --- a/src/Mod/Mesh/Gui/ViewProviderDefects.h +++ b/src/Mod/Mesh/Gui/ViewProviderDefects.h @@ -46,8 +46,10 @@ public: ViewProviderMeshDefects(); ~ViewProviderMeshDefects() override; + // NOLINTBEGIN // Display properties App::PropertyFloat LineWidth; + // NOLINTEND // Build up the initial Inventor node void attach(App::DocumentObject* pcFeature) override = 0; @@ -58,8 +60,11 @@ protected: /// get called by the container whenever a property has been changed void onChanged(const App::Property* prop) override; +protected: + // NOLINTBEGIN SoCoordinate3* pcCoords; SoDrawStyle* pcDrawStyle; + // NOLINTEND }; /** The ViewProviderMeshOrientation class displays wrong oriented facets (i.e. flipped normals) in @@ -77,7 +82,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoFaceSet* pcFaces; }; @@ -95,7 +100,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoLineSet* pcLines; }; @@ -113,7 +118,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoPointSet* pcPoints; }; @@ -131,7 +136,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoFaceSet* pcFaces; }; @@ -150,7 +155,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoLineSet* pcLines; }; @@ -165,7 +170,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoPointSet* pcPoints; }; @@ -180,7 +185,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoFaceSet* pcFaces; }; @@ -198,7 +203,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoLineSet* pcLines; }; @@ -213,7 +218,7 @@ public: void attach(App::DocumentObject* pcFeature) override; void showDefects(const std::vector&) override; -protected: +private: SoFaceSet* pcFaces; }; diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp index 53e62186e5..7ddb233844 100644 --- a/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderMeshFaceSet.cpp @@ -35,13 +35,13 @@ #include #include #include +#include #include #include -#include +#include "ViewProviderMeshFaceSet.h" #include "SoFCIndexedFaceSet.h" #include "SoFCMeshObject.h" -#include "ViewProviderMeshFaceSet.h" using namespace MeshGui; @@ -50,6 +50,7 @@ PROPERTY_SOURCE(MeshGui::ViewProviderMeshFaceSet, MeshGui::ViewProviderMesh) ViewProviderMeshFaceSet::ViewProviderMeshFaceSet() { + // NOLINTBEGIN directRendering = false; triangleCount = 2500000; @@ -67,6 +68,7 @@ ViewProviderMeshFaceSet::ViewProviderMeshFaceSet() SoFCMaterialEngine* engine = new SoFCMaterialEngine(); engine->diffuseColor.connectFrom(&pcShapeMaterial->diffuseColor); pcMeshFaces->updateGLArray.connectFrom(&engine->trigger); + // NOLINTEND } ViewProviderMeshFaceSet::~ViewProviderMeshFaceSet() diff --git a/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp b/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp index 3e5d4c9344..44f5efc025 100644 --- a/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderMeshPyImp.cpp @@ -25,12 +25,10 @@ #include #endif -// clang-format off #include "ViewProvider.h" // inclusion of the generated files (generated out of ViewProviderMeshPy.xml) #include "ViewProviderMeshPy.h" #include "ViewProviderMeshPy.cpp" -// clang-format on using namespace MeshGui; @@ -46,7 +44,7 @@ std::string ViewProviderMeshPy::representation() const PyObject* ViewProviderMeshPy::setSelection(PyObject* args) { - PyObject* obj; + PyObject* obj {}; if (!PyArg_ParseTuple(args, "O", &obj)) { return nullptr; } @@ -67,7 +65,7 @@ PyObject* ViewProviderMeshPy::setSelection(PyObject* args) PyObject* ViewProviderMeshPy::addSelection(PyObject* args) { - PyObject* obj; + PyObject* obj {}; if (!PyArg_ParseTuple(args, "O", &obj)) { return nullptr; } @@ -88,7 +86,7 @@ PyObject* ViewProviderMeshPy::addSelection(PyObject* args) PyObject* ViewProviderMeshPy::removeSelection(PyObject* args) { - PyObject* obj; + PyObject* obj {}; if (!PyArg_ParseTuple(args, "O", &obj)) { return nullptr; } @@ -131,7 +129,7 @@ PyObject* ViewProviderMeshPy::clearSelection(PyObject* args) PyObject* ViewProviderMeshPy::highlightSegments(PyObject* args) { - PyObject* list; + PyObject* list {}; if (!PyArg_ParseTuple(args, "O", &list)) { return nullptr; } diff --git a/src/Mod/Mesh/Gui/ViewProviderTransform.cpp b/src/Mod/Mesh/Gui/ViewProviderTransform.cpp index 7c8e21b035..a451c2a26d 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransform.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderTransform.cpp @@ -42,8 +42,10 @@ PROPERTY_SOURCE(MeshGui::ViewProviderMeshTransform, MeshGui::ViewProviderMesh) ViewProviderMeshTransform::ViewProviderMeshTransform() { + // NOLINTBEGIN pcTransformerDragger = new SoTransformerManip(); pcTransformerDragger->ref(); + // NOLINTEND } ViewProviderMeshTransform::~ViewProviderMeshTransform() diff --git a/src/Mod/Mesh/Gui/ViewProviderTransform.h b/src/Mod/Mesh/Gui/ViewProviderTransform.h index 29032671bc..746fdcc716 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransform.h +++ b/src/Mod/Mesh/Gui/ViewProviderTransform.h @@ -70,7 +70,7 @@ public: /// Update the Mesh representation void updateData(const App::Property*) override; -protected: +private: SoTransformerManip* pcTransformerDragger; }; diff --git a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp index dd37366bff..99025b5df0 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp @@ -54,10 +54,12 @@ PROPERTY_SOURCE(MeshGui::ViewProviderMeshTransformDemolding, MeshGui::ViewProvid ViewProviderMeshTransformDemolding::ViewProviderMeshTransformDemolding() { + // NOLINTBEGIN pcTrackballDragger = new SoTrackballDragger; pcTrackballDragger->ref(); pcTransformDrag = nullptr; pcColorMat = nullptr; + // NOLINTEND } ViewProviderMeshTransformDemolding::~ViewProviderMeshTransformDemolding() diff --git a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h index b2f47ee312..f8c7dac8c0 100644 --- a/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h +++ b/src/Mod/Mesh/Gui/ViewProviderTransformDemolding.h @@ -82,6 +82,7 @@ protected: static void sDragEndCallback(void*, SoDragger*); void DragEndCallback(); +private: SoTrackballDragger* pcTrackballDragger; SoTransform* pcTransformDrag; SoMaterial* pcColorMat; diff --git a/src/Mod/Mesh/Gui/Workbench.cpp b/src/Mod/Mesh/Gui/Workbench.cpp index 06fd6cf689..b98251efba 100644 --- a/src/Mod/Mesh/Gui/Workbench.cpp +++ b/src/Mod/Mesh/Gui/Workbench.cpp @@ -63,6 +63,7 @@ public: MeshInfoWatcher() : TaskWatcher(nullptr) { + // NOLINTBEGIN labelPoints = new QLabel(); labelPoints->setText(tr("Number of points:")); @@ -80,6 +81,7 @@ public: numMin = new QLabel(); numMax = new QLabel(); + // NOLINTEND QGroupBox* box = new QGroupBox(); box->setTitle(tr("Mesh info box")); diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index 6ee9deb4eb..32c62ef6fe 100644 --- a/src/Mod/MeshPart/App/CMakeLists.txt +++ b/src/Mod/MeshPart/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppMeshPart -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if (BUILD_SMESH) add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO) endif(BUILD_SMESH) diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt index 56f9ee26af..fa5f7a4928 100644 --- a/src/Mod/MeshPart/Gui/CMakeLists.txt +++ b/src/Mod/MeshPart/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if (BUILD_SMESH) add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO) endif(BUILD_SMESH) diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD.ts index 39057698b9..46c98e24df 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD.ts @@ -95,70 +95,70 @@ - + The path to the directory for transferring files to and from OpenSCAD - + OpenSCAD export - + Maximum fragment size - + angle (fa) - + Convexity - - + + Minimum angle for a fragment - - + + Minimum size of a fragment - + size (fs) - + mm - + Mesh fallback - - + + Deflection - + deflection - + Triangulation settings diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_be.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_be.ts index 135a95a4c3..172d695146 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_be.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_be.ts @@ -95,70 +95,70 @@ Каталог перадачы дадзеных - + The path to the directory for transferring files to and from OpenSCAD Шлях да каталогу для перадачы файлаў у і з OpenSCAD - + OpenSCAD export Экспарт OpenSCAD - + Maximum fragment size Найбольшы памер фрагменту - + angle (fa) вугал (fa) - + Convexity Выпукласць - - + + Minimum angle for a fragment Найменшы вугал фрагменту - - + + Minimum size of a fragment Найменшы памер фрагменту - + size (fs) памер (fs) - + mm мм - + Mesh fallback Адмена паліганальнай сеткі - - + + Deflection Адхіленне - + deflection адхіленне - + Triangulation settings Налады трыянгуляцыі diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ca.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ca.ts index 24baff7d8e..ad8578ca31 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ca.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ca.ts @@ -95,70 +95,70 @@ Directori de transferència - + The path to the directory for transferring files to and from OpenSCAD El camí al directori on transferir fitxers a l'OpenSCAD i des de l'OpenSCAD - + OpenSCAD export Exportar a OpenSCAD - + Maximum fragment size Mida màxima del fragment - + angle (fa) angle (fa) - + Convexity Convexitat - - + + Minimum angle for a fragment Angle mínim per un fragment - - + + Minimum size of a fragment Mida mínima d'un fragment - + size (fs) mida (fs) - + mm mm - + Mesh fallback Malla de recolzament - - + + Deflection Deflecció - + deflection deflecció - + Triangulation settings Configuració de triangulació diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_cs.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_cs.ts index 4bd3316f57..b6bee40ca1 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_cs.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_cs.ts @@ -95,70 +95,70 @@ Adresář převodu - + The path to the directory for transferring files to and from OpenSCAD Cesta k adresáři pro přenos souborů do az OpenSCAD - + OpenSCAD export OpenSCAD export - + Maximum fragment size Maximální velikost fragmentu - + angle (fa) úhel (fa) - + Convexity Konvexnost - - + + Minimum angle for a fragment Minimální úhel pro fragment - - + + Minimum size of a fragment Minimální velikost fragmentu - + size (fs) Velikost (fs) - + mm mm - + Mesh fallback Nouzová síť - - + + Deflection Průhyb - + deflection průhyb - + Triangulation settings Nastavení triangulace diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_de.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_de.ts index 85120a986b..ce3fa682f4 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_de.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_de.ts @@ -95,70 +95,70 @@ Übertragungsverzeichnis - + The path to the directory for transferring files to and from OpenSCAD Der Pfad zum Verzeichnis für die Übertragung von Dateien zu und von OpenSCAD - + OpenSCAD export OpenSCAD Export - + Maximum fragment size Maximale Fragmentgröße - + angle (fa) Winkel (font awesome? Bracket?) - + Convexity Konvexität - - + + Minimum angle for a fragment Minimaler Winkel für ein Fragment - - + + Minimum size of a fragment Mindestgröße eines Fragments - + size (fs) Größe (fs) - + mm mm - + Mesh fallback Netz-Element Notfalllösung - - + + Deflection Durchbiegung - + deflection Durchbiegung - + Triangulation settings Triangulationseinstellungen diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_el.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_el.ts index a05d244cdf..c50523724f 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_el.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_el.ts @@ -95,70 +95,70 @@ Ευρετήριο χρήστη - + The path to the directory for transferring files to and from OpenSCAD Η διαδρομή προς τον κατάλογο για τη μεταφορά αρχείων από και προς το OpenSCAD - + OpenSCAD export Εξαγωγή OpenSCAD - + Maximum fragment size Μέγιστο μέγεθος τεμαχίου - + angle (fa) γωνία (fa) - + Convexity Κυρτότητα - - + + Minimum angle for a fragment Ελάχιστη γωνία για ένα τμήμα - - + + Minimum size of a fragment Ελάχιστο μέγεθος για ένα τμήμα - + size (fs) μέγεθος (fs) - + mm χιλιοστά - + Mesh fallback Εφεδρικό πλέγμα - - + + Deflection Εκτροπή - + deflection εκτροπή - + Triangulation settings Ρυθμίσεις τριγωνοποίησης diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_es-AR.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_es-AR.ts index 2d2a2a08fd..c0ad0225e2 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_es-AR.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_es-AR.ts @@ -95,70 +95,70 @@ Directorio de transferencia - + The path to the directory for transferring files to and from OpenSCAD La ruta al directorio para transferir archivos desde y hacia OpenSCAD - + OpenSCAD export Exportación OpenSCAD - + Maximum fragment size Tamaño máximo del fragmento - + angle (fa) ángulo (fa) - + Convexity Convexidad - - + + Minimum angle for a fragment Ángulo mínimo para un fragmento - - + + Minimum size of a fragment Tamaño mínimo de un fragmento - + size (fs) tamaño (fs) - + mm mm - + Mesh fallback Malla de reserva - - + + Deflection Deflexión - + deflection deflexión - + Triangulation settings Configuración de triangulación diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_es-ES.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_es-ES.ts index d903a5119c..9855e76ec6 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_es-ES.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_es-ES.ts @@ -95,70 +95,70 @@ Directorio de transferencia - + The path to the directory for transferring files to and from OpenSCAD La ruta al directorio para transferir archivos desde y hacia OpenSCAD - + OpenSCAD export Exportación OpenSCAD - + Maximum fragment size Tamaño máximo del fragmento - + angle (fa) ángulo (fa) - + Convexity Convexidad - - + + Minimum angle for a fragment Ángulo mínimo de un fragmento - - + + Minimum size of a fragment Tamaño mínimo de un fragmento - + size (fs) tamaño (fs) - + mm mm - + Mesh fallback Respaldo de malla - - + + Deflection Deflexión - + deflection deflexión - + Triangulation settings Configuración de triangulación diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_eu.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_eu.ts index 9433d9993f..34ec9aa30e 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_eu.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_eu.ts @@ -95,70 +95,70 @@ Transferentzia-direktorioa - + The path to the directory for transferring files to and from OpenSCAD Fitxategiak OpenSCADetik eta OpenSCADera transferitzeko direktorioaren bide-izena - + OpenSCAD export OpenSCAD esportazioa - + Maximum fragment size Zati-tamaina maximoa - + angle (fa) angelua (fa) - + Convexity Ganbiltasuna - - + + Minimum angle for a fragment Zati baten angelu minimoa - - + + Minimum size of a fragment Zati baten tamaina minimoa - + size (fs) tamaina (fs) - + mm mm - + Mesh fallback Amaraunaren ordezkoa - - + + Deflection Makurdura - + deflection makurdura - + Triangulation settings Triangelaketa-ezarpenak diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_fi.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_fi.ts index 9d3dc858d8..404c6dec76 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_fi.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_fi.ts @@ -95,70 +95,70 @@ Transfer directory - + The path to the directory for transferring files to and from OpenSCAD The path to the directory for transferring files to and from OpenSCAD - + OpenSCAD export OpenSCAD-vienti - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment Pienin palassa oleva kulman sallittu arvo - - + + Minimum size of a fragment Palan pienin koko - + size (fs) koko (fs) - + mm mm - + Mesh fallback Ongelmatilanteessa luo verkkopinta - - + + Deflection Taipuma - + deflection taipuma - + Triangulation settings Kolmiomittausasetukset diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_fr.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_fr.ts index 9c8a97c8a1..6929910f7c 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_fr.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_fr.ts @@ -95,70 +95,70 @@ Répertoire de transfert - + The path to the directory for transferring files to and from OpenSCAD Le chemin d'accès au répertoire pour le transfert des fichiers vers et depuis OpenSCAD - + OpenSCAD export Exportation OpenSCAD - + Maximum fragment size Taille maximale de fragment - + angle (fa) angle (fa) - + Convexity Convexité - - + + Minimum angle for a fragment Angle minimal d'un fragment - - + + Minimum size of a fragment Taille minimale d'un fragment - + size (fs) taille (fs) - + mm mm - + Mesh fallback Maillage de secours - - + + Deflection Déflexion - + deflection déflexion - + Triangulation settings Paramètres de triangulation diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_gl.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_gl.ts index ad8c438065..782b4169ab 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_gl.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_gl.ts @@ -95,70 +95,70 @@ Transfer directory - + The path to the directory for transferring files to and from OpenSCAD The path to the directory for transferring files to and from OpenSCAD - + OpenSCAD export Exportar OpenSCAD - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment Ángulo mínimo para un fragmento - - + + Minimum size of a fragment Tamaño mínimo dun fragmento - + size (fs) tamaño (fs) - + mm mm - + Mesh fallback Malla de seguridade - - + + Deflection Deflexión - + deflection deflexión - + Triangulation settings Configuración da triangulación diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_hr.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_hr.ts index 2d77e7b672..f674fc4afc 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_hr.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_hr.ts @@ -95,70 +95,70 @@ Direktorij prijenosa - + The path to the directory for transferring files to and from OpenSCAD Put do direktorija za prijenos datoteka ui iz OpenSCAD-a - + OpenSCAD export OpenSCAD izvoz - + Maximum fragment size Maksimalna veličina fragmenta - + angle (fa) kut (fa) - + Convexity Konveksnost - - + + Minimum angle for a fragment Minimalni kut fragmenta - - + + Minimum size of a fragment Minimalna veličina fragmenta - + size (fs) veličina (fn) - + mm mm - + Mesh fallback Mesh rezervni plan - - + + Deflection Defleksija - + deflection defleksija - + Triangulation settings Opcije stvaranja Mesh-a diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_hu.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_hu.ts index fbba7f00a6..5dc9cbbed5 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_hu.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_hu.ts @@ -95,70 +95,70 @@ Átviteli könyvtár - + The path to the directory for transferring files to and from OpenSCAD Fájlok OpenSCAD-be és onnan történő feltöltésének könyvtári elérési útja - + OpenSCAD export OpenSCAD export - + Maximum fragment size A töredék maximum mérete - + angle (fa) szög (fok) - + Convexity Domborúság - - + + Minimum angle for a fragment Minimális szög egy részlethez - - + + Minimum size of a fragment Minimális méret egy részlethez - + size (fs) méret (fs) - + mm mm - + Mesh fallback Háló visszamaradás - - + + Deflection Kiöblösödés - + deflection kiöblösödés - + Triangulation settings Háromszögelési beállítások diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_id.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_id.ts index 8b6c7c661d..6bcd5b4740 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_id.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_id.ts @@ -95,70 +95,70 @@ Transfer directory - + The path to the directory for transferring files to and from OpenSCAD The path to the directory for transferring files to and from OpenSCAD - + OpenSCAD export Ekspor OpenSCAD - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment Sudut minimum untuk fragmen - - + + Minimum size of a fragment Minimum ukuran dari fragmen - + size (fs) ukuran (fs) - + mm mm - + Mesh fallback Mesh fallback - - + + Deflection Defleksi - + deflection defleksi - + Triangulation settings Pengaturan triangulasi diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_it.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_it.ts index 46a2c7b21f..1ab6b990a4 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_it.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_it.ts @@ -95,70 +95,70 @@ Directory di trasferimento - + The path to the directory for transferring files to and from OpenSCAD Percorso della directory per il trasferimento di file da e verso OpenSCAD - + OpenSCAD export Esportazione OpenSCAD - + Maximum fragment size Dimensione massima del frammento - + angle (fa) angolo (fa) - + Convexity Convessità - - + + Minimum angle for a fragment Angolo minimo per un frammento - - + + Minimum size of a fragment Dimensione minima di un frammento - + size (fs) dimensione (fs) - + mm mm - + Mesh fallback Rete di riserva - - + + Deflection Deflessione - + deflection deflessione - + Triangulation settings Impostazioni di triangolazione diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ja.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ja.ts index 087ca6b472..6676f16286 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ja.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ja.ts @@ -95,70 +95,70 @@ 転送ディレクトリ - + The path to the directory for transferring files to and from OpenSCAD OpenSCAD とファイルをやりとりするためのディレクトリのパス - + OpenSCAD export OpenSCADへエクスポート - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment フラグメントの最小角度 - - + + Minimum size of a fragment フラグメントの最小サイズ - + size (fs) サイズ（fs） - + mm mm - + Mesh fallback メッシュフォールバック - - + + Deflection 偏差 - + deflection 偏差 - + Triangulation settings 三角形分割設定 diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ka.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ka.ts index f9748633eb..834cc24dd5 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ka.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ka.ts @@ -95,70 +95,70 @@ გაგზავნის საქაღალდე - + The path to the directory for transferring files to and from OpenSCAD OpenSCAD-თან ფაილების მიმოცვლის საქაღალდე - + OpenSCAD export OpenSCAD-ის გატანა - + Maximum fragment size ფრაგმენტის მაქსიმალური ზომა - + angle (fa) კუთხე (fa) - + Convexity ამობურცულობა - - + + Minimum angle for a fragment დრაგმენტის მინიმალური კუთხე - - + + Minimum size of a fragment ფრაგმენტის მინიმალური ზომა - + size (fs) ზომა (fs) - + mm მმ - + Mesh fallback მრავალკუთხა ბადის გაუქმება - - + + Deflection გამრუდება - + deflection გამრუდება - + Triangulation settings ტრიანგულაციის მორგება diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ko.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ko.ts index 29d52c173c..70aa19786b 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ko.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ko.ts @@ -95,70 +95,70 @@ 디렉터리 전송하기 - + The path to the directory for transferring files to and from OpenSCAD OpenSCAD로 파일을 전송하거나 OpenSCAD에서 파일을 전송하기 위한 디렉터리 경로 - + OpenSCAD export OpenSCAD로 내보내기 - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment 조각의 최소 각도 - - + + Minimum size of a fragment 프래그먼트의 최소 크기 - + size (fs) 크기 (fs) - + mm mm - + Mesh fallback 메시 대체 - - + + Deflection 편향 - + deflection 편향 - + Triangulation settings 삼각 측량 설정 diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_nl.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_nl.ts index 40ec3c077d..e9fc04640b 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_nl.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_nl.ts @@ -95,70 +95,70 @@ Transfer directory - + The path to the directory for transferring files to and from OpenSCAD Het pad naar de map voor het overzetten van bestanden van en naar OpenSCAD - + OpenSCAD export OpenSCAD export - + Maximum fragment size Maximale fragment grootte - + angle (fa) hoek (fa) - + Convexity Convexiteit - - + + Minimum angle for a fragment Minimale hoek voor een fragment - - + + Minimum size of a fragment Minimale grootte van een fragment - + size (fs) grootte (fs) - + mm mm - + Mesh fallback Reservemesh - - + + Deflection Deflectie - + deflection deflectie - + Triangulation settings Triangulatie instellingen diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pl.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pl.ts index 3aba548225..45ea1bb09e 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pl.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pl.ts @@ -95,70 +95,70 @@ Katalog transferu - + The path to the directory for transferring files to and from OpenSCAD Ścieżka do katalogu do przesyłania plików do i z OpenSCAD - + OpenSCAD export Eksport do OpenSCAD - + Maximum fragment size Maksymalny rozmiar fragmentu - + angle (fa) kąt (fa) - + Convexity Wypukłość - - + + Minimum angle for a fragment Wartość minimalna kąta dla fragmentu - - + + Minimum size of a fragment Wartość minimalna rozmiaru fragmentu - + size (fs) rozmiar (fs) - + mm mm - + Mesh fallback Zastępowanie siatką - - + + Deflection Odkształcenie - + deflection odkształcenie - + Triangulation settings Ustawienia triangulacji diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pt-BR.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pt-BR.ts index 459963912b..a4082285ed 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pt-BR.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pt-BR.ts @@ -95,70 +95,70 @@ Diretório de transferência - + The path to the directory for transferring files to and from OpenSCAD O caminho para o diretório para transferir arquivos de e para o OpenSCAD - + OpenSCAD export Exportação OpenSCAD - + Maximum fragment size Tamanho máximo de um fragmento - + angle (fa) ângulo (graus) - + Convexity Convexidade - - + + Minimum angle for a fragment Ângulo mínimo para um fragmento - - + + Minimum size of a fragment Tamanho mínimo de um fragmento - + size (fs) tamanho (fs) - + mm mm - + Mesh fallback Malha de socorro - - + + Deflection Deflexão - + deflection deflexão - + Triangulation settings Configurações de triangulação diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pt-PT.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pt-PT.ts index d32556c6e6..45f7eb0a05 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pt-PT.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_pt-PT.ts @@ -95,70 +95,70 @@ Transfer directory - + The path to the directory for transferring files to and from OpenSCAD The path to the directory for transferring files to and from OpenSCAD - + OpenSCAD export Exportar OpenSCAD - + Maximum fragment size Maximum fragment size - + angle (fa) ângulo (graus) - + Convexity Convexity - - + + Minimum angle for a fragment Ângulo mínimo para um fragmento - - + + Minimum size of a fragment Tamanho mínimo de um fragmento - + size (fs) tamanho (fs) - + mm mm - + Mesh fallback Malha de emergência - - + + Deflection Deflexão - + deflection deflexão - + Triangulation settings Definições de Triangulação diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ro.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ro.ts index 4b92d43438..46bfd24f1a 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ro.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ro.ts @@ -95,70 +95,70 @@ Directorul pentru transferuri - + The path to the directory for transferring files to and from OpenSCAD Calea către director pentru transferul fişierelor către şi de la OpenSCAD - + OpenSCAD export Export OpenSCAD - + Maximum fragment size Mărimea maximă a fragmentului - + angle (fa) angle (fa) - + Convexity Convenție - - + + Minimum angle for a fragment Unghiul minim pentru un fragment - - + + Minimum size of a fragment Marimea minima a unui fragment - + size (fs) marime (fs) - + mm mm - + Mesh fallback Retea de rezerva - - + + Deflection Deformarea - + deflection deformarea - + Triangulation settings Setari pentru triangulatie diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ru.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ru.ts index ac15f40b5c..f9a378c90b 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ru.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_ru.ts @@ -95,70 +95,70 @@ Каталог передачи - + The path to the directory for transferring files to and from OpenSCAD Путь к каталогу для передачи файлов в и из OpenSCAD - + OpenSCAD export Экспорт в OpenSCAD - + Maximum fragment size Максимальный размер фрагмента - + angle (fa) угол (fa) - + Convexity Выпуклость - - + + Minimum angle for a fragment Минимальный угол фрагмента - - + + Minimum size of a fragment Минимальный размер фрагмента - + size (fs) размер (fs) - + mm мм - + Mesh fallback Отмена полигональной сетки - - + + Deflection Прогиб - + deflection прогиб - + Triangulation settings Параметры триангуляции diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sl.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sl.ts index d01d0af6a0..0e3ba4b8db 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sl.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sl.ts @@ -95,70 +95,70 @@ Mapa prenosa - + The path to the directory for transferring files to and from OpenSCAD Pot do mape, namenjene prenosu datotek v OpenSCAD in iz njega - + OpenSCAD export Izvozi OpenSCAD - + Maximum fragment size Največja velikost delčka - + angle (fa) kot (fa) - + Convexity Izbočenost - - + + Minimum angle for a fragment Najmanjši kot delčka - - + + Minimum size of a fragment Najmanjša velikost delčka - + size (fs) velikost (fs) - + mm mm - + Mesh fallback Alternativno kot mreža - - + + Deflection Odklon - + deflection odklon - + Triangulation settings Nastavitve tritrikotenja diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sr-CS.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sr-CS.ts index eeeecbe39b..86dffb1fd1 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sr-CS.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sr-CS.ts @@ -95,70 +95,70 @@ Fascikla za prebacivanje - + The path to the directory for transferring files to and from OpenSCAD Putanja do fascikle za prenos datoteka u i iz OpenSCAD-a - + OpenSCAD export OpenSCAD izvoz - + Maximum fragment size Maksimalna veličina fragmenta - + angle (fa) angle (fa) - + Convexity Konveksnost - - + + Minimum angle for a fragment Minimalni ugao fragmenta - - + + Minimum size of a fragment Minimalna veličina fragmenta - + size (fs) veličina (fs) - + mm mm - + Mesh fallback Zamenska mreža - - + + Deflection Ugib - + deflection ugib - + Triangulation settings Podešavanja triangulacije diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sr.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sr.ts index a0a390cd60..42c7d78b01 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sr.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sr.ts @@ -95,70 +95,70 @@ Фасцикла за пребацивање - + The path to the directory for transferring files to and from OpenSCAD Путања до фасцикле за пренос датотека у и из OpenSCAD-а - + OpenSCAD export OpenSCAD извоз - + Maximum fragment size Макcимална величина фрагмената - + angle (fa) angle (fa) - + Convexity Конвекcноcт - - + + Minimum angle for a fragment Минимални угао фрагмента - - + + Minimum size of a fragment Минимална величина фрагмента - + size (fs) величина (fs) - + mm мм - + Mesh fallback Заменска мрежа - - + + Deflection Угиб - + deflection угиб - + Triangulation settings Подешавања триангулације diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sv-SE.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sv-SE.ts index 88e943d0a3..80897a6ea6 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sv-SE.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_sv-SE.ts @@ -95,70 +95,70 @@ Transfer directory - + The path to the directory for transferring files to and from OpenSCAD The path to the directory for transferring files to and from OpenSCAD - + OpenSCAD export OpenSCAD-exportering - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment Minsta vinkel för ett fragment - - + + Minimum size of a fragment Minsta storlek för ett fragment - + size (fs) storlek (fs) - + mm mm - + Mesh fallback Nätreserv - - + + Deflection Avvikning - + deflection avvikning - + Triangulation settings Trianguleringsinställningar diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_tr.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_tr.ts index f20ff052ca..961dfafaf8 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_tr.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_tr.ts @@ -95,70 +95,70 @@ Transfer dizini - + The path to the directory for transferring files to and from OpenSCAD OpenSCAD ile dosya alışverişi için dizin yolu - + OpenSCAD export OpenSCAD çıkart - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment Bir parçanın minimum açısı - - + + Minimum size of a fragment Bir parçanın minimum boyutu - + size (fs) boyut (fs) - + mm mm - + Mesh fallback Örgü geri dönüşümü - - + + Deflection Sapma - + deflection sapma - + Triangulation settings Üçgenleme ayarları diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_uk.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_uk.ts index 6099aae6d0..97f9a6db0f 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_uk.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_uk.ts @@ -95,70 +95,70 @@ Каталог користувача - + The path to the directory for transferring files to and from OpenSCAD Шлях до каталогу для перенесення файлів в OpenSCAD - + OpenSCAD export OpenSCAD експорт - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Опуклість - - + + Minimum angle for a fragment Мінімальний кут для фрагменту - - + + Minimum size of a fragment Мінімальний розмір фрагменту - + size (fs) Розмір (fs) - + mm мм - + Mesh fallback Скасувати зміни сітки - - + + Deflection Відхилення - + deflection відхилення - + Triangulation settings Налаштування тріангуляції diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_val-ES.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_val-ES.ts index 5b03214cbd..32b059d301 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_val-ES.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_val-ES.ts @@ -95,70 +95,70 @@ Transfer directory - + The path to the directory for transferring files to and from OpenSCAD The path to the directory for transferring files to and from OpenSCAD - + OpenSCAD export Exportació a OpenSCAD - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment Angle mínim d'un fragment - - + + Minimum size of a fragment Mida mínima d'un fragment - + size (fs) mida (fs) - + mm mm - + Mesh fallback Malla de recolzament - - + + Deflection Deflexió - + deflection deflexió - + Triangulation settings Paràmetres de triangulació diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_zh-CN.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_zh-CN.ts index 9366cf29bf..c6af1c7de7 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_zh-CN.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_zh-CN.ts @@ -95,70 +95,70 @@ 转移目录 - + The path to the directory for transferring files to and from OpenSCAD 用于在OpenSCAD之间转移文件的目录路径 - + OpenSCAD export OpenSCAD导出 - + Maximum fragment size 最大片段大小 - + angle (fa) angle (fa) - + Convexity 凸性 - - + + Minimum angle for a fragment 片段的最小角度 - - + + Minimum size of a fragment 片段最小尺寸 - + size (fs) 尺寸(fs) - + mm mm - + Mesh fallback 网格退缩 - - + + Deflection 挠度 - + deflection 挠度 - + Triangulation settings 三角剖分设置 diff --git a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_zh-TW.ts b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_zh-TW.ts index ab50384f3d..5a4a80c511 100644 --- a/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_zh-TW.ts +++ b/src/Mod/OpenSCAD/Resources/translations/OpenSCAD_zh-TW.ts @@ -95,70 +95,70 @@ Transfer directory - + The path to the directory for transferring files to and from OpenSCAD The path to the directory for transferring files to and from OpenSCAD - + OpenSCAD export 匯出 OpenSCAD - + Maximum fragment size Maximum fragment size - + angle (fa) angle (fa) - + Convexity Convexity - - + + Minimum angle for a fragment 片段的最小角度 - - + + Minimum size of a fragment 片段的最小大小 - + size (fs) 尺寸(fs) - + mm mm - + Mesh fallback 網格退縮 - - + + Deflection 偏斜 - + deflection 偏斜 - + Triangulation settings 三角測量設定 diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index 874ab6ccb0..5b8721764b 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppPart -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if(FREETYPE_FOUND) add_definitions(-DFCUseFreeType) endif(FREETYPE_FOUND) diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index fbaef82d4b..90af3b7a20 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -77,12 +77,14 @@ #include "ViewProviderSpline.h" #include "ViewProviderTorusParametric.h" #include "Workbench.h" +#include "WorkbenchManipulator.h" // use a different name to CreateCommand() void CreatePartCommands(); void CreateSimplePartCommands(); void CreateParamPartCommands(); +void CreatePartSelectCommands(); void loadPartResource() { @@ -149,6 +151,7 @@ PyMOD_INIT_FUNC(PartGui) Py_INCREF(pAttachEngineTextsModule); PyModule_AddObject(partGuiModule, "AttachEngineResources", pAttachEngineTextsModule); + // clang-format off PartGui::PropertyEnumAttacherItem ::init(); PartGui::SoBrepFaceSet ::initClass(); PartGui::SoBrepEdgeSet ::initClass(); @@ -212,11 +215,15 @@ PyMOD_INIT_FUNC(PartGui) PartGui::ArcEngine ::initClass(); PartGui::Workbench ::init(); + auto manip = std::make_shared(); + Gui::WorkbenchManipulator::installManipulator(manip); + // clang-format on // instantiating the commands CreatePartCommands(); CreateSimplePartCommands(); CreateParamPartCommands(); + CreatePartSelectCommands(); try{ Py::Object ae = Base::Interpreter().runStringObject("__import__('AttachmentEditor.Commands').Commands"); Py::Module(partGuiModule).setAttr(std::string("AttachmentEditor"),ae); @@ -239,8 +246,6 @@ PyMOD_INIT_FUNC(PartGui) // add resources and reloads the translators loadPartResource(); - Gui::Workbench::addPermanentMenuItem("Part_SectionCut", "Std_ToggleClipPlane"); - // register bitmaps // Gui::BitmapFactoryInst& rclBmpFactory = Gui::BitmapFactory(); // rclBmpFactory.addXPM("Part_Feature",(const char**) PartFeature_xpm); diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index 75c3206929..46505f716a 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src @@ -84,6 +78,7 @@ SET(PartGui_SRCS BoxSelection.cpp BoxSelection.h Command.cpp + CommandFilter.cpp CommandSimple.cpp CommandParametric.cpp CrossSections.cpp @@ -224,6 +219,8 @@ SET(PartGui_SRCS ViewProviderPrimitive.h Workbench.cpp Workbench.h + WorkbenchManipulator.cpp + WorkbenchManipulator.h ReferenceHighlighter.cpp ReferenceHighlighter.h SectionCutting.cpp diff --git a/src/Mod/Part/Gui/CommandFilter.cpp b/src/Mod/Part/Gui/CommandFilter.cpp new file mode 100644 index 0000000000..8146922e0c --- /dev/null +++ b/src/Mod/Part/Gui/CommandFilter.cpp @@ -0,0 +1,273 @@ +/*************************************************************************** + * Copyright (c) 2002 Jürgen Riegel * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +#include +#include +#endif + +#include +#include +#include +#include +#include + +//=============================================================================== +// PartCmdSelectFilter (dropdown toolbar button for Vertex, Edge & Face Selection) +//=============================================================================== + +DEF_STD_CMD_ACL(PartCmdSelectFilter) + +PartCmdSelectFilter::PartCmdSelectFilter() + : Command("Part_SelectFilter") +{ + sGroup = "Standard-View"; + sMenuText = QT_TR_NOOP("Selection filter"); + sToolTipText = QT_TR_NOOP("Change the Selection filter"); + sStatusTip = QT_TR_NOOP("Change the Selection filter"); + sWhatsThis = "Part_SelectFilter"; + sPixmap = "selection-filter"; + eType = Alter3DView; +} + +void PartCmdSelectFilter::activated(int iMsg) +{ + Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); + if (iMsg==0) { + rcCmdMgr.runCommandByName("Part_VertexSelection"); + } + else if (iMsg==1) { + rcCmdMgr.runCommandByName("Part_EdgeSelection"); + } + else if (iMsg==2) { + rcCmdMgr.runCommandByName("Part_FaceSelection"); + } + else if (iMsg==3) { + rcCmdMgr.runCommandByName("Part_RemoveSelectionGate"); + } + else { + return; + } + + // Since the default icon is reset when enabling/disabling the command we have + // to explicitly set the icon of the used command. + auto pcAction = qobject_cast(_pcAction); + QList act = pcAction->actions(); + + assert(iMsg < act.size()); + pcAction->setIcon(act[iMsg]->icon()); +} + +Gui::Action * PartCmdSelectFilter::createAction() +{ + auto pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); + pcAction->setDropDownMenu(true); + applyCommandData(this->className(), pcAction); + + QAction* cmd0 = pcAction->addAction(QString()); + cmd0->setIcon(Gui::BitmapFactory().iconFromTheme("vertex-selection")); + cmd0->setShortcut(QKeySequence(QString::fromUtf8("X,S"))); + QAction* cmd1 = pcAction->addAction(QString()); + cmd1->setIcon(Gui::BitmapFactory().iconFromTheme("edge-selection")); + cmd1->setShortcut(QKeySequence(QString::fromUtf8("E,S"))); + QAction* cmd2 = pcAction->addAction(QString()); + cmd2->setIcon(Gui::BitmapFactory().iconFromTheme("face-selection")); + cmd2->setShortcut(QKeySequence(QString::fromUtf8("F,S"))); + QAction* cmd3 = pcAction->addAction(QString()); + cmd3->setIcon(Gui::BitmapFactory().iconFromTheme("clear-selection")); + cmd3->setShortcut(QKeySequence(QString::fromUtf8("C,S"))); + + _pcAction = pcAction; + languageChange(); + + pcAction->setIcon(Gui::BitmapFactory().iconFromTheme("selection-filter")); + int defaultId = 3; + pcAction->setProperty("defaultAction", QVariant(defaultId)); + + return pcAction; +} + +void PartCmdSelectFilter::languageChange() +{ + Command::languageChange(); + + if (!_pcAction) { + return; + } + + Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); + + auto pcAction = qobject_cast(_pcAction); + QList act = pcAction->actions(); + + Gui::Command* vertexSelection = rcCmdMgr.getCommandByName("Part_VertexSelection"); + if (vertexSelection) { + QAction* cmd0 = act[0]; + cmd0->setText(QApplication::translate("View_SelectionFilter", vertexSelection->getMenuText())); + cmd0->setToolTip(QApplication::translate("View_SelectionFilter", vertexSelection->getToolTipText())); + cmd0->setStatusTip(QApplication::translate("View_SelectionFilter", vertexSelection->getStatusTip())); + } + + Gui::Command* edgeSelection = rcCmdMgr.getCommandByName("Part_EdgeSelection"); + if (edgeSelection) { + QAction* cmd1 = act[1]; + cmd1->setText(QApplication::translate("View_SelectionFilter", edgeSelection->getMenuText())); + cmd1->setToolTip(QApplication::translate("View_SelectionFilter", edgeSelection->getToolTipText())); + cmd1->setStatusTip(QApplication::translate("View_SelectionFilter", edgeSelection->getStatusTip())); + } + + Gui::Command* faceSelection = rcCmdMgr.getCommandByName("Part_FaceSelection"); + if (faceSelection) { + QAction* cmd1 = act[2]; + cmd1->setText(QApplication::translate("View_SelectionFilter", faceSelection->getMenuText())); + cmd1->setToolTip(QApplication::translate("View_SelectionFilter", faceSelection->getToolTipText())); + cmd1->setStatusTip(QApplication::translate("View_SelectionFilter", faceSelection->getStatusTip())); + } + + Gui::Command* removeSelection = rcCmdMgr.getCommandByName("Part_RemoveSelectionGate"); + if (removeSelection) { + QAction* cmd2 = act[3]; + cmd2->setText(QApplication::translate("View_SelectionFilter", removeSelection->getMenuText())); + cmd2->setToolTip(QApplication::translate("View_SelectionFilter", removeSelection->getToolTipText())); + cmd2->setStatusTip(QApplication::translate("View_SelectionFilter", removeSelection->getStatusTip())); + } +} + +bool PartCmdSelectFilter::isActive() +{ + Gui::MDIView* view = Gui::getMainWindow()->activeWindow(); + return view && view->isDerivedFrom(Gui::View3DInventor::getClassTypeId()); +} + + +//=========================================================================== +// Part_VertexSelection +//=========================================================================== +DEF_3DV_CMD(PartCmdVertexSelection) + +PartCmdVertexSelection::PartCmdVertexSelection() + : Command("Part_VertexSelection") +{ + sGroup = "Standard-View"; + sMenuText = QT_TR_NOOP("Vertex Selection"); + sToolTipText = QT_TR_NOOP("Select a Vertex/Vertices"); + sWhatsThis = "Part_VertexSelection"; + sStatusTip = QT_TR_NOOP("Select a Vertex/Vertices"); + sPixmap = "vertex-selection"; + sAccel = "X, S"; + eType = Alter3DView; +} + +void PartCmdVertexSelection::activated(int iMsg) +{ + Q_UNUSED(iMsg); + doCommand(Command::Gui,"Gui.Selection.addSelectionGate('SELECT Part::Feature SUBELEMENT Vertex')"); +} + + +//=========================================================================== +// Part_EdgeSelection +//=========================================================================== +DEF_3DV_CMD(PartCmdEdgeSelection) + +PartCmdEdgeSelection::PartCmdEdgeSelection() + : Command("Part_EdgeSelection") +{ + sGroup = "Standard-View"; + sMenuText = QT_TR_NOOP("Edge Selection"); + sToolTipText = QT_TR_NOOP("Select Edge(s)"); + sWhatsThis = "Part_EdgeSelection"; + sStatusTip = QT_TR_NOOP("Select Edge(s)"); + sPixmap = "edge-selection"; + sAccel = "E, S"; + eType = Alter3DView; +} + +void PartCmdEdgeSelection::activated(int iMsg) +{ + Q_UNUSED(iMsg); + doCommand(Command::Gui,"Gui.Selection.addSelectionGate('SELECT Part::Feature SUBELEMENT Edge')"); +} + + +//=========================================================================== +// Part_FaceSelection +//=========================================================================== +DEF_3DV_CMD(PartCmdFaceSelection) + +PartCmdFaceSelection::PartCmdFaceSelection() + : Command("Part_FaceSelection") +{ + sGroup = "Standard-View"; + sMenuText = QT_TR_NOOP("Face Selection"); + sToolTipText = QT_TR_NOOP("Select Face(s)"); + sWhatsThis = "Part_FaceSelection"; + sStatusTip = QT_TR_NOOP("Select Face(s)"); + sPixmap = "face-selection"; + sAccel = "F, S"; + eType = Alter3DView; +} + +void PartCmdFaceSelection::activated(int iMsg) +{ + Q_UNUSED(iMsg); + doCommand(Command::Gui,"Gui.Selection.addSelectionGate('SELECT Part::Feature SUBELEMENT Face')"); +} + + +//=========================================================================== +// Part_RemoveSelectionGate +//=========================================================================== +DEF_3DV_CMD(PartCmdRemoveSelectionGate) + +PartCmdRemoveSelectionGate::PartCmdRemoveSelectionGate() + : Command("Part_RemoveSelectionGate") +{ + sGroup = "Standard-View"; + sMenuText = QT_TR_NOOP("All selection filters cleared"); + sToolTipText = QT_TR_NOOP("All selection filters cleared"); + sWhatsThis = "Part_RemoveSelectionGate"; + sStatusTip = QT_TR_NOOP("All selection filters cleared"); + sPixmap = "clear-selection"; + sAccel = "C, S"; + eType = Alter3DView; +} + +void PartCmdRemoveSelectionGate::activated(int iMsg) +{ + Q_UNUSED(iMsg); + doCommand(Command::Gui,"Gui.Selection.removeSelectionGate()"); +} + +void CreatePartSelectCommands() +{ + Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); + // NOLINTBEGIN + rcCmdMgr.addCommand(new PartCmdSelectFilter()); + rcCmdMgr.addCommand(new PartCmdVertexSelection()); + rcCmdMgr.addCommand(new PartCmdEdgeSelection()); + rcCmdMgr.addCommand(new PartCmdFaceSelection()); + rcCmdMgr.addCommand(new PartCmdRemoveSelectionGate()); + // NOLINTEND +} diff --git a/src/Mod/Part/Gui/Resources/translations/Part_be.ts b/src/Mod/Part/Gui/Resources/translations/Part_be.ts index 37a956fb89..f0f5d480d2 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_be.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_be.ts @@ -3172,7 +3172,7 @@ Please check one or more edge entities first. Export - Export + Экспартаваць @@ -3182,17 +3182,17 @@ Please check one or more edge entities first. Millimeter - Millimeter + Міліметр Meter - Meter + Метр Inch - Inch + Цаля @@ -3461,7 +3461,7 @@ during file reading (slower but higher details). Direction: - Direction: + Напрамак: @@ -3642,7 +3642,7 @@ during file reading (slower but higher details). Length: - Length: + Даўжыня: @@ -5641,7 +5641,7 @@ in the 3D view for the sweep path. Input error - Input error + Памылка ўводу @@ -5800,7 +5800,7 @@ Do you want to continue? Vertex - Vertex + Вяршыня @@ -6812,7 +6812,7 @@ A 'Compound Filter' can be used to extract the remaining pieces. The document '%1' doesn't exist. - The document '%1' doesn't exist. + Дакумент '%1' не існуе. diff --git a/src/Mod/Part/Gui/Resources/translations/Part_de.ts b/src/Mod/Part/Gui/Resources/translations/Part_de.ts index 120ce521cc..1199cc7ff1 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_de.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_de.ts @@ -1152,7 +1152,7 @@ Part - Formteil + Part @@ -1167,7 +1167,7 @@ Part - Formteil + Part @@ -1185,7 +1185,7 @@ Part - Formteil + Part @@ -1203,7 +1203,7 @@ Part - Formteil + Part @@ -1221,7 +1221,7 @@ Part - Formteil + Part @@ -1239,7 +1239,7 @@ Part - Formteil + Part @@ -1261,7 +1261,7 @@ zwischen zwei ihrer Knotenpunkte gemessen. Part - Formteil + Part @@ -1280,7 +1280,7 @@ if the measured points have moved. Part - Formteil + Part @@ -1300,7 +1300,7 @@ Winkelmaße eingeschlossen. Part - Formteil + Part @@ -1320,7 +1320,7 @@ direkte, rechtwinklige und Winkelmaße. Part - Formteil + Part @@ -1342,7 +1342,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1360,7 +1360,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1380,7 +1380,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1398,7 +1398,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1416,7 +1416,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1434,7 +1434,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1452,7 +1452,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1470,7 +1470,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1488,7 +1488,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1506,7 +1506,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1524,7 +1524,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1542,7 +1542,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1560,7 +1560,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1580,7 +1580,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1598,7 +1598,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1616,7 +1616,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1636,7 +1636,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1654,7 +1654,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1672,7 +1672,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1708,7 +1708,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1726,7 +1726,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1744,7 +1744,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1762,7 +1762,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1780,7 +1780,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1798,7 +1798,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1816,7 +1816,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1834,7 +1834,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1852,7 +1852,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1870,7 +1870,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1888,7 +1888,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1906,7 +1906,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1924,7 +1924,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1942,7 +1942,7 @@ X-, Y- und Z-Komponenten zerlegt wird. Part - Formteil + Part @@ -1966,7 +1966,7 @@ der Projektion. Part - Formteil + Part @@ -1984,7 +1984,7 @@ der Projektion. Part - Formteil + Part @@ -2002,7 +2002,7 @@ der Projektion. Part - Formteil + Part @@ -2020,7 +2020,7 @@ der Projektion. Part - Formteil + Part @@ -2038,7 +2038,7 @@ der Projektion. Part - Formteil + Part @@ -2069,7 +2069,7 @@ der Projektion. Part - Formteil + Part @@ -2087,7 +2087,7 @@ der Projektion. Part - Formteil + Part @@ -2105,7 +2105,7 @@ der Projektion. Part - Formteil + Part @@ -2123,7 +2123,7 @@ der Projektion. Part - Formteil + Part @@ -2143,7 +2143,7 @@ der Projektion. Part - Formteil + Part @@ -2161,7 +2161,7 @@ der Projektion. Part - Formteil + Part @@ -2189,7 +2189,7 @@ der Projektion. Part - Formteil + Part @@ -2209,7 +2209,7 @@ der Projektion. Part - Formteil + Part @@ -6190,7 +6190,7 @@ Do you want to continue? Part tools - Formteil-Werkzeuge + Part-Werkzeuge @@ -6822,7 +6822,7 @@ Ein 'Verbundfilter' kann verwendet werden, um die restlichen Stücke zu extrahie Part - Bauteil + Part diff --git a/src/Mod/Part/Gui/Resources/translations/Part_el.ts b/src/Mod/Part/Gui/Resources/translations/Part_el.ts index 320427b02e..a8cf61d324 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_el.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_el.ts @@ -731,7 +731,7 @@ Object's X Y Z Attachment3D mode caption - Object's X Y Z + X Y Z του αντικειμένου @@ -743,7 +743,7 @@ Object's X Z Y Attachment3D mode caption - Object's X Z Y + X Z Y του αντικειμένου @@ -755,7 +755,7 @@ Object's Y Z X Attachment3D mode caption - Object's Y Z X + Y Z X του αντικειμένου @@ -2410,7 +2410,7 @@ of projection. In x-direction: - In x-direction: + Σε κατεύθυνση x: @@ -2422,12 +2422,12 @@ of projection. In y-direction: - In y-direction: + Σε κατεύθυνση y: In z-direction: - In z-direction: + Σε κατεύθυνση z: @@ -3083,12 +3083,12 @@ If both lengths are zero, magnitude of direction is used. Equal distance - Equal distance + Ίση απόσταση Two distances - Two distances + Δύο αποστάσεις @@ -3227,7 +3227,7 @@ Please check one or more edge entities first. Blank entities will not be imported - Blank entities will not be imported + Κενές οντότητες δε θα εισαχθούν @@ -3300,17 +3300,17 @@ during file reading (slower but higher details). Use LinkGroup - Use LinkGroup + Χρήση LinkGroup Select this to import invisible objects. - Select this to import invisible objects. + Επιλέξτε αυτό για την εισαγωγή αόρατων αντικειμένων. Import invisible objects - Import invisible objects + Εισαγωγή αόρατων αντικειμένων @@ -3361,22 +3361,22 @@ during file reading (slower but higher details). Assembly per document - Assembly per document + Συναρμολόγηση ανά έγγραφο Assembly per document in sub-directory - Assembly per document in sub-directory + Συναρμολόγηση ανά έγγραφο στον υποκατάλογο Object per document - Object per document + Αντικείμενο ανά έγγραφο Object per document in sub-directory - Object per document in sub-directory + Αντικείμενο ανά έγγραφο στον υποκατάλογο @@ -3462,7 +3462,7 @@ during file reading (slower but higher details). Direction: - Direction: + Κατεύθυνση: @@ -3673,30 +3673,30 @@ during file reading (slower but higher details). Angle in first direction: - Angle in first direction: + Γωνία στην πρώτη κατεύθυνση: Angle in first direction - Angle in first direction + Γωνία στην πρώτη κατεύθυνση Angle in second direction: - Angle in second direction: + Γωνία στη δεύτερη κατεύθυνση: Angle in second direction - Angle in second direction + Γωνία στη δεύτερη κατεύθυνση Rotation angle: - Rotation angle: + Γωνία περιστροφής: @@ -3870,7 +3870,7 @@ during file reading (slower but higher details). Vertex - Vertex + Κορυφή @@ -4216,7 +4216,7 @@ during file reading (slower but higher details). 3D color - 3D color + 3D χρώμα @@ -4289,7 +4289,7 @@ during file reading (slower but higher details). Random - Random + Τυχαίο @@ -4953,7 +4953,7 @@ only created cuts will be visible In x-direction: - In x-direction: + Σε κατεύθυνση x: @@ -4967,12 +4967,12 @@ of object being attached. In y-direction: - In y-direction: + Σε κατεύθυνση y: In z-direction: - In z-direction: + Σε κατεύθυνση z: diff --git a/src/Mod/Part/Gui/Resources/translations/Part_es-AR.ts b/src/Mod/Part/Gui/Resources/translations/Part_es-AR.ts index 730d2d160a..b4029728c4 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_es-AR.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_es-AR.ts @@ -4976,7 +4976,7 @@ del objeto que se adjunta. In z-direction: - En la dirección z: + En dirección z: @@ -6791,17 +6791,17 @@ Un 'Filtro Compuesto' se puede utilizar para extraer las piezas restantes. Specify a different scale factor for each cardinal direction. - Specify a different scale factor for each cardinal direction. + Especifique un factor de escala diferente para cada dirección cardinal. Non-Uniform Scaling - Non-Uniform Scaling + Escalado no uniforme Select shape(s) that should be scaled - Select shape(s) that should be scaled + Selecciona la(s) forma(s) que deben ser escaladas @@ -6811,19 +6811,19 @@ Un 'Filtro Compuesto' se puede utilizar para extraer las piezas restantes. No scalable shapes selected - No scalable shapes selected + No hay formas escalables seleccionadas The document '%1' doesn't exist. - The document '%1' doesn't exist. + El documento '%1' es inexistente. Creating Scale failed. %1 - Creating Scale failed. + Creación de escala fallida. %1 diff --git a/src/Mod/Part/Gui/Resources/translations/Part_es-ES.ts b/src/Mod/Part/Gui/Resources/translations/Part_es-ES.ts index d7be682189..b2f0d125b0 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_es-ES.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_es-ES.ts @@ -6786,17 +6786,17 @@ Un 'Filtro Compuesto' se puede utilizar para extraer las piezas restantes. Specify a different scale factor for each cardinal direction. - Specify a different scale factor for each cardinal direction. + Especifique un factor de escala diferente para cada dirección cardinal. Non-Uniform Scaling - Non-Uniform Scaling + Escalado no uniforme Select shape(s) that should be scaled - Select shape(s) that should be scaled + Selecciona la(s) forma(s) que deben ser escaladas @@ -6806,19 +6806,19 @@ Un 'Filtro Compuesto' se puede utilizar para extraer las piezas restantes. No scalable shapes selected - No scalable shapes selected + No hay formas escalables seleccionadas The document '%1' doesn't exist. - The document '%1' doesn't exist. + El documento '%1' es inexistente. Creating Scale failed. %1 - Creating Scale failed. + Creación de escala fallida. %1 @@ -6837,7 +6837,7 @@ Un 'Filtro Compuesto' se puede utilizar para extraer las piezas restantes. Scale a selected shape - Scale a selected shape + Escala una forma seleccionada diff --git a/src/Mod/Part/Gui/Resources/translations/Part_fr.ts b/src/Mod/Part/Gui/Resources/translations/Part_fr.ts index d0905bbc34..29c082cead 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_fr.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_fr.ts @@ -1251,9 +1251,9 @@ Measure the linear distance between two points; if edges or faces are picked, it will measure between two vertices of them. - Mesurer la distance linéaire entre deux points ; -Si des arêtes ou des faces sont sélectionnées, -cela mesurera entre deux de leurs sommets. + Mesurer la distance linéaire entre deux points. Si des +arêtes ou des faces sont sélectionnées, cela mesurera +entre deux de leurs sommets. @@ -1266,14 +1266,13 @@ cela mesurera entre deux de leurs sommets. Refresh - Actualiser + Rafraîchir Recalculate the dimensions if the measured points have moved. - Recalculer les cotes -si les points mesurés ont été déplacés. + Recalculer les mesures si les points mesurés ont été déplacés. @@ -1286,14 +1285,14 @@ si les points mesurés ont été déplacés. Toggle 3D - Basculer en 3D + Basculer vers les mesures dans la 3D Toggle on and off all direct dimensions, including angular. - Basculer toutes les cotes directes, -y compris angulaire. + Basculer toutes les mesures directes, +y compris angulaires. @@ -1312,7 +1311,7 @@ y compris angulaire. Toggle on and off all currently visible dimensions, direct, orthogonal, and angular. - Basculer toutes les cotes actuellement visibles, + Basculer toutes les mesures actuellement visibles, directes, orthogonales et angulaires. @@ -1326,15 +1325,15 @@ directes, orthogonales et angulaires. Toggle Delta - Basculer en mode delta + Basculer vers les mesures selon le repère global Toggle on and off all orthogonal dimensions, meaning that a direct dimension will be decomposed into its X, Y, and Z components. - Basculer toutes les cotes orthogonales, -ce qui signifie qu’une cote directe sera + Basculer toutes les mesures orthogonales, +ce qui signifie qu’une mesure directe sera décomposée en ses composantes X, Y et Z. @@ -3481,7 +3480,7 @@ during file reading (slower but higher details). IGES input file - Fichier d'entrée IGES + Fichier source .IGES @@ -3507,7 +3506,7 @@ during file reading (slower but higher details). Step input file - Fichier d'entrée STEP + Fichier source .STEP @@ -4202,7 +4201,7 @@ during file reading (slower but higher details). Measure - Mesure + Mesures @@ -4212,22 +4211,22 @@ during file reading (slower but higher details). 3D color - Couleur 3D + Couleur des mesures dans la 3D Delta color - Couleur pour les dimensions delta + Couleur des mesures dans le repère global Angular color - Couleur angulaire + Couleur des mesures angulaires Font size - Taille de police + Taille de la police @@ -4242,7 +4241,7 @@ during file reading (slower but higher details). defaultFont - defaultFont + Police par défaut diff --git a/src/Mod/Part/Gui/Resources/translations/Part_ka.ts b/src/Mod/Part/Gui/Resources/translations/Part_ka.ts index 2e42cabef6..b424c193d1 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_ka.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_ka.ts @@ -3172,7 +3172,7 @@ Please check one or more edge entities first. Export - Export + გატანა @@ -3182,17 +3182,17 @@ Please check one or more edge entities first. Millimeter - Millimeter + მილიმეტრი Meter - Meter + მეტრი Inch - Inch + დუიმი @@ -3462,7 +3462,7 @@ during file reading (slower but higher details). Direction: - Direction: + მიმართულება: @@ -3643,7 +3643,7 @@ during file reading (slower but higher details). Length: - Length: + სიგრძე: @@ -5640,7 +5640,7 @@ in the 3D view for the sweep path. Input error - Input error + შეყვანის შეცდომა @@ -5799,7 +5799,7 @@ Do you want to continue? Vertex - Vertex + წვერო @@ -6811,7 +6811,7 @@ A 'Compound Filter' can be used to extract the remaining pieces. The document '%1' doesn't exist. - The document '%1' doesn't exist. + დოკუმენტი '%1' არ არსებობს. diff --git a/src/Mod/Part/Gui/Resources/translations/Part_pt-BR.ts b/src/Mod/Part/Gui/Resources/translations/Part_pt-BR.ts index 3b9cf61ff0..63cb27d56f 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_pt-BR.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_pt-BR.ts @@ -2804,7 +2804,7 @@ the size of the resulting STEP file. Select - Selecionar + Selecione diff --git a/src/Mod/Part/Gui/Resources/translations/Part_pt-PT.ts b/src/Mod/Part/Gui/Resources/translations/Part_pt-PT.ts index a0fc314a04..0850401514 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_pt-PT.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_pt-PT.ts @@ -5798,7 +5798,7 @@ Do you want to continue? Vertex - Vertex + Vértice @@ -6236,7 +6236,7 @@ Do you want to continue? Create tube - Create tube + Criar tubo @@ -6434,7 +6434,7 @@ It will create a 'Compound Filter' for each shape. Bad selection - Bad selection + Má seleção diff --git a/src/Mod/Part/Gui/Resources/translations/Part_ru.ts b/src/Mod/Part/Gui/Resources/translations/Part_ru.ts index 60b00e6ec1..c43d774e1a 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_ru.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_ru.ts @@ -6820,7 +6820,7 @@ A 'Compound Filter' can be used to extract the remaining pieces. The document '%1' doesn't exist. - The document '%1' doesn't exist. + Документ «%1» не существует. diff --git a/src/Mod/Part/Gui/Resources/translations/Part_sr-CS.ts b/src/Mod/Part/Gui/Resources/translations/Part_sr-CS.ts index 827ebf265f..868d13e4da 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_sr-CS.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_sr-CS.ts @@ -3170,7 +3170,7 @@ Please check one or more edge entities first. Export - Export + Izvoz @@ -3180,17 +3180,17 @@ Please check one or more edge entities first. Millimeter - Millimeter + Milimetar Meter - Meter + Metar Inch - Inch + Inč @@ -3460,7 +3460,7 @@ during file reading (slower but higher details). Direction: - Direction: + Pravac: @@ -3641,7 +3641,7 @@ during file reading (slower but higher details). Length: - Length: + Dužina: @@ -5644,7 +5644,7 @@ in the 3D view for the sweep path. Input error - Input error + Greška pri unosu @@ -5803,7 +5803,7 @@ Da li želiš da nastaviš? Vertex - Vertex + Teme @@ -6815,7 +6815,7 @@ Ova bulova logička operacija uklanja sve delove objekata koji se preklapaju. The document '%1' doesn't exist. - The document '%1' doesn't exist. + Dokument '%1' ne postoji. diff --git a/src/Mod/Part/Gui/Resources/translations/Part_sr.ts b/src/Mod/Part/Gui/Resources/translations/Part_sr.ts index 77193c66d7..b66bc3beef 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_sr.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_sr.ts @@ -3460,7 +3460,7 @@ during file reading (slower but higher details). Direction: - Direction: + Правац: @@ -5802,7 +5802,7 @@ Do you want to continue? Vertex - Vertex + Теме @@ -6814,7 +6814,7 @@ A 'Compound Filter' can be used to extract the remaining pieces. The document '%1' doesn't exist. - The document '%1' doesn't exist. + Документ '%1' не постоји. diff --git a/src/Mod/Part/Gui/WorkbenchManipulator.cpp b/src/Mod/Part/Gui/WorkbenchManipulator.cpp new file mode 100644 index 0000000000..d8dc4d6ffc --- /dev/null +++ b/src/Mod/Part/Gui/WorkbenchManipulator.cpp @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#include "PreCompiled.h" +#include "WorkbenchManipulator.h" +#include +#include + +using namespace PartGui; + +void WorkbenchManipulator::modifyMenuBar([[maybe_unused]] Gui::MenuItem* menuBar) +{ + addSectionCut(menuBar); +} + +void WorkbenchManipulator::modifyContextMenu(const char* recipient, Gui::MenuItem* menuBar) +{ + if (strcmp(recipient, "View") == 0) { + addSelectionFilter(menuBar); + } +} + +void WorkbenchManipulator::modifyToolBars(Gui::ToolBarItem* toolBar) +{ + addSelectionFilter(toolBar); +} + +void WorkbenchManipulator::modifyDockWindows([[maybe_unused]] Gui::DockWindowItems* dockWindow) +{ +} + +void WorkbenchManipulator::addSectionCut(Gui::MenuItem* menuBar) +{ + const char* toggleClipPlane = "Std_ToggleClipPlane"; + auto par = menuBar->findParentOf(toggleClipPlane); + if (par) { + auto item = par->findItem(toggleClipPlane); + item = par->afterItem(item); + + auto add = new Gui::MenuItem(); // NOLINT + add->setCommand("Part_SectionCut"); + par->insertItem(item, add); + } +} + +void WorkbenchManipulator::addSelectionFilter(Gui::ToolBarItem* toolBar) +{ + if (auto view = toolBar->findItem("View")) { + auto add = new Gui::ToolBarItem(); // NOLINT + add->setCommand("Part_SelectFilter"); + auto item = view->findItem("Std_TreeViewActions"); + if (item) { + view->insertItem(item, add); + } + else { + view->appendItem(add); + } + } +} + +void WorkbenchManipulator::addSelectionFilter(Gui::MenuItem* menuBar) +{ + if (auto measure = menuBar->findItem("Measure")) { + auto add = new Gui::MenuItem(); // NOLINT + add->setCommand("Part_SelectFilter"); + menuBar->insertItem(measure, add); + } +} diff --git a/src/Mod/Part/Gui/WorkbenchManipulator.h b/src/Mod/Part/Gui/WorkbenchManipulator.h new file mode 100644 index 0000000000..745e7556b4 --- /dev/null +++ b/src/Mod/Part/Gui/WorkbenchManipulator.h @@ -0,0 +1,69 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/*************************************************************************** + * Copyright (c) 2023 Werner Mayer * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + + +#ifndef PARTGUI_WORKBENCHMANIPULATOR_H +#define PARTGUI_WORKBENCHMANIPULATOR_H + +#include + +namespace PartGui { + +class WorkbenchManipulator: public Gui::WorkbenchManipulator +{ +protected: + /*! + * \brief modifyMenuBar + * Method to manipulate the menu structure of a workbench. + * The default implementation doesn't change anything.SectionCut + */ + void modifyMenuBar(Gui::MenuItem* menuBar) override; + /*! + * \brief modifyContextMenu + * Method to manipulate the contextmenu structure of a workbench. + * The default implementation doesn't change anything. + */ + void modifyContextMenu(const char* recipient, Gui::MenuItem* menuBar) override; + /*! + * \brief modifyToolBars + * Method to manipulate the toolbar structure of a workbench + * The default implementation doesn't change anything. + */ + void modifyToolBars([[maybe_unused]] Gui::ToolBarItem* toolBar) override; + /*! + * \brief modifyDockWindows + * Method to manipulate the dock window structure of a workbench + * The default implementation doesn't change anything. + */ + void modifyDockWindows([[maybe_unused]] Gui::DockWindowItems* dockWindow) override; + +private: + static void addSectionCut(Gui::MenuItem* menuBar); + static void addSelectionFilter(Gui::ToolBarItem* toolBar); + static void addSelectionFilter(Gui::MenuItem* menuBar); +}; + +} // namespace PartGui + + +#endif // PARTGUI_WORKBENCHMANIPULATOR_H diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index d8db758576..a2ecf82a5a 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppPartDesign -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/PartDesign/App/FeatureThickness.cpp b/src/Mod/PartDesign/App/FeatureThickness.cpp index b12597bd31..7d647a21e7 100644 --- a/src/Mod/PartDesign/App/FeatureThickness.cpp +++ b/src/Mod/PartDesign/App/FeatureThickness.cpp @@ -45,7 +45,7 @@ Thickness::Thickness() Mode.setEnums(ModeEnums); ADD_PROPERTY_TYPE(Join, (long(0)), "Thickness", App::Prop_None, "Join type"); Join.setEnums(JoinEnums); - ADD_PROPERTY_TYPE(Reversed, (false), "Thickness", App::Prop_None, + ADD_PROPERTY_TYPE(Reversed, (true), "Thickness", App::Prop_None, "Apply the thickness towards the solids interior"); ADD_PROPERTY_TYPE(Intersection, (false), "Thickness", App::Prop_None, "Enable intersection-handling"); diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index d80be20bda..009fd1a327 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_de.ts b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_de.ts index 7774a62bfb..56d1a3d1ed 100644 --- a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_de.ts +++ b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_de.ts @@ -2994,7 +2994,7 @@ Nochmaliges Klicken beendet den Auswahl-Modus. Select - Wähle + Auswählen diff --git a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_el.ts b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_el.ts index 1b52b3af54..f996a7d20b 100644 --- a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_el.ts +++ b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_el.ts @@ -885,7 +885,7 @@ so that self intersection is avoided. Make copy - Make copy + Δημιουργία αντιγράφου @@ -1171,7 +1171,7 @@ Please select a body from below, or create a new body. Rotation angle: - Rotation angle: + Γωνία περιστροφής: diff --git a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_es-AR.ts b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_es-AR.ts index 3b79522ddf..c0f4951488 100644 --- a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_es-AR.ts +++ b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_es-AR.ts @@ -2101,7 +2101,7 @@ haga clic de nuevo para finalizar la selección Overall Length - Overall Length + Longitud total @@ -2790,7 +2790,7 @@ measured along the specified direction Overall Angle - Overall Angle + Ángulo general diff --git a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_es-ES.ts b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_es-ES.ts index 40fbeb8ce2..908a4af2db 100644 --- a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_es-ES.ts +++ b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_es-ES.ts @@ -2101,7 +2101,7 @@ haga clic de nuevo para finalizar la selección Overall Length - Overall Length + Longitud total @@ -2790,7 +2790,7 @@ measured along the specified direction Overall Angle - Overall Angle + Ángulo general diff --git a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_fr.ts b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_fr.ts index 7ba1944154..308d0201b7 100644 --- a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_fr.ts +++ b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_fr.ts @@ -4633,7 +4633,7 @@ plus de 90 : rayon du trou plus grand à la base Toggle 3D - Basculer en 3D + Basculer vers les mesures dans la 3D diff --git a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_ka.ts b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_ka.ts index 7ced76002f..a4e98bde22 100644 --- a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_ka.ts +++ b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_ka.ts @@ -2994,7 +2994,7 @@ click again to end selection Select - არჩევა + აირჩიეთ diff --git a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_pt-BR.ts b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_pt-BR.ts index b295dcec78..79623cdeec 100644 --- a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_pt-BR.ts +++ b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_pt-BR.ts @@ -1503,7 +1503,7 @@ clique novamente para terminar a seleção Select - Selecionar + Selecione @@ -1624,7 +1624,7 @@ clique novamente para terminar a seleção Select - Selecionar + Selecione @@ -1671,7 +1671,7 @@ clique novamente para terminar a seleção Select - Selecionar + Selecione @@ -1829,7 +1829,7 @@ clique novamente para terminar a seleção Select - Selecionar + Selecione @@ -2993,7 +2993,7 @@ clique novamente para terminar a seleção Select - Selecionar + Selecione diff --git a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_zh-TW.ts b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_zh-TW.ts index 60f8bb7c04..98cfa96408 100644 --- a/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_zh-TW.ts +++ b/src/Mod/PartDesign/Gui/Resources/translations/PartDesign_zh-TW.ts @@ -4681,17 +4681,17 @@ over 90: larger hole radius at the bottom Length [mm] - Length [mm] + 長度[mm] Diameter [mm] - Diameter [mm] + 外徑[mm] Inner diameter [mm] - Inner diameter [mm] + 內徑[mm] diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index 8332036c2e..b57317bd4a 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -501,6 +501,8 @@ std::shared_ptr Area::getClearedArea(double tipDiameter, double diameter) #define AREA_MY(_param) myParams.PARAM_FNAME(_param) PARAM_ENUM_CONVERT(AREA_MY, PARAM_FNAME, PARAM_ENUM_EXCEPT, AREA_PARAMS_OFFSET_CONF); PARAM_ENUM_CONVERT(AREA_MY, PARAM_FNAME, PARAM_ENUM_EXCEPT, AREA_PARAMS_CLIPPER_FILL); + (void)SubjectFill; + (void)ClipFill; // Do not fit arcs after these offsets; it introduces unnecessary approximation error, and all off // those arcs will be converted back to segments again for clipper differencing in getRestArea anyway diff --git a/src/Mod/Path/App/AreaPy.xml b/src/Mod/Path/App/AreaPy.xml index 6b9c1c6c1e..a38a84aec1 100644 --- a/src/Mod/Path/App/AreaPy.xml +++ b/src/Mod/Path/App/AreaPy.xml @@ -62,17 +62,17 @@ same algorithm - + - + - + diff --git a/src/Mod/Path/App/AreaPyImp.cpp b/src/Mod/Path/App/AreaPyImp.cpp index 1bc1c0bc1c..817aed0e37 100644 --- a/src/Mod/Path/App/AreaPyImp.cpp +++ b/src/Mod/Path/App/AreaPyImp.cpp @@ -403,7 +403,7 @@ PyObject* AreaPy::makeSections(PyObject *args, PyObject *keywds) } PY_CATCH_OCC } -PyObject* AreaPy::getClearedArea(PyObject *args, PyObject *keywds) +PyObject* AreaPy::getClearedArea(PyObject *args) { PY_TRY { double tipDiameter, diameter; @@ -415,7 +415,7 @@ PyObject* AreaPy::getClearedArea(PyObject *args, PyObject *keywds) } PY_CATCH_OCC } -PyObject* AreaPy::getRestArea(PyObject *args, PyObject *keywds) +PyObject* AreaPy::getRestArea(PyObject *args) { PY_TRY { PyObject *pyClearedAreas; @@ -445,9 +445,11 @@ PyObject* AreaPy::getRestArea(PyObject *args, PyObject *keywds) } PY_CATCH_OCC } -PyObject* AreaPy::toTopoShape(PyObject *args, PyObject *keywds) +PyObject* AreaPy::toTopoShape(PyObject *args) { PY_TRY { + if (!PyArg_ParseTuple(args, "")) + return nullptr; return Py::new_reference_to(Part::shape2pyshape(getAreaPtr()->toTopoShape())); } PY_CATCH_OCC } diff --git a/src/Mod/Path/App/CMakeLists.txt b/src/Mod/Path/App/CMakeLists.txt index 3f26698405..e26fbab6a6 100644 --- a/src/Mod/Path/App/CMakeLists.txt +++ b/src/Mod/Path/App/CMakeLists.txt @@ -1,11 +1,6 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - add_definitions(-fext-numeric-literals) #fix for gcc and qt5 - endif() -endif(MSVC) +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + add_definitions(-fext-numeric-literals) #fix for gcc and qt5 +endif() include_directories( ${CMAKE_BINARY_DIR} diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/Path/Gui/CMakeLists.txt index b1ba882729..113722c393 100644 --- a/src/Mod/Path/Gui/CMakeLists.txt +++ b/src/Mod/Path/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCGuiPath -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Path/Gui/Resources/translations/Path.ts b/src/Mod/Path/Gui/Resources/translations/Path.ts index 1c8b182cf9..67b2ec3c28 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path.ts @@ -6451,350 +6451,305 @@ For example: Path_Sanity - + Check the path job for common errors - + Setup Report for FreeCAD Job - + Table of Contents - + Part Information - + Run Summary - + Rough Stock - + Tool Data - + Output - + Fixtures - + Squawks - - + Base Object(s) - - + Job Sequence - - + Job Description - - + Job Type - - + CAD File Name - - + Last Save Date - - + Customer - - + Designer - - - - + + Operation - - + Minimum Z Height - - + Maximum Z Height - - + Cycle Time - - + Coolant - - + TOTAL JOB - - + Tool Number - - + Description - - + Manufacturer - - + Part Number - - + URL - - + Inspection Notes - - + Tool Controller - - + Feed Rate - - + Spindle Speed - - + Tool Shape - - + Tool Diameter - - + X Size - - + Y Size - - + Z Size - - + Material - - + Work Offsets - - + Order By - - + Part Datum - - + G-code File - - + Last Post Process Date - - + Stops - - + Programmer - - + Machine - - + Postprocessor - - + Post Processor Flags - - + File Size (kB) - - + Line Count - - + Note - - + Operator - - + Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used - + Consider Specifying the Stock Material - + The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_be.ts b/src/Mod/Path/Gui/Resources/translations/Path_be.ts index 71a6957da1..c4e8be2773 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_be.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_be.ts @@ -6628,353 +6628,308 @@ For example: Path_Sanity - + Check the path job for common errors Праверыць заданне траекторыі на наяўнасць распаўсюджаных памылак - - - Setup Report for FreeCAD Job - Setup Report for FreeCAD Job - - - - Table of Contents - Table of Contents - - - - Part Information - Part Information - - - - Run Summary - Run Summary - - - - Rough Stock - Rough Stock - - Tool Data - Tool Data + Setup Report for FreeCAD Job + Наладкі справаздачы для задання FreeCAD + Table of Contents + Змест + + + + Part Information + Інфармацыя аб дэталі + + + + Run Summary + Зводка выканання + + + + Rough Stock + Неапрацаваная загатоўка + + + + Tool Data + Дадзеныя інструменту + + + Output Вывад - + Fixtures Арматура - + Squawks - Squawks + Кавалкі - - + Base Object(s) Асноўныя аб'екты - - + Job Sequence Паслядоўнасць выканання заданняў - - + Job Description Апісанне задання - - + Job Type Тып задання - - + CAD File Name Імя файла CAD - - + Last Save Date Дата апошняга захавання - - + Customer Кліент - - + Designer Афарміцель - - - - + + Operation Аперацыя - - + Minimum Z Height Найменшая вышыня па восі Z - - + Maximum Z Height Найбольшая вышыня па восі Z - - + Cycle Time Час цыклу - - + Coolant Астуджальная вадкасць - - + TOTAL JOB Усяго заданняў - - + Tool Number Нумар інструмента - - + Description Апісанне - - + Manufacturer Вытворца - - + Part Number Артыкул дэталі - - + URL URL-адрас - - + Inspection Notes Заўвагі да праверкі - - + Tool Controller Кантролер інструментаў - - + Feed Rate Хуткасць падачы - - + Spindle Speed Хуткасць шпіндаля - - + Tool Shape Фігура інструменту - - + Tool Diameter Дыяметр інструменту - - + X Size Памер па восі X - - + Y Size Памер па восі Y - - + Z Size Памер па восі Z - - + Material Матэрыял - - + Work Offsets Працоўныя зрушэнні - - + Order By Парадкаваць па - - + Part Datum Апорныя каардынаты дэталі - - + G-code File Файл G-кода - - + Last Post Process Date Дата апошняй апрацоўкі - - + Stops Спыненні - - + Programmer Праграміст - - + Machine Станок - - + Postprocessor Пасляапрацоўка - - + Post Processor Flags Флагі пасляапрацоўкі - - + File Size (kB) Памер файла (Кб) - - + Line Count Колькасць ліній - - + Note Заўвага - - + Operator Аператар - - + Date Дата - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - Tool number {} is a legacy tool. Legacy tools not - supported by Path-Sanity + Нумар інструменту {} - гэта састарэлы інструмент. +Састарэлыя інструменты не падтрымліваюцца функцыяй Path-Sanity - + Tool number {} used by multiple tools - Tool number {} used by multiple tools + Нумар інструмента {} ужываецца некалькімі інструментамі - + Tool Controller '{}' has no spindlespeed - Tool Controller '{}' has no spindlespeed + Кантролер інструмента '{}' не мае хуткасці кручэння шпіндаля - + Tool Controller '{}' is not used - Tool Controller '{}' is not used + Кантролер інструмента '{}' не ўжываецца - + Consider Specifying the Stock Material - Consider Specifying the Stock Material + Разглядзіце магчымасць паказаць матэрыял загатоўкі - + The Job has not been post-processed - The Job has not been post-processed + Заданне не было апрацавана пасляапрацоўкай diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ca.ts b/src/Mod/Path/Gui/Resources/translations/Path_ca.ts index 0e6a453599..8929697090 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ca.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ca.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Sortida - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operació - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Refrigerant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Descripció - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Controlador d'eina - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Material - - + Work Offsets Work Offsets - - + Order By Ordena per - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programador - - + Machine Màquina - - + Postprocessor Postprocessador - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Nota - - + Operator Operador - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_cs.ts b/src/Mod/Path/Gui/Resources/translations/Path_cs.ts index 5f2ba6434a..1a250564ff 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_cs.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_cs.ts @@ -6581,351 +6581,306 @@ For example: Path_Sanity - + Check the path job for common errors Zkontrolujte, zda úloha cesty neobsahuje běžné chyby - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Výstup - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Základní objekty - - + Job Sequence Job Sequence - - + Job Description Popis úlohy - - + Job Type Typ úlohy - - + CAD File Name Název CAD souboru - - + Last Save Date Datum posledního uložení - - + Customer Zákazník - - + Designer Konstruktér - - - - + + Operation Operace - - + Minimum Z Height Minimální výška Z - - + Maximum Z Height Maximální výška Z - - + Cycle Time Čas cyklu - - + Coolant Chladivo - - + TOTAL JOB CELKEM ÚLOH - - + Tool Number Číslo nástroje - - + Description Popis - - + Manufacturer Výrobce - - + Part Number Číslo dílu - - + URL URL - - + Inspection Notes Poznámky k inspekci - - + Tool Controller Ovladač nástrojů - - + Feed Rate Posuv - - + Spindle Speed Otáčky - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Materiál - - + Work Offsets Work Offsets - - + Order By Seřadit podle - - + Part Datum Part Datum - - + G-code File Soubor G-kódu - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programátor - - + Machine Stroj - - + Postprocessor Postprocesor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Velikost souboru (kB) - - + Line Count Line Count - - + Note Poznámka - - + Operator Operátor - - + Date Datum - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_de.ts b/src/Mod/Path/Gui/Resources/translations/Path_de.ts index 37afb5a694..17523a4aa6 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_de.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_de.ts @@ -6584,351 +6584,306 @@ Zum Beispiel: Path_Sanity - + Check the path job for common errors Path-Auftrag auf typische Fehler überprüfen - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents - Table of Contents + Inhaltsverzeichnis - + Part Information - Part Information + Bauteilinformationen - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Ausgabe - + Fixtures Armaturen - + Squawks Squawks - - + Base Object(s) Basisobjekt(e) - - + Job Sequence Auftragsablauf - - + Job Description Auftragsbeschreibung - - + Job Type Auftragsart - - + CAD File Name CAD-Dateiname - - + Last Save Date Letztes Speicherdatum - - + Customer Kunde - - + Designer Konstrukteur - - - - + + Operation Operation - - + Minimum Z Height Minimale Z-Höhe - - + Maximum Z Height Maximale Z-Höhe - - + Cycle Time Durchlaufzeit - - + Coolant Kühlmittel - - + TOTAL JOB Gesamter Auftrag - - + Tool Number Werkzeugnummer - - + Description Beschreibung - - + Manufacturer Hersteller - - + Part Number Bauteilnummer - - + URL URL - - + Inspection Notes Anmerkungen zur Inspektion - - + Tool Controller Werkzeugsteuerung - - + Feed Rate Vorschubgeschwindigkeit - - + Spindle Speed Spindeldrehzahl - - + Tool Shape Werkzeugform - - + Tool Diameter Werkzeugdurchmesser - - + X Size X-Größe - - + Y Size Y-Größe - - + Z Size Z-Größe - - + Material Material - - + Work Offsets Nullpunktveschiebungen - - + Order By Sortieren nach - - + Part Datum Bauteil Datum - - + G-code File G-Code Datei - - + Last Post Process Date Letztes Postprozess-Datum - - + Stops Haltepunkte - - + Programmer Programmierer - - + Machine Maschine - - + Postprocessor Nachberarbeitungs-Programm - - + Post Processor Flags Post-Prozessor-Flags - - + File Size (kB) Dateigröße (kB) - - + Line Count Anzahl der Zeilen - - + Note Notiz - - + Operator Operator - - + Date Datum - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_el.ts b/src/Mod/Path/Gui/Resources/translations/Path_el.ts index 46af9cfe16..5cdc6ed104 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_el.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_el.ts @@ -111,7 +111,7 @@ Template - Template + Πρότυπο @@ -370,12 +370,12 @@ For stock from the Base object's bounding box it means the extra material in all Tool Editor - Tool Editor + Επεξεργαστής Εργαλείων Create Property - Create Property + Δημιουργία Ιδιότητας @@ -385,12 +385,12 @@ For stock from the Base object's bounding box it means the extra material in all Name of property. Can only contain letters, numbers, and underscores. MixedCase names will display with spaces "Mixed Case" - Name of property. Can only contain letters, numbers, and underscores. MixedCase names will display with spaces "Mixed Case" + Όνομα ιδιότητας. Μπορεί να περιέχει μόνο γράμματα, αριθμούς και κάτω παύλες. Τα ονόματα με μικτά πεζά και κεφαλαία, όπως "MixedCase", θα εμφανίζονται με κενά "Mixed Case" The category group the property belongs to. - The category group the property belongs to. + Ομάδα κατηγορίας στην οποία ανήκει η ιδιότητα. @@ -440,7 +440,7 @@ For stock from the Base object's bounding box it means the extra material in all Library Manager - Library Manager + Διαχειριστής Βιβλιοθήκης @@ -465,7 +465,7 @@ For stock from the Base object's bounding box it means the extra material in all Add New Tool Table - Add New Tool Table + Προσθήκη Νέου Πίνακα Εργαλείων @@ -480,12 +480,12 @@ For stock from the Base object's bounding box it means the extra material in all Save the current Library - Save the current Library + Αποθήκευση της τρέχουσας Βιβλιοθήκης Add Existing - Add Existing + Προσθήκη Υπάρχουσας @@ -513,12 +513,12 @@ For stock from the Base object's bounding box it means the extra material in all Tool Controller - Tool Controller + Ελεγκτής Εργαλείων Copy Selected Tools - Copy Selected Tools + Αντιγραφή Επιλεγμένων Εργαλείων @@ -536,12 +536,12 @@ For stock from the Base object's bounding box it means the extra material in all Processor - Processor + Επεξεργαστής Arguments - Arguments + Παράμετροι @@ -564,7 +564,7 @@ For stock from the Base object's bounding box it means the extra material in all Create Cylinder - Create Cylinder + Δημιουργία Κυλίνδρου @@ -624,12 +624,12 @@ For stock from the Base object's bounding box it means the extra material in all Radius of the Cylinder - Radius of the Cylinder + Ακτίνα του κυλίνδρου Height of the Cylinder - Height of the Cylinder + Ύψος του κυλίνδρου @@ -749,7 +749,7 @@ Reset deletes all current items from the list and fills the list with all circul Feature - Feature + Χαρακτηριστικό @@ -964,7 +964,7 @@ Reset deletes all current items from the list and fills the list with all circul Tool Controller - Tool Controller + Ελεγκτής Εργαλείων @@ -2553,7 +2553,7 @@ If left empty no template will be preselected. Create Cylinder - Create Cylinder + Δημιουργία Κυλίνδρου @@ -3380,7 +3380,7 @@ Should multiple tools or tool shapes with the same name exist in different direc Tool Controller - Tool Controller + Ελεγκτής Εργαλείων @@ -3700,12 +3700,12 @@ Should multiple tools or tool shapes with the same name exist in different direc Processor - Processor + Επεξεργαστής Arguments - Arguments + Παράμετροι @@ -3779,7 +3779,7 @@ FreeCAD has no knowledge of where a particular coordinate system exists within t Create Cylinder - Create Cylinder + Δημιουργία Κυλίνδρου @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Έξοδος - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Περιγραφή - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL Διεύθυνση URL - - + Inspection Notes Inspection Notes - - + Tool Controller - Tool Controller + Ελεγκτής Εργαλείων - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Υλικό - - + Work Offsets Work Offsets - - + Order By Order By - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Note - - + Operator Τελεστής - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_es-AR.ts b/src/Mod/Path/Gui/Resources/translations/Path_es-AR.ts index 602ef1d2e4..6013d02aa0 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_es-AR.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_es-AR.ts @@ -6586,353 +6586,308 @@ Por ejemplo: Path_Sanity - + Check the path job for common errors Compruebe el trabajo de ruta para errores comunes - - - Setup Report for FreeCAD Job - Setup Report for FreeCAD Job - - - - Table of Contents - Table of Contents - - - - Part Information - Part Information - - - - Run Summary - Run Summary - - - - Rough Stock - Rough Stock - - Tool Data - Tool Data + Setup Report for FreeCAD Job + Configurar informe para el trabajo FreeCAD + Table of Contents + Tabla de Contenidos + + + + Part Information + Información de la parte + + + + Run Summary + Ejecutar Resumen + + + + Rough Stock + Boceto de Stock + + + + Tool Data + Datos de la herramienta + + + Output Salida - + Fixtures Fijaciones - + Squawks - Squawks + Pizarras - - + Base Object(s) Objeto(s) base - - + Job Sequence Secuencia de trabajo - - + Job Description Descripción del trabajo - - + Job Type Tipo de trabajo - - + CAD File Name Nombre del Archivo CAD - - + Last Save Date Última Fecha de Guardado - - + Customer Cliente - - + Designer Diseñador - - - - + + Operation Operación - - + Minimum Z Height Altura mínima de Z - - + Maximum Z Height Altura máxima de Z - - + Cycle Time Tiempo de Ciclo - - + Coolant Refrigerante - - + TOTAL JOB TRABAJO TOTAL - - + Tool Number Número de Herramienta - - + Description Descripción - - + Manufacturer Fabricante - - + Part Number Número de pieza - - + URL URL - - + Inspection Notes Notas de Inspección - - + Tool Controller Controlador de herramienta - - + Feed Rate Tasa de Avance - - + Spindle Speed Velocidad del eje - - + Tool Shape Forma de herramienta - - + Tool Diameter Diámetro de Herramienta - - + X Size Tamaño X - - + Y Size Tamaño Y - - + Z Size Tamaño Z - - + Material Material - - + Work Offsets Desplazamientos de trabajo - - + Order By Ordenado por - - + Part Datum Referencia de Pieza - - + G-code File Archivo G-code - - + Last Post Process Date Fecha del último Post Proceso - - + Stops Paradas - - + Programmer Programador - - + Machine Máquina - - + Postprocessor Postprocesador - - + Post Processor Flags Indicadores del post procesador - - + File Size (kB) Tamaño del Archivo (kB) - - + Line Count Número de líneas - - + Note Nota - - + Operator Operador - - + Date Fecha - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used - Tool Controller '{}' is not used + El controlador de herramienta '{}' no se utiliza - + Consider Specifying the Stock Material - Consider Specifying the Stock Material + Considere especificar el material de stock - + The Job has not been post-processed - The Job has not been post-processed + El trabajo no ha sido postprocesado diff --git a/src/Mod/Path/Gui/Resources/translations/Path_es-ES.ts b/src/Mod/Path/Gui/Resources/translations/Path_es-ES.ts index b32cfaa6f8..3a5fca7b8d 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_es-ES.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_es-ES.ts @@ -6586,353 +6586,308 @@ Por ejemplo: Path_Sanity - + Check the path job for common errors Compruebe el trabajo de ruta para errores comunes - - - Setup Report for FreeCAD Job - Setup Report for FreeCAD Job - - - - Table of Contents - Table of Contents - - - - Part Information - Part Information - - - - Run Summary - Run Summary - - - - Rough Stock - Rough Stock - - Tool Data - Tool Data + Setup Report for FreeCAD Job + Configurar informe para el trabajo FreeCAD + Table of Contents + Tabla de Contenidos + + + + Part Information + Información de la parte + + + + Run Summary + Ejecutar Resumen + + + + Rough Stock + Boceto de Stock + + + + Tool Data + Datos de la herramienta + + + Output Salida - + Fixtures Fijaciones - + Squawks - Squawks + Pizarras - - + Base Object(s) Objeto(s) base - - + Job Sequence Secuencia de trabajo - - + Job Description Descripción del trabajo - - + Job Type Tipo de trabajo - - + CAD File Name Nombre del Archivo CAD - - + Last Save Date Última Fecha de Guardado - - + Customer Cliente - - + Designer Diseñador - - - - + + Operation Operación - - + Minimum Z Height Altura mínima de Z - - + Maximum Z Height Altura máxima de Z - - + Cycle Time Tiempo de Ciclo - - + Coolant Refrigerante - - + TOTAL JOB TRABAJO TOTAL - - + Tool Number Número de Herramienta - - + Description Descripción - - + Manufacturer Fabricante - - + Part Number Número de pieza - - + URL URL - - + Inspection Notes Notas de Inspección - - + Tool Controller Controlador de herramienta - - + Feed Rate Tasa de Avance - - + Spindle Speed Velocidad del eje - - + Tool Shape Forma de herramienta - - + Tool Diameter Diámetro de Herramienta - - + X Size Tamaño X - - + Y Size Tamaño Y - - + Z Size Tamaño Z - - + Material Material - - + Work Offsets Desplazamientos de trabajo - - + Order By Ordenado por - - + Part Datum Referencia de Pieza - - + G-code File Archivo G-code - - + Last Post Process Date Fecha del último Post Proceso - - + Stops Paradas - - + Programmer Programador - - + Machine Máquina - - + Postprocessor Postprocesador - - + Post Processor Flags Indicadores del post procesador - - + File Size (kB) Tamaño del Archivo (kB) - - + Line Count Número de líneas - - + Note Nota - - + Operator Operador - - + Date Fecha - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used - Tool Controller '{}' is not used + El controlador de herramienta '{}' no se utiliza - + Consider Specifying the Stock Material - Consider Specifying the Stock Material + Considere especificar el material de stock - + The Job has not been post-processed - The Job has not been post-processed + El trabajo no ha sido postprocesado diff --git a/src/Mod/Path/Gui/Resources/translations/Path_eu.ts b/src/Mod/Path/Gui/Resources/translations/Path_eu.ts index b6493dcda3..70baad838d 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_eu.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_eu.ts @@ -6586,353 +6586,308 @@ Adibidez: Path_Sanity - + Check the path job for common errors Aztertu bide-lana errore arruntak bilatzeko - - - Setup Report for FreeCAD Job - Setup Report for FreeCAD Job - - - - Table of Contents - Table of Contents - - - - Part Information - Part Information - - - - Run Summary - Run Summary - - - - Rough Stock - Rough Stock - - Tool Data - Tool Data + Setup Report for FreeCAD Job + Txosten-konfigurazioa FreeCAD lanerako + Table of Contents + Edukien aurkibidea + + + + Part Information + Zatiaren informazioa + + + + Run Summary + Exekutatu laburpena + + + + Rough Stock + Pieza gordin zimurra + + + + Tool Data + Tresna-datuak + + + Output Irteera - + Fixtures Finkapenak - + Squawks - Squawks + Irrintziak - - + Base Object(s) Oinarri-objektua(k) - - + Job Sequence Lan-sekuentzia - - + Job Description Lanaren deskribapena - - + Job Type Lan mota - - + CAD File Name CAD fitxategiaren izena - - + Last Save Date Azken gordetze-data - - + Customer Bezeroa - - + Designer Diseinatzailea - - - - + + Operation Eragiketa - - + Minimum Z Height Z altuera minimoa - - + Maximum Z Height Z altuera maximoa - - + Cycle Time Ziklo-denbora - - + Coolant Hozgarria - - + TOTAL JOB LAN OSOA - - + Tool Number Tresna-zenbakia - - + Description Deskribapena - - + Manufacturer Fabrikatzailea - - + Part Number Pieza-zenbakia - - + URL URLa - - + Inspection Notes Ikuskatze-oharrak - - + Tool Controller Tresna-kontrolagailua - - + Feed Rate Elikatze-tasa - - + Spindle Speed Hax-abiadura - - + Tool Shape Tresna-forma - - + Tool Diameter Tresna-diametroa - - + X Size X tamaina - - + Y Size Y tamaina - - + Z Size Z tamaina - - + Material Materiala - - + Work Offsets Laneko desplazamenduak - - + Order By Ordenatu honen arabera: - - + Part Datum Piezaren zero puntua - - + G-code File G-code fitxategia - - + Last Post Process Date Post-prozesatzearen azken data - - + Stops Geldiuneak - - + Programmer Programatzailea - - + Machine Makina - - + Postprocessor Post-prozesatzailea - - + Post Processor Flags Post-prozesatzailearen banderak - - + File Size (kB) Fitxategi tamaina (kB) - - + Line Count Lerro kopurua - - + Note Oharra - - + Operator Eragilea - - + Date Data - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - Tool number {} is a legacy tool. Legacy tools not - supported by Path-Sanity + {} zenbakidun tresna zaharra da. Path-Sanity tresnak + ez ditu tresna zaharrak onartzen - + Tool number {} used by multiple tools - Tool number {} used by multiple tools + Tresna batek baino gehiagok erabiltzen du {} zenbakidun tresna - + Tool Controller '{}' has no spindlespeed - Tool Controller '{}' has no spindlespeed + '{}' tresna-kontrolagailuak ez du hax-abiadurarik - + Tool Controller '{}' is not used - Tool Controller '{}' is not used + '{}' tresna-kontrolagailua ez da erabiltzen - + Consider Specifying the Stock Material - Consider Specifying the Stock Material + Kontuan hartu pieza gordina zehaztu daitekeela - + The Job has not been post-processed - The Job has not been post-processed + Lana ez da post-prozesatu diff --git a/src/Mod/Path/Gui/Resources/translations/Path_fi.ts b/src/Mod/Path/Gui/Resources/translations/Path_fi.ts index 6f3d5b3be3..eecc63439e 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_fi.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_fi.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Tuloste - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Kuvaus - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Materiaali - - + Work Offsets Work Offsets - - + Order By Order By - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Tiedoston koko (kilotavua) - - + Line Count Line Count - - + Note Note - - + Operator Operaattori - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_fr.ts b/src/Mod/Path/Gui/Resources/translations/Path_fr.ts index f60befd389..fe37642df0 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_fr.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_fr.ts @@ -6581,353 +6581,308 @@ Les valeurs seront converties dans l'unité souhaitée pendant le post-traitemen Path_Sanity - + Check the path job for common errors Vérifier les erreurs courantes dans la tâche du parcours - - - Setup Report for FreeCAD Job - Setup Report for FreeCAD Job - - - - Table of Contents - Table of Contents - - - - Part Information - Part Information - - - - Run Summary - Run Summary - - - - Rough Stock - Rough Stock - - Tool Data - Tool Data + Setup Report for FreeCAD Job + Rapport de configuration pour la tâche de FreeCAD + Table of Contents + Table des matières + + + + Part Information + Informations sur les pièces + + + + Run Summary + Résumé de l'exécution + + + + Rough Stock + Brut grossier + + + + Tool Data + Données de l'outil + + + Output Sortie - + Fixtures Accessoires - + Squawks - Squawks + Avertissements - - + Base Object(s) Objet(s) de base - - + Job Sequence Séquence de tâche - - + Job Description Description de la tâche - - + Job Type Type de tâche - - + CAD File Name Nom du fichier CAO - - + Last Save Date Date de la dernière sauvegarde - - + Customer Client - - + Designer Concepteur - - - - + + Operation Opération - - + Minimum Z Height Hauteur minimale de Z - - + Maximum Z Height Hauteur maximale de Z - - + Cycle Time Temps du cycle - - + Coolant Liquide de refroidissement - - + TOTAL JOB TÂCHE TOTAL - - + Tool Number Numéro de l'outil - - + Description Description - - + Manufacturer Fabricant - - + Part Number Numéro de la pièce - - + URL URL - - + Inspection Notes Notes d'inspection - - + Tool Controller Contrôleur d'outil - - + Feed Rate Débit d'alimentation - - + Spindle Speed Vitesse de la broche - - + Tool Shape Forme de l'outil - - + Tool Diameter Diamètre de l'outil - - + X Size Dimension X - - + Y Size Dimension Y - - + Z Size Dimension Z - - + Material Matériau - - + Work Offsets Décalages de travail - - + Order By Trier par - - + Part Datum Référence de la pièce - - + G-code File Fichier G-code - - + Last Post Process Date Date du dernier post-traitement - - + Stops Stops - - + Programmer Programmeur - - + Machine Machine - - + Postprocessor Post-processeur - - + Post Processor Flags Balises du post-processeur - - + File Size (kB) Taille du fichier (ko) - - + Line Count Nombre de lignes - - + Note Note - - + Operator Opérateur - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - Tool number {} is a legacy tool. Legacy tools not - supported by Path-Sanity + Le numéro {} de l'outil est un outil historique. Les outils historiques ne sont pas + supportés par Path Rechercher des erreurs - + Tool number {} used by multiple tools - Tool number {} used by multiple tools + Le numéro {} de l'outil est utilisé par plusieurs outils - + Tool Controller '{}' has no spindlespeed - Tool Controller '{}' has no spindlespeed + Le contrôleur d'outils '{}' n'a pas de vitesse de rotation - + Tool Controller '{}' is not used - Tool Controller '{}' is not used + Le contrôleur d'outils '{}' n'est pas utilisé - + Consider Specifying the Stock Material - Consider Specifying the Stock Material + Penser à spécifier le matériau du brut - + The Job has not been post-processed - The Job has not been post-processed + La tâche n'a pas été post-traitée diff --git a/src/Mod/Path/Gui/Resources/translations/Path_gl.ts b/src/Mod/Path/Gui/Resources/translations/Path_gl.ts index baefc4eb3d..ec10433b82 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_gl.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_gl.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Saída - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operación - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Descrición - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Ferramenta de control - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Material - - + Work Offsets Work Offsets - - + Order By Ordenar por - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programador - - + Machine Máquina - - + Postprocessor Pos-procesador - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Nota - - + Operator Operador - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_hr.ts b/src/Mod/Path/Gui/Resources/translations/Path_hr.ts index df8d887724..5d9b11df6d 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_hr.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_hr.ts @@ -6615,351 +6615,306 @@ Staza koju treba kopirati Path_Sanity - + Check the path job for common errors Provjerite ima li u stazi putanje uobičajenih pogrešaka - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Izlaz - + Fixtures Armatura - + Squawks Squawks - - + Base Object(s) Osnovni Objekt(i) - - + Job Sequence Redoslijed posla - - + Job Description Opis posla - - + Job Type Vrsta posla - - + CAD File Name Ime CAD datoteke - - + Last Save Date Zadnje spremljeni datum - - + Customer Klijent - - + Designer Dizajner - - - - + + Operation Operacija - - + Minimum Z Height Minimalna Z visina - - + Maximum Z Height Maksimalna Z visina - - + Cycle Time Vrijeme Ciklusa - - + Coolant Hlađenje - - + TOTAL JOB CIJELI POSAO - - + Tool Number Alatni broj - - + Description Opis - - + Manufacturer Proizvođač - - + Part Number Broj Djela - - + URL URL - - + Inspection Notes Inspekcijske zabilješke - - + Tool Controller Kontroler Alata - - + Feed Rate Brzina Pomaka - - + Spindle Speed Brzina Glodala - - + Tool Shape Oblik Alata - - + Tool Diameter Promjer Alata - - + X Size Veličina X - - + Y Size Veličina Y - - + Z Size Veličina Z - - + Material Materijal - - + Work Offsets Radni Pomaci (Offsets) - - + Order By Posloži po - - + Part Datum Datum Komponente - - + G-code File G-code Datoteka - - + Last Post Process Date Datum zadnjeg post procesa - - + Stops Stajališta - - + Programmer Programer - - + Machine Stroj - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Veličina Datoteke (kB) - - + Line Count Broj linija - - + Note Bilješka - - + Operator Operator - - + Date Datum - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_hu.ts b/src/Mod/Path/Gui/Resources/translations/Path_hu.ts index 03b3f40ee5..157ce3d71e 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_hu.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_hu.ts @@ -6580,351 +6580,306 @@ Például: Path_Sanity - + Check the path job for common errors Ellenőrizze a szerszámpálya útvonalát a gyakori hibákra - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Kimenet - + Fixtures Berendezési tárgyak - + Squawks Squawks - - + Base Object(s) Alap tárgy(ak) - - + Job Sequence Feladatsor - - + Job Description Feladat leírás - - + Job Type Feladat típusa - - + CAD File Name CAD fájl név - - + Last Save Date Utolsó mentés dátuma - - + Customer Ügyfél - - + Designer Tervező - - - - + + Operation Művelet - - + Minimum Z Height Minimális Z magasság - - + Maximum Z Height Maximális Z magasság - - + Cycle Time Ciklusidő - - + Coolant Hűtőfolyadék - - + TOTAL JOB ÖSSZES MUNKAFOLYAMAT - - + Tool Number Eszköz szám - - + Description Leírás - - + Manufacturer Gyártó - - + Part Number Cikkszám - - + URL URL - - + Inspection Notes Vizsgálati megjegyzés - - + Tool Controller Eszköz vezérlő - - + Feed Rate Előtolási sebesség - - + Spindle Speed Orsó sebessége - - + Tool Shape Szerszám alakja - - + Tool Diameter Szerszám étmérő - - + X Size X méret - - + Y Size Y méret - - + Z Size Z méret - - + Material Anyag - - + Work Offsets Nullapontos eltolások - - + Order By Rendezés - - + Part Datum Alkatrész referenciarendszer - - + G-code File G-kód fájl - - + Last Post Process Date Utolsó feldolgozott dátum - - + Stops Álj - - + Programmer Programozó - - + Machine Gép - - + Postprocessor Utófeldolgozó - - + Post Processor Flags Utófeldolgozó zászlók - - + File Size (kB) Fájl méret (kB) - - + Line Count Sorok száma - - + Note Megjegyzés - - + Operator Irányító - - + Date Dátum - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_id.ts b/src/Mod/Path/Gui/Resources/translations/Path_id.ts index 9119866951..9d1f5fd82f 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_id.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_id.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Keluaran - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Description - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Bahan - - + Work Offsets Work Offsets - - + Order By Order By - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Note - - + Operator Operator - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_it.ts b/src/Mod/Path/Gui/Resources/translations/Path_it.ts index 94b56de416..f701795518 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_it.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_it.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Output - + Fixtures Infissi - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operazione - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Refrigerante - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Descrizione - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Controllore Strumento - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Materiale - - + Work Offsets Work Offsets - - + Order By Ordina per - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmatore - - + Machine Macchina - - + Postprocessor Postprocessore - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Dimensione File (kB) - - + Line Count Line Count - - + Note Nota - - + Operator Operatore - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ja.ts b/src/Mod/Path/Gui/Resources/translations/Path_ja.ts index ad87c82621..00bbfd8530 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ja.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ja.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output 出力 - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation オペレーション - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant 冷却剤 - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description 説明 - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material マテリアル - - + Work Offsets Work Offsets - - + Order By Order By - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer プログラマー - - + Machine マシン - - + Postprocessor ポストプロセッサー - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note 注記 - - + Operator 演算子 - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ka.ts b/src/Mod/Path/Gui/Resources/translations/Path_ka.ts index 00270724b7..3399c73082 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ka.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ka.ts @@ -6586,353 +6586,308 @@ For example: Path_Sanity - + Check the path job for common errors ტრაექტორიის დავალების გავრცელებულ შეცდომებზე შემოწმება - + Setup Report for FreeCAD Job - Setup Report for FreeCAD Job + ანგარიშის მორგება FreeCAD-ის დავალებისთვის - + Table of Contents - Table of Contents + სარჩევი - + Part Information - Part Information + ნაწილის ინფორმაცია - + Run Summary - Run Summary + შეჯამების გაშვება - + Rough Stock Rough Stock - + Tool Data - Tool Data + ხელსაწყოს მონაცემები - + Output გამოტანა - + Fixtures არმატურები - + Squawks Squawks - - + Base Object(s) საბაზისო ობიექტ(ებ)ი - - + Job Sequence დავალებების მიმდევრობა - - + Job Description დავალების აღწერა - - + Job Type დავალების ტიპი - - + CAD File Name CAD ფაილის სახელი - - + Last Save Date ბოლოს შენახვის თარიღი - - + Customer შემკვეთი - - + Designer დიზაინერი - - - - + + Operation ოპერაცია - - + Minimum Z Height მინიმალური Z სიმაღლე - - + Maximum Z Height მაქსიმალური Z სიმაღლე - - + Cycle Time ციკლის დრო - - + Coolant გამაგრილებელი - - + TOTAL JOB სრული დავალება - - + Tool Number ხელსაწყოს ნომერი - - + Description აღწერა - - + Manufacturer მწარმოებელი - - + Part Number ნაწილის ნომერი - - + URL URL - - + Inspection Notes ინსპექციის შენიშვნები - - + Tool Controller ხელსაწყოს კონტროლერი - - + Feed Rate მიწოდების სიჩქარე - - + Spindle Speed შპინდელის სიჩქარე - - + Tool Shape ხელსაწყოს ფორმა - - + Tool Diameter ხელსაწყოს დიამეტრი - - + X Size X ზომა - - + Y Size Y ზომა - - + Z Size Z ზომა - - + Material მასალა - - + Work Offsets სამუშაოს წანაცვლებები - - + Order By დალაგება - - + Part Datum ნაწილის თარიღი - - + G-code File G-code-ის ფაილი - - + Last Post Process Date ბოლო პოსტპროცესის თარიღი - - + Stops გაჩერებები - - + Programmer პროგრამისტი - - + Machine მანქანა - - + Postprocessor პოსტპროცესორი - - + Post Processor Flags პოსტპროცესორის პარამეტრები - - + File Size (kB) ფაილის ზომა (კბ) - - + Line Count ხაზების რაოდენობა - - + Note შენიშვნა - - + Operator ოპერატორი - - + Date თარიღი - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - Tool number {} is a legacy tool. Legacy tools not - supported by Path-Sanity + ხელსაწყო ნომრით {} მოძველებულია. მოძველებული ხელსაწყოები + Path-Sanity-ის მიერ მხარდაჭერილი არაა - + Tool number {} used by multiple tools - Tool number {} used by multiple tools + ხელსაწყოს ნომერი {} ერთზე მეტი ხელსაწყოს მიერ გამოიყენება - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used - Tool Controller '{}' is not used + ხელსაწყოს კონტროლერი '{}' არ გამოიყენება - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed - The Job has not been post-processed + დავალების პოსტპროცესინგი არ მომხდარა diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ko.ts b/src/Mod/Path/Gui/Resources/translations/Path_ko.ts index 44f21edf24..17e7abe114 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ko.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ko.ts @@ -6580,351 +6580,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output 출력 - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description 설명 - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material 재료 - - + Work Offsets Work Offsets - - + Order By Order By - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Note - - + Operator 연산자 - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_nl.ts b/src/Mod/Path/Gui/Resources/translations/Path_nl.ts index d39ed5a7a0..582548730c 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_nl.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_nl.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents - Table of Contents + Inhoudsopgave - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Uitvoer - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Basisobject(en) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD-bestandsnaam - - + Last Save Date Laatste opslagdatum - - + Customer Klant - - + Designer Ontwerper - - - - + + Operation Bewerking - - + Minimum Z Height Minimale Z-hoogte - - + Maximum Z Height Maximale Z-hoogte - - + Cycle Time Cyclustijd - - + Coolant Koelvloeistof - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Omschrijving - - + Manufacturer Fabrikant - - + Part Number Onderdeelnummer - - + URL URL - - + Inspection Notes Inspectienotities - - + Tool Controller Gereedschapsregelaar - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X-grootte - - + Y Size Y-grootte - - + Z Size Z-grootte - - + Material Materiaal - - + Work Offsets Work Offsets - - + Order By Sorteren op - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmeur - - + Machine Machine - - + Postprocessor Nabewerking - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Bestandsgrootte (kB) - - + Line Count Line Count - - + Note Aantekening - - + Operator Operand - - + Date Datum - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_pl.ts b/src/Mod/Path/Gui/Resources/translations/Path_pl.ts index 4847f0266d..cc7cd19f39 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_pl.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_pl.ts @@ -6592,353 +6592,308 @@ OL Dropcutter* lub Eksperymentalny (nieoparty na OCL). Path_Sanity - + Check the path job for common errors Sprawdź zadanie ścieżki pod kątem typowych błędów - - - Setup Report for FreeCAD Job - Setup Report for FreeCAD Job - - - - Table of Contents - Table of Contents - - - - Part Information - Part Information - - - - Run Summary - Run Summary - - - - Rough Stock - Rough Stock - - Tool Data - Tool Data + Setup Report for FreeCAD Job + Raport konfiguracji dla zadania FreeCAD + Table of Contents + Spis treści + + + + Part Information + Informacja o Części + + + + Run Summary + Podsumowanie przebiegu + + + + Rough Stock + Surowa przygotówka + + + + Tool Data + Dane narzędzia + + + Output Wyjście - + Fixtures Uchwyty - + Squawks - Squawks + Kawałki - - + Base Object(s) Obiekty bazowe - - + Job Sequence Sekwencja zadania - - + Job Description Opis zadania - - + Job Type Typ zadania - - + CAD File Name Nazwa pliku CAD - - + Last Save Date Data ostatniego zapisu - - + Customer Klient - - + Designer Projektant - - - - + + Operation Operacja - - + Minimum Z Height Minimalna wysokość Z - - + Maximum Z Height Maksymalna wysokość Z - - + Cycle Time Czas cyklu - - + Coolant Chłodziwo - - + TOTAL JOB Zadanie ogółem - - + Tool Number Numer narzędzia - - + Description Opis - - + Manufacturer Producent - - + Part Number Numer części - - + URL Adres URL - - + Inspection Notes Uwagi do kontroli - - + Tool Controller Kontroler narzędzi - - + Feed Rate Posuw - - + Spindle Speed Prędkość wrzeciona - - + Tool Shape Kształt narzędzia - - + Tool Diameter Średnica narzędzia - - + X Size Rozmiar X - - + Y Size Rozmiar Y - - + Z Size Rozmiar Z - - + Material Materiał - - + Work Offsets Przesunięcia punktu zerowego - - + Order By Sortuj według - - + Part Datum Układ odniesienia detalu - - + G-code File Plik G-code - - + Last Post Process Date Data ostatniego przetwarzania - - + Stops Zatrzymaj - - + Programmer Programista - - + Machine Maszyna - - + Postprocessor Postprocesor - - + Post Processor Flags Flagi postprocesora - - + File Size (kB) Rozmiar pliku (kB) - - + Line Count Liczba linii - - + Note Uwaga - - + Operator Operator - - + Date Data - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - Tool number {} is a legacy tool. Legacy tools not - supported by Path-Sanity + Narzędzie numer {} jest narzędziem starszego typu. +Starsze narzędzia nie są obsługiwane przez funkcję Bezpieczeństwo CAM - + Tool number {} used by multiple tools - Tool number {} used by multiple tools + Przypisany numer narzędzia {} jest wykorzystany wielokrotnie - + Tool Controller '{}' has no spindlespeed - Tool Controller '{}' has no spindlespeed + Kontroler narzędzi '{}' nie ma prędkości wrzeciona - + Tool Controller '{}' is not used - Tool Controller '{}' is not used + Kontroler narzędzi '{}' nie jest używany - + Consider Specifying the Stock Material - Consider Specifying the Stock Material + Rozważ określenie materiału przygotówki - + The Job has not been post-processed - The Job has not been post-processed + Zadanie nie zostało poddane obróbce końcowej diff --git a/src/Mod/Path/Gui/Resources/translations/Path_pt-BR.ts b/src/Mod/Path/Gui/Resources/translations/Path_pt-BR.ts index aad50c7616..1534fee214 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_pt-BR.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_pt-BR.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Saída - + Fixtures Fixações - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operação - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Líquido de refrigeração - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Descrição - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Controlador de ferramenta - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Material - - + Work Offsets Work Offsets - - + Order By Ordenar por - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programador - - + Machine Máquina - - + Postprocessor Pós-processador - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Tamanho do Arquivo (kB) - - + Line Count Line Count - - + Note Observação - - + Operator Operador - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_pt-PT.ts b/src/Mod/Path/Gui/Resources/translations/Path_pt-PT.ts index 6f5e404049..73f322f335 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_pt-PT.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_pt-PT.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Destino - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operação - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Refrigerante - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Descrição - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Controlador de Ferramenta - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Material - - + Work Offsets Work Offsets - - + Order By Ordenar Por - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programador - - + Machine Máquina - - + Postprocessor Pós-processador - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Tamanho do Arquivo (kB) - - + Line Count Line Count - - + Note Nota - - + Operator Operador - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ro.ts b/src/Mod/Path/Gui/Resources/translations/Path_ro.ts index 59544402cb..606545c339 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ro.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ro.ts @@ -6591,351 +6591,306 @@ De exemplu: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Ieşire - + Fixtures Reparații - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operațiune - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Descriere - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Controler sculă - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Materialul - - + Work Offsets Work Offsets - - + Order By Ordonare după - - + Part Datum Part Datum - - + G-code File Fișier G-code - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programator - - + Machine Mașină - - + Postprocessor Postprocesor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Notă - - + Operator Operator - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ru.ts b/src/Mod/Path/Gui/Resources/translations/Path_ru.ts index e800e28eb1..aae034f671 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ru.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ru.ts @@ -6578,353 +6578,308 @@ For example: Path_Sanity - + Check the path job for common errors Проверьте задание пути на распространенные ошибки - - - Setup Report for FreeCAD Job - Setup Report for FreeCAD Job - - - - Table of Contents - Table of Contents - - - - Part Information - Part Information - - - - Run Summary - Run Summary - - - - Rough Stock - Rough Stock - - Tool Data - Tool Data + Setup Report for FreeCAD Job + Отчет о настройке для задания FreeCAD + Table of Contents + Содержание + + + + Part Information + Информация о детали + + + + Run Summary + Сводка результатов + + + + Rough Stock + Необработанный материал + + + + Tool Data + Данные инструмента + + + Output Вывод - + Fixtures Зажимы(либо Арматура) - + Squawks - Squawks + Визг (металла) - - + Base Object(s) Базовый объект(ы) - - + Job Sequence Последовательность заданий обработки - - + Job Description Описание задания обработки - - + Job Type Тип задания - - + CAD File Name Имя файла CAD - - + Last Save Date Дата последнего сохранения - - + Customer Клиент - - + Designer Дизайнер - - - - + + Operation Операция - - + Minimum Z Height Минимальная высота Z - - + Maximum Z Height Максимум Z высота - - + Cycle Time Время цикла - - + Coolant Охлаждающая жидкость - - + TOTAL JOB ВСЕГО ЗАДАНИЙ ОБРАБОТКИ - - + Tool Number Инструмент № - - + Description Описание - - + Manufacturer Производитель - - + Part Number Артикул детали - - + URL Ссылка - - + Inspection Notes Инспекционные примечания - - + Tool Controller Контроллер инструмента - - + Feed Rate Подача рабочая - - + Spindle Speed Скорость шпинделя - - + Tool Shape Форма инструмента - - + Tool Diameter Диаметр инструмента - - + X Size Размер по оси X - - + Y Size Размер по оси Y - - + Z Size Размер по оси Z - - + Material Материал - - + Work Offsets Рабочие смещения - - + Order By Упорядочить По - - + Part Datum Опорные координаты детали - - + G-code File Файл G Code - - + Last Post Process Date Дата последнего пост-процесса - - + Stops Остановки - - + Programmer Программист - - + Machine Станок - - + Postprocessor Постпроцессор - - + Post Processor Flags Флаги Пост-процессора - - + File Size (kB) Размер файла (кбайт) - - + Line Count Кол-во Линий - - + Note Заметка - - + Operator Оператор - - + Date Дата - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - Tool number {} is a legacy tool. Legacy tools not - supported by Path-Sanity + Инструмент номер {} является устаревшим инструментом. Устаревшие инструменты не + при поддержке Path-Sanity - + Tool number {} used by multiple tools - Tool number {} used by multiple tools + Номер инструмента {}, используемый несколькими инструментами - + Tool Controller '{}' has no spindlespeed - Tool Controller '{}' has no spindlespeed + Контроллер инструмента «{}» не имеет скорости шпинделя - + Tool Controller '{}' is not used - Tool Controller '{}' is not used + Контроллер инструментов «{}» не используется - + Consider Specifying the Stock Material - Consider Specifying the Stock Material + Рассмотрите возможность указания материала заготовки - + The Job has not been post-processed - The Job has not been post-processed + Работа не прошла постобработку diff --git a/src/Mod/Path/Gui/Resources/translations/Path_sl.ts b/src/Mod/Path/Gui/Resources/translations/Path_sl.ts index 563aedcddc..c794ffd3e1 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_sl.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_sl.ts @@ -6586,351 +6586,306 @@ Na primer: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Izpis - + Fixtures Vgrajena oprema - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Dejanje - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Hladilo - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Opis - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Orodni krmilnik - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Snov - - + Work Offsets Work Offsets - - + Order By Razvrsti po - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programer - - + Machine Naprava - - + Postprocessor Poopravilnik - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Opomba - - + Operator Operator - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_sr-CS.ts b/src/Mod/Path/Gui/Resources/translations/Path_sr-CS.ts index 4dd46bc595..c7ddc65dda 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_sr-CS.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_sr-CS.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Izlaz - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Rashladna tečnost - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Opis - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL adresa - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Materijal - - + Work Offsets Work Offsets - - + Order By Razvrstaj po - - + Part Datum Part Datum - - + G-code File G-kod datoteka - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Veličina datoteke (kB) - - + Line Count Line Count - - + Note Note - - + Operator Operator - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_sr.ts b/src/Mod/Path/Gui/Resources/translations/Path_sr.ts index c98abd275f..30004f8ada 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_sr.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_sr.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Излаз - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Расхладна течност - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Опис - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL адреса - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Материјал - - + Work Offsets Work Offsets - - + Order By Разврстај по - - + Part Datum Part Datum - - + G-code File Г-код датотека - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) Величина датотеке (кБ) - - + Line Count Line Count - - + Note Напомена - - + Operator Оператор - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_sv-SE.ts b/src/Mod/Path/Gui/Resources/translations/Path_sv-SE.ts index 6e088ab7ef..1454de2a7b 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_sv-SE.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_sv-SE.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Utmatning - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Kylmedel - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Beskrivning - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Material - - + Work Offsets Work Offsets - - + Order By Beställt av - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmerare - - + Machine Maskin - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Anteckning - - + Operator Operator - - + Date Datum - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_tr.ts b/src/Mod/Path/Gui/Resources/translations/Path_tr.ts index 9fcc289b36..421c16cc13 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_tr.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_tr.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Çıktı - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation İşlem - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Soğutma sıvısı - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Açıklama - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Araç Denetleyicisi - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Malzeme - - + Work Offsets Work Offsets - - + Order By Sıralama - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programcı - - + Machine Makine - - + Postprocessor Post işlemcisi - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Not - - + Operator İşleç - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_uk.ts b/src/Mod/Path/Gui/Resources/translations/Path_uk.ts index ce576bdf33..5bedc584cd 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_uk.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_uk.ts @@ -6589,351 +6589,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents - Table of Contents + Зміст - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Вивід - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Опис - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL Посилання - - + Inspection Notes Inspection Notes - - + Tool Controller Інструмент - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Матеріал - - + Work Offsets Work Offsets - - + Order By Сортувати за - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Примітка - - + Operator Оператор - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_val-ES.ts b/src/Mod/Path/Gui/Resources/translations/Path_val-ES.ts index d77ffd6b7b..d0eb3eea3a 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_val-ES.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_val-ES.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output Eixida - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operació - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description Descripció - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL URL - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material Material - - + Work Offsets Work Offsets - - + Order By Order By - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Note - - + Operator Operador - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_zh-CN.ts b/src/Mod/Path/Gui/Resources/translations/Path_zh-CN.ts index bb55174591..394c9e0076 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_zh-CN.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_zh-CN.ts @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output 输出 - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation 操作 - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant Coolant - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description 描述 - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL 网址 - - + Inspection Notes Inspection Notes - - + Tool Controller 工具控制器 - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material 材质 - - + Work Offsets Work Offsets - - + Order By Order By - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note 备注 - - + Operator 运算符 - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Gui/Resources/translations/Path_zh-TW.ts b/src/Mod/Path/Gui/Resources/translations/Path_zh-TW.ts index ffb5525f0b..e4d5602cfe 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_zh-TW.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_zh-TW.ts @@ -2785,7 +2785,7 @@ Should multiple tools or tool shapes with the same name exist in different direc Warnings - Warnings + 警告 @@ -4311,7 +4311,7 @@ For example: Warning - Warning + 警告 @@ -6431,7 +6431,7 @@ For example: Warning - Warning + 警告 @@ -6588,351 +6588,306 @@ For example: Path_Sanity - + Check the path job for common errors Check the path job for common errors - + Setup Report for FreeCAD Job Setup Report for FreeCAD Job - + Table of Contents Table of Contents - + Part Information Part Information - + Run Summary Run Summary - + Rough Stock Rough Stock - + Tool Data Tool Data - + Output 輸出 - + Fixtures Fixtures - + Squawks Squawks - - + Base Object(s) Base Object(s) - - + Job Sequence Job Sequence - - + Job Description Job Description - - + Job Type Job Type - - + CAD File Name CAD File Name - - + Last Save Date Last Save Date - - + Customer Customer - - + Designer Designer - - - - + + Operation Operation - - + Minimum Z Height Minimum Z Height - - + Maximum Z Height Maximum Z Height - - + Cycle Time Cycle Time - - + Coolant 冷卻劑 - - + TOTAL JOB TOTAL JOB - - + Tool Number Tool Number - - + Description 說明 - - + Manufacturer Manufacturer - - + Part Number Part Number - - + URL 網址 - - + Inspection Notes Inspection Notes - - + Tool Controller Tool Controller - - + Feed Rate Feed Rate - - + Spindle Speed Spindle Speed - - + Tool Shape Tool Shape - - + Tool Diameter Tool Diameter - - + X Size X Size - - + Y Size Y Size - - + Z Size Z Size - - + Material 材質 - - + Work Offsets Work Offsets - - + Order By Order By - - + Part Datum Part Datum - - + G-code File G-code File - - + Last Post Process Date Last Post Process Date - - + Stops Stops - - + Programmer Programmer - - + Machine Machine - - + Postprocessor Postprocessor - - + Post Processor Flags Post Processor Flags - - + File Size (kB) File Size (kB) - - + Line Count Line Count - - + Note Note - - + Operator 操作 - - + Date Date - + Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity Tool number {} is a legacy tool. Legacy tools not supported by Path-Sanity - + Tool number {} used by multiple tools Tool number {} used by multiple tools - + Tool Controller '{}' has no spindlespeed Tool Controller '{}' has no spindlespeed - + Tool Controller '{}' is not used Tool Controller '{}' is not used - + Consider Specifying the Stock Material Consider Specifying the Stock Material - + The Job has not been post-processed The Job has not been post-processed diff --git a/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py b/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py index 23f9e6f73f..4b9a2b65a1 100644 --- a/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py +++ b/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py @@ -559,7 +559,10 @@ class ObjectDressup: queue = [] # Save all move commands - queue.append(curCommand) + # getLeadStart and getLeadEnd incorrectly treat missing axis words as being 0. + currXYZ = { k: currLocation[k] for k in "XYZ" if k in currLocation } + tmp = Path.Command(curCommand.Name, currXYZ | curCommand.Parameters) + queue.append(tmp) currLocation.update(curCommand.Parameters) prevCmd = curCommand diff --git a/src/Mod/Path/Path/Post/UtilsArguments.py b/src/Mod/Path/Path/Post/UtilsArguments.py index 2adcb76109..3019821afd 100644 --- a/src/Mod/Path/Path/Post/UtilsArguments.py +++ b/src/Mod/Path/Path/Post/UtilsArguments.py @@ -504,10 +504,6 @@ def init_shared_values(values): # values["RAPID_MOVES"] = ["G0", "G00"] # - # If True suppress any messages. - # - values["REMOVE_MESSAGES"] = True - # # Any commands in this value are output after the operation(s) # and post_operation commands are output but before the # TOOLRETURN, SAFETYBLOCK, and POSTAMBLE. diff --git a/src/Mod/Path/Path/Post/UtilsExport.py b/src/Mod/Path/Path/Post/UtilsExport.py index b34b63ae12..ac753130ac 100644 --- a/src/Mod/Path/Path/Post/UtilsExport.py +++ b/src/Mod/Path/Path/Post/UtilsExport.py @@ -29,108 +29,269 @@ import datetime import os +from typing import Any, Dict, List import FreeCAD import Path.Post.Utils as PostUtils import Path.Post.UtilsParse as PostUtilsParse import Path.Tool.Controller as PathToolController -# -# This routine processes things in the following order: -# -# OUTPUT_HEADER -# SAFETYBLOCK -# LIST_TOOLS_IN_PREAMBLE -# PREAMBLE -# OUTPUT_BCNC -# SHOW_OPERATION_LABELS -# SHOW_MACHINE_UNITS -# PRE_OPERATION -# ENABLE_COOLANT (coolant on) -# operation(s) -# POST_OPERATION -# ENABLE_COOLANT (coolant off) -# RETURN_TO -# OUTPUT_BCNC -# TOOLRETURN -# SAFETYBLOCK -# POSTAMBLE -# SHOW_EDITOR -# -# The names in all caps may be enabled/disabled/modified by setting -# the corresponding value in the postprocessor. -# +# Define some types that are used throughout this file +Gcode = List[str] +Values = Dict[str, Any] -def export_common(values, objectslist, filename): - """Do the common parts of postprocessing the objects in objectslist to filename.""" - # - nl = "\n" - - for obj in objectslist: - if not hasattr(obj, "Path"): - print( - f"The object {obj.Name} is not a path. Please select only path and Compounds." - ) - return None - - # for obj in objectslist: - # print(obj.Name) - - print(f'PostProcessor: {values["POSTPROCESSOR_FILE_NAME"]} postprocessing...') - gcode = "" - - # write header - if values["OUTPUT_HEADER"]: - comment = PostUtilsParse.create_comment(values, "Exported by FreeCAD") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - comment = PostUtilsParse.create_comment( - values, f'Post Processor: {values["POSTPROCESSOR_FILE_NAME"]}' - ) - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - if FreeCAD.ActiveDocument: - cam_file = os.path.basename(FreeCAD.ActiveDocument.FileName) - else: - cam_file = "" - comment = PostUtilsParse.create_comment(values, f"Cam File: {cam_file}") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - comment = PostUtilsParse.create_comment( - values, f"Output Time: {str(datetime.datetime.now())}" - ) - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - - # Check canned cycles for drilling +def check_canned_cycles(values: Values) -> None: + """Check canned cycles for drilling.""" if values["TRANSLATE_DRILL_CYCLES"]: if len(values["SUPPRESS_COMMANDS"]) == 0: values["SUPPRESS_COMMANDS"] = ["G99", "G98", "G80"] else: values["SUPPRESS_COMMANDS"] += ["G99", "G98", "G80"] - for line in values["SAFETYBLOCK"].splitlines(False): - gcode += f"{PostUtilsParse.linenumber(values)}{line}{nl}" - # Write the preamble - if values["OUTPUT_COMMENTS"]: - if values["LIST_TOOLS_IN_PREAMBLE"]: - for item in objectslist: - if hasattr(item, "Proxy") and isinstance( - item.Proxy, PathToolController.ToolController - ): - comment = PostUtilsParse.create_comment( - values, f"T{item.ToolNumber}={item.Name}" - ) - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - comment = PostUtilsParse.create_comment(values, "Begin preamble") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - for line in values["PREAMBLE"].splitlines(False): - gcode += f"{PostUtilsParse.linenumber(values)}{line}{nl}" - # verify if PREAMBLE or SAFETYBLOCK have changed MOTION_MODE or UNITS +def determine_coolant_mode(obj) -> str: + """Determine the coolant mode.""" + if ( + hasattr(obj, "CoolantMode") + or hasattr(obj, "Base") + and hasattr(obj.Base, "CoolantMode") + ): + if hasattr(obj, "CoolantMode"): + return obj.CoolantMode + return obj.Base.CoolantMode + return "None" + + +def output_coolant_off(values: Values, gcode: Gcode, coolant_mode: str) -> None: + """Output the commands to turn coolant off if necessary.""" + comment: str + nl: str = "\n" + + if values["ENABLE_COOLANT"] and coolant_mode != "None": + if values["OUTPUT_COMMENTS"]: + comment = PostUtilsParse.create_comment( + values, f"Coolant Off: {coolant_mode}" + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + gcode.append(f"{PostUtilsParse.linenumber(values)}M9{nl}") + + +def output_coolant_on(values: Values, gcode: Gcode, coolant_mode: str) -> None: + """Output the commands to turn coolant on if necessary.""" + comment: str + nl: str = "\n" + + if values["ENABLE_COOLANT"]: + if values["OUTPUT_COMMENTS"] and coolant_mode != "None": + comment = PostUtilsParse.create_comment( + values, f"Coolant On: {coolant_mode}" + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + if coolant_mode == "Flood": + gcode.append(f"{PostUtilsParse.linenumber(values)}M8{nl}") + elif coolant_mode == "Mist": + gcode.append(f"{PostUtilsParse.linenumber(values)}M7{nl}") + + +def output_end_bcnc(values: Values, gcode: Gcode) -> None: + """Output the ending BCNC header.""" + comment: str + nl: str = "\n" + + if values["OUTPUT_BCNC"]: + comment = PostUtilsParse.create_comment(values, "Block-name: post_amble") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + comment = PostUtilsParse.create_comment(values, "Block-expand: 0") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + comment = PostUtilsParse.create_comment(values, "Block-enable: 1") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + + +def output_header(values: Values, gcode: Gcode) -> None: + """Output the header.""" + cam_file: str + comment: str + nl: str = "\n" + + if not values["OUTPUT_HEADER"]: + return + comment = PostUtilsParse.create_comment(values, "Exported by FreeCAD") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + comment = PostUtilsParse.create_comment( + values, f'Post Processor: {values["POSTPROCESSOR_FILE_NAME"]}' + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + if FreeCAD.ActiveDocument: + cam_file = os.path.basename(FreeCAD.ActiveDocument.FileName) + else: + cam_file = "" + comment = PostUtilsParse.create_comment(values, f"Cam File: {cam_file}") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + comment = PostUtilsParse.create_comment( + values, f"Output Time: {str(datetime.datetime.now())}" + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + + +def output_motion_mode(values: Values, gcode: Gcode) -> None: + """Verify if PREAMBLE or SAFETYBLOCK have changed MOTION_MODE.""" + nl: str = "\n" + if "G90" in values["PREAMBLE"] or "G90" in values["SAFETYBLOCK"]: values["MOTION_MODE"] = "G90" elif "G91" in values["PREAMBLE"] or "G91" in values["SAFETYBLOCK"]: values["MOTION_MODE"] = "G91" else: - gcode += f'{PostUtilsParse.linenumber(values)}{values["MOTION_MODE"]}{nl}' + gcode.append(f'{PostUtilsParse.linenumber(values)}{values["MOTION_MODE"]}{nl}') + + +def output_postamble_header(values: Values, gcode: Gcode) -> None: + """Output the postamble header.""" + comment: str = "" + nl: str = "\n" + + if values["OUTPUT_COMMENTS"]: + comment = PostUtilsParse.create_comment(values, "Begin postamble") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + + +def output_postamble(values: Values, gcode: Gcode) -> None: + """Output the postamble.""" + line: str + nl: str = "\n" + + for line in values["POSTAMBLE"].splitlines(False): + gcode.append(f"{PostUtilsParse.linenumber(values)}{line}{nl}") + + +def output_postop(values: Values, gcode: Gcode, obj) -> None: + """Output the post-operation information.""" + comment: str + line: str + nl: str = "\n" + + if values["OUTPUT_COMMENTS"]: + comment = PostUtilsParse.create_comment( + values, f'{values["FINISH_LABEL"]} operation: {obj.Label}' + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + for line in values["POST_OPERATION"].splitlines(False): + gcode.append(f"{PostUtilsParse.linenumber(values)}{line}{nl}") + + +def output_preamble(values: Values, gcode: Gcode) -> None: + """Output the preamble.""" + comment: str + line: str + nl: str = "\n" + + if values["OUTPUT_COMMENTS"]: + comment = PostUtilsParse.create_comment(values, "Begin preamble") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + for line in values["PREAMBLE"].splitlines(False): + gcode.append(f"{PostUtilsParse.linenumber(values)}{line}{nl}") + + +def output_preop(values: Values, gcode: Gcode, obj) -> None: + """Output the pre-operation information.""" + comment: str + line: str + nl: str = "\n" + + if values["OUTPUT_COMMENTS"]: + if values["SHOW_OPERATION_LABELS"]: + comment = PostUtilsParse.create_comment( + values, f"Begin operation: {obj.Label}" + ) + else: + comment = PostUtilsParse.create_comment(values, "Begin operation") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + if values["SHOW_MACHINE_UNITS"]: + comment = PostUtilsParse.create_comment( + values, f'Machine units: {values["UNIT_SPEED_FORMAT"]}' + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + if values["OUTPUT_MACHINE_NAME"]: + comment = PostUtilsParse.create_comment( + values, + f'Machine: {values["MACHINE_NAME"]}, {values["UNIT_SPEED_FORMAT"]}', + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + for line in values["PRE_OPERATION"].splitlines(False): + gcode.append(f"{PostUtilsParse.linenumber(values)}{line}{nl}") + + +def output_return_to(values: Values, gcode: Gcode) -> None: + """Output the RETURN_TO command.""" + cmd: str + nl: str = "\n" + num_x: str + num_y: str + num_z: str + + if values["RETURN_TO"]: + num_x = values["RETURN_TO"][0] + num_y = values["RETURN_TO"][1] + num_z = values["RETURN_TO"][2] + cmd = PostUtilsParse.format_command_line( + values, ["G0", f"X{num_x}", f"Y{num_y}", f"Z{num_z}"] + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{cmd}{nl}") + + +def output_safetyblock(values: Values, gcode: Gcode) -> None: + """Output the safety block.""" + line: str + nl: str = "\n" + + for line in values["SAFETYBLOCK"].splitlines(False): + gcode.append(f"{PostUtilsParse.linenumber(values)}{line}{nl}") + + +def output_start_bcnc(values: Values, gcode: Gcode, obj) -> None: + """Output the starting BCNC header.""" + comment: str + nl: str = "\n" + + if values["OUTPUT_BCNC"]: + comment = PostUtilsParse.create_comment(values, f"Block-name: {obj.Label}") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + comment = PostUtilsParse.create_comment(values, "Block-expand: 0") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + comment = PostUtilsParse.create_comment(values, "Block-enable: 1") + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + + +def output_tool_list(values: Values, gcode: Gcode, objectslist) -> None: + """Output a list of the tools used in the objects.""" + comment: str + nl: str = "\n" + + if values["OUTPUT_COMMENTS"] and values["LIST_TOOLS_IN_PREAMBLE"]: + for item in objectslist: + if hasattr(item, "Proxy") and isinstance( + item.Proxy, PathToolController.ToolController + ): + comment = PostUtilsParse.create_comment( + values, f"T{item.ToolNumber}={item.Name}" + ) + gcode.append(f"{PostUtilsParse.linenumber(values)}{comment}{nl}") + + +def output_tool_return(values: Values, gcode: Gcode) -> None: + """Output the tool return block.""" + line: str + nl: str = "\n" + + for line in values["TOOLRETURN"].splitlines(False): + gcode.append(f"{PostUtilsParse.linenumber(values)}{line}{nl}") + + +def output_units(values: Values, gcode: Gcode) -> None: + """Verify if PREAMBLE or SAFETYBLOCK have changed UNITS.""" + nl: str = "\n" + if "G21" in values["PREAMBLE"] or "G21" in values["SAFETYBLOCK"]: values["UNITS"] = "G21" values["UNIT_FORMAT"] = "mm" @@ -140,132 +301,79 @@ def export_common(values, objectslist, filename): values["UNIT_FORMAT"] = "in" values["UNIT_SPEED_FORMAT"] = "in/min" else: - gcode += f'{PostUtilsParse.linenumber(values)}{values["UNITS"]}{nl}' + gcode.append(f'{PostUtilsParse.linenumber(values)}{values["UNITS"]}{nl}') + + +def export_common(values: Values, objectslist, filename: str) -> str: + """Do the common parts of postprocessing the objects in objectslist to filename.""" + coolant_mode: str + dia: PostUtils.GCodeEditorDialog + final: str + gcode: Gcode = [] + result: bool for obj in objectslist: + if not hasattr(obj, "Path"): + print(f"The object {obj.Name} is not a path.") + print("Please select only path and Compounds.") + return "" + print(f'PostProcessor: {values["POSTPROCESSOR_FILE_NAME"]} postprocessing...') + + check_canned_cycles(values) + output_header(values, gcode) + output_safetyblock(values, gcode) + output_tool_list(values, gcode, objectslist) + output_preamble(values, gcode) + output_motion_mode(values, gcode) + output_units(values, gcode) + + for obj in objectslist: # Skip inactive operations if hasattr(obj, "Active") and not obj.Active: continue if hasattr(obj, "Base") and hasattr(obj.Base, "Active") and not obj.Base.Active: continue + coolant_mode = determine_coolant_mode(obj) + output_start_bcnc(values, gcode, obj) + output_preop(values, gcode, obj) + output_coolant_on(values, gcode, coolant_mode) + # output the G-code for the group (compound) or simple path + PostUtilsParse.parse_a_group(values, gcode, obj) + output_postop(values, gcode, obj) + output_coolant_off(values, gcode, coolant_mode) - # do the pre_op - if values["OUTPUT_BCNC"]: - comment = PostUtilsParse.create_comment(values, f"Block-name: {obj.Label}") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - comment = PostUtilsParse.create_comment(values, "Block-expand: 0") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - comment = PostUtilsParse.create_comment(values, "Block-enable: 1") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - if values["OUTPUT_COMMENTS"]: - if values["SHOW_OPERATION_LABELS"]: - comment = PostUtilsParse.create_comment( - values, f"Begin operation: {obj.Label}" - ) - else: - comment = PostUtilsParse.create_comment(values, "Begin operation") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - if values["SHOW_MACHINE_UNITS"]: - comment = PostUtilsParse.create_comment( - values, f'Machine units: {values["UNIT_SPEED_FORMAT"]}' - ) - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - if values["OUTPUT_MACHINE_NAME"]: - comment = PostUtilsParse.create_comment( - values, - f'Machine: {values["MACHINE_NAME"]}, {values["UNIT_SPEED_FORMAT"]}', - ) - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - for line in values["PRE_OPERATION"].splitlines(False): - gcode += f"{PostUtilsParse.linenumber(values)}{line}{nl}" + output_return_to(values, gcode) + # + # This doesn't make sense to me. It seems that both output_start_bcnc and + # output_end_bcnc should be in the for loop or both should be out of the + # for loop. However, that is the way that grbl post code was written, so + # for now I will leave it that way until someone has time to figure it out. + # + output_end_bcnc(values, gcode) + output_postamble_header(values, gcode) + output_tool_return(values, gcode) + output_safetyblock(values, gcode) + output_postamble(values, gcode) - # get coolant mode - coolantMode = "None" - if ( - hasattr(obj, "CoolantMode") - or hasattr(obj, "Base") - and hasattr(obj.Base, "CoolantMode") - ): - if hasattr(obj, "CoolantMode"): - coolantMode = obj.CoolantMode - else: - coolantMode = obj.Base.CoolantMode - - # turn coolant on if required - if values["ENABLE_COOLANT"]: - if values["OUTPUT_COMMENTS"] and coolantMode != "None": - comment = PostUtilsParse.create_comment( - values, f"Coolant On: {coolantMode}" - ) - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - if coolantMode == "Flood": - gcode += f"{PostUtilsParse.linenumber(values)}M8{nl}" - elif coolantMode == "Mist": - gcode += f"{PostUtilsParse.linenumber(values)}M7{nl}" - - # process the operation gcode - gcode += PostUtilsParse.parse_a_group(values, obj) - - # do the post_op - if values["OUTPUT_COMMENTS"]: - comment = PostUtilsParse.create_comment( - values, f'{values["FINISH_LABEL"]} operation: {obj.Label}' - ) - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - for line in values["POST_OPERATION"].splitlines(False): - gcode += f"{PostUtilsParse.linenumber(values)}{line}{nl}" - - # turn coolant off if required - if values["ENABLE_COOLANT"] and coolantMode != "None": - if values["OUTPUT_COMMENTS"]: - comment = PostUtilsParse.create_comment( - values, f"Coolant Off: {coolantMode}" - ) - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - gcode += f"{PostUtilsParse.linenumber(values)}M9{nl}" - - if values["RETURN_TO"]: - num_x = values["RETURN_TO"][0] - num_y = values["RETURN_TO"][1] - num_z = values["RETURN_TO"][2] - gcode += f"{PostUtilsParse.linenumber(values)}G0 X{num_x} Y{num_y} Z{num_z}{nl}" - - # do the post_amble - if values["OUTPUT_BCNC"]: - comment = PostUtilsParse.create_comment(values, "Block-name: post_amble") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - comment = PostUtilsParse.create_comment(values, "Block-expand: 0") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - comment = PostUtilsParse.create_comment(values, "Block-enable: 1") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - if values["OUTPUT_COMMENTS"]: - comment = PostUtilsParse.create_comment(values, "Begin postamble") - gcode += f"{PostUtilsParse.linenumber(values)}{comment}{nl}" - for line in values["TOOLRETURN"].splitlines(False): - gcode += f"{PostUtilsParse.linenumber(values)}{line}{nl}" - for line in values["SAFETYBLOCK"].splitlines(False): - gcode += f"{PostUtilsParse.linenumber(values)}{line}{nl}" - for line in values["POSTAMBLE"].splitlines(False): - gcode += f"{PostUtilsParse.linenumber(values)}{line}{nl}" + final = "".join(gcode) if FreeCAD.GuiUp and values["SHOW_EDITOR"]: - final = gcode - if len(gcode) > 100000: + if len(final) > 100000: print("Skipping editor since output is greater than 100kb") else: dia = PostUtils.GCodeEditorDialog() - dia.editor.setText(gcode) + dia.editor.setText(final) result = dia.exec_() if result: final = dia.editor.toPlainText() - else: - final = gcode print("done postprocessing.") if not filename == "-": - with open(filename, "w", newline=values["END_OF_LINE_CHARACTERS"]) as gfile: + with open( + filename, "w", encoding="utf-8", newline=values["END_OF_LINE_CHARACTERS"] + ) as gfile: gfile.write(final) return final diff --git a/src/Mod/Path/Path/Post/UtilsParse.py b/src/Mod/Path/Path/Post/UtilsParse.py index d83dd7b065..b267874e75 100644 --- a/src/Mod/Path/Path/Post/UtilsParse.py +++ b/src/Mod/Path/Path/Post/UtilsParse.py @@ -28,34 +28,211 @@ # *************************************************************************** import re +from typing import Any, Callable, Dict, List, Tuple, Union import FreeCAD from FreeCAD import Units import Path -import Path.Post.Utils as PostUtils -import PathScripts.PathUtils as PathUtils -def create_comment(values, comment_string): +# Define some types that are used throughout this file +CommandLine = List[str] +Gcode = List[str] +PathParameter = float +PathParameters = Dict[str, PathParameter] +Values = Dict[str, Any] + +ParameterFunction = Callable[[Values, str, str, PathParameter, PathParameters], str] + + +def check_for_an_adaptive_op( + values: Values, + command: str, + command_line: CommandLine, + adaptive_op_variables: Tuple[bool, float, float], +) -> str: + """Check to see if the current command is an adaptive op.""" + adaptiveOp: bool + nl: str = "\n" + opHorizRapid: float + opVertRapid: float + + (adaptiveOp, opHorizRapid, opVertRapid) = adaptive_op_variables + if values["OUTPUT_ADAPTIVE"] and adaptiveOp and command in values["RAPID_MOVES"]: + if opHorizRapid and opVertRapid: + return "G1" + command_line.append(f"(Tool Controller Rapid Values are unset){nl}") + return "" + + +def check_for_drill_translate( + values: Values, + gcode: Gcode, + command: str, + command_line: CommandLine, + params: PathParameters, + motion_location: PathParameters, + drill_retract_mode: str, +) -> bool: + """Check for drill commands to translate.""" + comment: str + nl: str = "\n" + + if ( + values["TRANSLATE_DRILL_CYCLES"] + and command in values["DRILL_CYCLES_TO_TRANSLATE"] + ): + if values["OUTPUT_COMMENTS"]: # Comment the original command + comment = create_comment( + values, + values["COMMAND_SPACE"] + + format_command_line(values, command_line) + + values["COMMAND_SPACE"], + ) + gcode += f"{linenumber(values)}{comment}{nl}" + # wrap this block to ensure that the value of values["MOTION_MODE"] + # is restored in case of error + try: + drill_translate( + values, + gcode, + command, + params, + motion_location, + drill_retract_mode, + ) + except (ArithmeticError, LookupError) as err: + print("exception occurred", err) + # drill_translate uses G90 mode internally, so need to + # switch back to G91 mode if it was that way originally + if values["MOTION_MODE"] == "G91": + gcode.append(f"{linenumber(values)}G91{nl}") + return True + return False + + +def check_for_machine_specific_commands( + values: Values, gcode: Gcode, command: str +) -> None: + """Check for comments containing machine-specific commands.""" + m: object + nl: str = "\n" + raw_command: str + + if values["ENABLE_MACHINE_SPECIFIC_COMMANDS"]: + m = re.match(r"^\(MC_RUN_COMMAND: ([^)]+)\)$", command) + if m: + raw_command = m.group(1) + # pass literally to the controller + gcode += f"{linenumber(values)}{raw_command}{nl}" + + +def check_for_spindle_wait( + values: Values, gcode: Gcode, command: str, command_line: CommandLine +) -> None: + """Check for commands that might need a wait command after them.""" + cmd: str + nl: str = "\n" + + if values["SPINDLE_WAIT"] > 0 and command in ("M3", "M03", "M4", "M04"): + gcode += f"{linenumber(values)}{format_command_line(values, command_line)}{nl}" + cmd = format_command_line(values, ["G4", f'P{values["SPINDLE_WAIT"]}']) + gcode += f"{linenumber(values)}{cmd}{nl}" + + +def check_for_suppressed_commands( + values: Values, gcode: Gcode, command: str, command_line: CommandLine +) -> bool: + """Check for commands that will be suppressed.""" + comment: str + nl: str = "\n" + + if command in values["SUPPRESS_COMMANDS"]: + if values["OUTPUT_COMMENTS"]: + # convert the command to a comment + comment = create_comment( + values, + values["COMMAND_SPACE"] + + format_command_line(values, command_line) + + values["COMMAND_SPACE"], + ) + gcode += f"{linenumber(values)}{comment}{nl}" + # remove the command + return True + return False + + +def check_for_tlo( + values: Values, gcode: Gcode, command: str, params: PathParameters +) -> None: + """Output a tool length command if USE_TLO is True.""" + nl: str = "\n" + + if command in ("M6", "M06") and values["USE_TLO"]: + cmd = format_command_line(values, ["G43", f'H{str(int(params["T"]))}']) + gcode += f"{linenumber(values)}{cmd}{nl}" + + +def check_for_tool_change( + values: Values, gcode: Gcode, command: str, command_line: CommandLine +) -> bool: + """Check for a tool change.""" + nl: str = "\n" + + if command in ("M6", "M06"): + if values["OUTPUT_COMMENTS"]: + comment = create_comment(values, "Begin toolchange") + gcode += f"{linenumber(values)}{comment}{nl}" + if values["OUTPUT_TOOL_CHANGE"]: + if values["STOP_SPINDLE_FOR_TOOL_CHANGE"]: + # stop the spindle + gcode += f"{linenumber(values)}M5{nl}" + for line in values["TOOL_CHANGE"].splitlines(False): + gcode += f"{linenumber(values)}{line}{nl}" + elif values["OUTPUT_COMMENTS"]: + # convert the tool change to a comment + comment = create_comment( + values, + values["COMMAND_SPACE"] + + format_command_line(values, command_line) + + values["COMMAND_SPACE"], + ) + gcode += f"{linenumber(values)}{comment}{nl}" + return True + return False + + +def create_comment(values: Values, comment_string: str) -> str: """Create a comment from a string using the correct comment symbol.""" if values["COMMENT_SYMBOL"] == "(": return f"({comment_string})" - else: - return values["COMMENT_SYMBOL"] + comment_string + return values["COMMENT_SYMBOL"] + comment_string -def default_axis_parameter(values, command, param, param_value, currLocation): +def default_axis_parameter( + values: Values, + command: str, # pylint: disable=unused-argument + param: str, + param_value: PathParameter, + current_location: PathParameters, +) -> str: """Process an axis parameter.""" if ( not values["OUTPUT_DOUBLES"] - and param in currLocation - and currLocation[param] == param_value + and param in current_location + and current_location[param] == param_value ): - return None + return "" return format_for_axis(values, Units.Quantity(param_value, Units.Length)) -def default_D_parameter(values, command, param, param_value, currLocation): +def default_D_parameter( + values: Values, + command: str, + param: str, # pylint: disable=unused-argument + param_value: PathParameter, + current_location: PathParameters, # pylint: disable=unused-argument +) -> str: """Process the D parameter.""" if command in ("G41", "G42"): return str(int(param_value)) @@ -67,37 +244,61 @@ def default_D_parameter(values, command, param, param_value, currLocation): return str(float(param_value)) -def default_F_parameter(values, command, param, param_value, currLocation): +def default_F_parameter( + values: Values, + command: str, + param: str, + param_value: PathParameter, + current_location: PathParameters, +) -> str: """Process the F parameter.""" if ( not values["OUTPUT_DOUBLES"] - and param in currLocation - and currLocation[param] == param_value + and param in current_location + and current_location[param] == param_value ): - return None + return "" # Many posts don't use rapid speeds, but eventually # there will be refactored posts that do, so this # "if statement" is being kept separate to make it # more obvious where to put that check. if command in values["RAPID_MOVES"]: - return None + return "" feed = Units.Quantity(param_value, Units.Velocity) if feed.getValueAs(values["UNIT_SPEED_FORMAT"]) <= 0.0: - return None + return "" return format_for_feed(values, feed) -def default_int_parameter(values, command, param, param_value, currLocation): +def default_int_parameter( + values: Values, # pylint: disable=unused-argument + command: str, # pylint: disable=unused-argument + param: str, # pylint: disable=unused-argument + param_value: PathParameter, + current_location: PathParameters, # pylint: disable=unused-argument +) -> str: """Process a parameter that is treated like an integer.""" return str(int(param_value)) -def default_length_parameter(values, command, param, param_value, currLocation): +def default_length_parameter( + values: Values, + command: str, # pylint: disable=unused-argument + param: str, # pylint: disable=unused-argument + param_value: PathParameter, + current_location: PathParameters, # pylint: disable=unused-argument +) -> str: """Process a parameter that is treated like a length.""" return format_for_axis(values, Units.Quantity(param_value, Units.Length)) -def default_P_parameter(values, command, param, param_value, currLocation): +def default_P_parameter( + values: Values, + command: str, + param: str, # pylint: disable=unused-argument + param_value: PathParameter, + current_location: PathParameters, # pylint: disable=unused-argument +) -> str: """Process the P parameter.""" if command in ("G2", "G02", "G3", "G03", "G5.2", "G5.3", "G10", "G54.1", "G59"): return str(int(param_value)) @@ -109,159 +310,179 @@ def default_P_parameter(values, command, param, param_value, currLocation): return str(param_value) -def default_Q_parameter(values, command, param, param_value, currLocation): +def default_Q_parameter( + values: Values, + command: str, + param: str, # pylint: disable=unused-argument + param_value: PathParameter, + current_location: PathParameters, # pylint: disable=unused-argument +) -> str: """Process the Q parameter.""" if command == "G10": return str(int(param_value)) if command in ("G64", "G73", "G83"): return format_for_axis(values, Units.Quantity(param_value, Units.Length)) + return "" -def default_S_parameter(values, command, param, param_value, currLocation): +def default_S_parameter( + values: Values, + command: str, # pylint: disable=unused-argument + param: str, # pylint: disable=unused-argument + param_value: PathParameter, + current_location: PathParameters, # pylint: disable=unused-argument +) -> str: """Process the S parameter.""" return format_for_spindle(values, param_value) -def drill_translate(values, cmd, params): - """Translate drill cycles.""" - trBuff = "" +def determine_adaptive_op(values: Values, pathobj) -> Tuple[bool, float, float]: + """Determine if the pathobj contains an Adaptive operation.""" nl = "\n" + adaptiveOp: bool = False + opHorizRapid: float = 0.0 + opVertRapid: float = 0.0 - # cycle conversion - # currently only cycles in XY are provided (G17) - # other plains ZX (G18) and YZ (G19) are not dealt with : Z drilling only. - drill_X = Units.Quantity(params["X"], Units.Length) - drill_Y = Units.Quantity(params["Y"], Units.Length) - drill_Z = Units.Quantity(params["Z"], Units.Length) - RETRACT_Z = Units.Quantity(params["R"], Units.Length) - # R less than Z is error - if RETRACT_Z < drill_Z: - comment = create_comment(values, "Drill cycle error: R less than Z") - trBuff += f"{linenumber(values)}{comment}{nl}" - return trBuff + if values["OUTPUT_ADAPTIVE"] and "Adaptive" in pathobj.Name: + adaptiveOp = True + if hasattr(pathobj, "ToolController"): + tc = pathobj.ToolController + if hasattr(tc, "HorizRapid") and tc.HorizRapid > 0: + opHorizRapid = Units.Quantity(tc.HorizRapid, Units.Velocity) + else: + FreeCAD.Console.PrintWarning( + f"Tool Controller Horizontal Rapid Values are unset{nl}" + ) + if hasattr(tc, "VertRapid") and tc.VertRapid > 0: + opVertRapid = Units.Quantity(tc.VertRapid, Units.Velocity) + else: + FreeCAD.Console.PrintWarning( + f"Tool Controller Vertical Rapid Values are unset{nl}" + ) + return (adaptiveOp, opHorizRapid, opVertRapid) - if values["MOTION_MODE"] == "G91": # G91 relative movements - drill_X += values["CURRENT_X"] - drill_Y += values["CURRENT_Y"] - drill_Z += values["CURRENT_Z"] - RETRACT_Z += values["CURRENT_Z"] - if values["DRILL_RETRACT_MODE"] == "G98" and values["CURRENT_Z"] >= RETRACT_Z: - RETRACT_Z = values["CURRENT_Z"] +def drill_translate( + values: Values, + gcode: Gcode, + command: str, + params: PathParameters, + motion_location: PathParameters, + drill_retract_mode: str, +) -> None: + """Translate drill cycles. - # get the other parameters - drill_feedrate = Units.Quantity(params["F"], Units.Velocity) - if cmd in ("G73", "G83"): - drill_Step = Units.Quantity(params["Q"], Units.Length) - # NIST 3.5.16.4 G83 Cycle: "current hole bottom, backed off a bit." - a_bit = drill_Step * 0.05 - elif cmd == "G82": - drill_DwellTime = params["P"] - - # wrap this block to ensure machine's values["MOTION_MODE"] is restored - # in case of error - try: - if values["MOTION_MODE"] == "G91": - # force absolute coordinates during cycles - trBuff += f"{linenumber(values)}G90{nl}" - strG0_RETRACT_Z = f"G0 Z{format_for_axis(values, RETRACT_Z)}{nl}" - strF_Feedrate = f" F{format_for_feed(values, drill_feedrate)}{nl}" - # print(strF_Feedrate) - - # preliminary movement(s) - if values["CURRENT_Z"] < RETRACT_Z: - trBuff += f"{linenumber(values)}{strG0_RETRACT_Z}" - num_x = format_for_axis(values, drill_X) - num_y = format_for_axis(values, drill_Y) - trBuff += f"{linenumber(values)}G0 X{num_x} Y{num_y}{nl}" - if values["CURRENT_Z"] > RETRACT_Z: - # NIST GCODE 3.5.16.1 Preliminary and In-Between Motion says G0 to RETRACT_Z - # Here use G1 since retract height may be below surface ! - num_z = format_for_axis(values, RETRACT_Z) - trBuff += f"{linenumber(values)}G1 Z{num_z}{strF_Feedrate}" - last_Stop_Z = RETRACT_Z - - # drill moves - if cmd in ("G81", "G82"): - num_z = format_for_axis(values, drill_Z) - trBuff += f"{linenumber(values)}G1 Z{num_z}{strF_Feedrate}" - # pause where applicable - if cmd == "G82": - trBuff += f"{linenumber(values)}G4 P{str(drill_DwellTime)}{nl}" - trBuff += f"{linenumber(values)}{strG0_RETRACT_Z}" - elif cmd in ("G73", "G83"): - if params["Q"] != 0: - while 1: - if last_Stop_Z != RETRACT_Z: - # rapid move to just short of last drilling depth - clearance_depth = last_Stop_Z + a_bit - num_z = format_for_axis(values, clearance_depth) - trBuff += f"{linenumber(values)}G0 Z{num_z}{nl}" - next_Stop_Z = last_Stop_Z - drill_Step - if next_Stop_Z > drill_Z: - num_z = format_for_axis(values, next_Stop_Z) - trBuff += f"{linenumber(values)}G1 Z{num_z}{strF_Feedrate}" - if cmd == "G73": - # Rapid up "a small amount". - chip_breaker_height = ( - next_Stop_Z + values["CHIPBREAKING_AMOUNT"] - ) - num_z = format_for_axis(values, chip_breaker_height) - trBuff += f"{linenumber(values)}G0 Z{num_z}{nl}" - elif cmd == "G83": - # Rapid up to the retract height - trBuff += f"{linenumber(values)}{strG0_RETRACT_Z}" - last_Stop_Z = next_Stop_Z - else: - num_z = format_for_axis(values, drill_Z) - trBuff += f"{linenumber(values)}G1 Z{num_z}{strF_Feedrate}" - trBuff += f"{linenumber(values)}{strG0_RETRACT_Z}" - break - except Exception as err: - print("exception occurred", err) + Currently only cycles in XY are provided (G17). + XZ (G18) and YZ (G19) are not dealt with. + In other words only Z drilling can be translated. + """ + cmd: str + comment: str + drill_x: float + drill_y: float + drill_z: float + motion_z: float + nl: str = "\n" + retract_z: float + F_feedrate: str + G0_retract_z: str if values["MOTION_MODE"] == "G91": - trBuff += f"{linenumber(values)}G91{nl}" # Restore if changed + # force absolute coordinates during cycles + gcode.append(f"{linenumber(values)}G90{nl}") - return trBuff + drill_x = Units.Quantity(params["X"], Units.Length) + drill_y = Units.Quantity(params["Y"], Units.Length) + drill_z = Units.Quantity(params["Z"], Units.Length) + retract_z = Units.Quantity(params["R"], Units.Length) + if retract_z < drill_z: # R less than Z is error + comment = create_comment(values, "Drill cycle error: R less than Z") + gcode.append(f"{linenumber(values)}{comment}{nl}") + return + motion_z = Units.Quantity(motion_location["Z"], Units.Length) + if values["MOTION_MODE"] == "G91": # relative movements + drill_x += Units.Quantity(motion_location["X"], Units.Length) + drill_y += Units.Quantity(motion_location["Y"], Units.Length) + drill_z += motion_z + retract_z += motion_z + if drill_retract_mode == "G98" and motion_z >= retract_z: + retract_z = motion_z + + cmd = format_command_line(values, ["G0", f"Z{format_for_axis(values, retract_z)}"]) + G0_retract_z = f"{cmd}{nl}" + cmd = format_for_feed(values, Units.Quantity(params["F"], Units.Velocity)) + F_feedrate = f'{values["COMMAND_SPACE"]}F{cmd}{nl}' + + # preliminary movement(s) + if motion_z < retract_z: + gcode.append(f"{linenumber(values)}{G0_retract_z}") + cmd = format_command_line( + values, + [ + "G0", + f"X{format_for_axis(values, drill_x)}", + f"Y{format_for_axis(values, drill_y)}", + ], + ) + gcode.append(f"{linenumber(values)}{cmd}{nl}") + if motion_z > retract_z: + # NIST GCODE 3.5.16.1 Preliminary and In-Between Motion says G0 to retract_z + # Here use G1 since retract height may be below surface ! + cmd = format_command_line( + values, ["G1", f"Z{format_for_axis(values, retract_z)}"] + ) + gcode.append(f"{linenumber(values)}{cmd}{F_feedrate}") + + # drill moves + if command in ("G81", "G82"): + output_G81_G82_drill_moves( + values, gcode, command, params, drill_z, F_feedrate, G0_retract_z + ) + elif command in ("G73", "G83"): + output_G73_G83_drill_moves( + values, gcode, command, params, drill_z, retract_z, F_feedrate, G0_retract_z + ) -def format_for_axis(values, number): +def format_command_line(values: Values, command_line: CommandLine) -> str: + """Construct the command line for the final output.""" + return values["COMMAND_SPACE"].join(command_line) + + +def format_for_axis(values: Values, number) -> str: """Format a number using the precision for an axis value.""" - return format( - float(number.getValueAs(values["UNIT_FORMAT"])), - f'.{str(values["AXIS_PRECISION"])}f', + return str( + format( + float(number.getValueAs(values["UNIT_FORMAT"])), + f'.{str(values["AXIS_PRECISION"])}f', + ) ) -def format_for_feed(values, number): +def format_for_feed(values: Values, number) -> str: """Format a number using the precision for a feed rate.""" - return format( - float(number.getValueAs(values["UNIT_SPEED_FORMAT"])), - f'.{str(values["FEED_PRECISION"])}f', + return str( + format( + float(number.getValueAs(values["UNIT_SPEED_FORMAT"])), + f'.{str(values["FEED_PRECISION"])}f', + ) ) -def format_for_spindle(values, number): +def format_for_spindle(values: Values, number) -> str: """Format a number using the precision for a spindle speed.""" - return format(float(number), f'.{str(values["SPINDLE_DECIMALS"])}f') + return str(format(float(number), f'.{str(values["SPINDLE_DECIMALS"])}f')) -def format_outstring(values, strTable): - """Construct the line for the final output.""" - s = "" - for w in strTable: - s += f'{w}{values["COMMAND_SPACE"]}' - s = s.strip() - return s - - -def init_parameter_functions(parameter_functions): +def init_parameter_functions(parameter_functions: Dict[str, ParameterFunction]) -> None: """Initialize a list of parameter functions. - These functions are called in the PostUtilsParse.parse_a_path + These functions are called in the UtilsParse.parse_a_path function to return the appropriate parameter value. """ + default_parameter_functions: Dict[str, ParameterFunction] + parameter: str + default_parameter_functions = { "A": default_axis_parameter, "B": default_axis_parameter, @@ -291,226 +512,248 @@ def init_parameter_functions(parameter_functions): "Z": default_axis_parameter, # "$" is used by LinuxCNC (and others?) to designate which spindle } - parameter_functions.update(default_parameter_functions) + for ( + parameter + ) in default_parameter_functions: # pylint: disable=consider-using-dict-items + parameter_functions[parameter] = default_parameter_functions[parameter] -def linenumber(values, space=None): +def linenumber(values: Values, space: Union[str, None] = None) -> str: """Output the next line number if appropriate.""" - if values["OUTPUT_LINE_NUMBERS"]: - if space is None: - space = values["COMMAND_SPACE"] - line_num = str(values["line_number"]) - values["line_number"] += values["LINE_INCREMENT"] - return f"N{line_num}{space}" - return "" + line_num: str + + if not values["OUTPUT_LINE_NUMBERS"]: + return "" + if space is None: + space = values["COMMAND_SPACE"] + line_num = str(values["line_number"]) + values["line_number"] += values["LINE_INCREMENT"] + return f"N{line_num}{space}" -def parse_a_group(values, pathobj): +def output_G73_G83_drill_moves( + values: Values, + gcode: Gcode, + command: str, + params: PathParameters, + drill_z: float, + retract_z: float, + F_feedrate: str, + G0_retract_z: str, +) -> None: + """Output the movement G code for G73 and G83.""" + a_bit: float + chip_breaker_height: float + clearance_depth: float + cmd: str + drill_step: float + last_stop_z: float + next_stop_z: float + nl: str = "\n" + + last_stop_z = retract_z + drill_step = Units.Quantity(params["Q"], Units.Length) + # NIST 3.5.16.4 G83 Cycle: "current hole bottom, backed off a bit." + a_bit = drill_step * 0.05 + if drill_step != 0: + while True: + if last_stop_z != retract_z: + # rapid move to just short of last drilling depth + clearance_depth = last_stop_z + a_bit + cmd = format_command_line( + values, + ["G0", f"Z{format_for_axis(values, clearance_depth)}"], + ) + gcode.append(f"{linenumber(values)}{cmd}{nl}") + next_stop_z = last_stop_z - drill_step + if next_stop_z > drill_z: + cmd = format_command_line( + values, ["G1", f"Z{format_for_axis(values, next_stop_z)}"] + ) + gcode.append(f"{linenumber(values)}{cmd}{F_feedrate}") + if command == "G73": + # Rapid up "a small amount". + chip_breaker_height = next_stop_z + values["CHIPBREAKING_AMOUNT"] + cmd = format_command_line( + values, + [ + "G0", + f"Z{format_for_axis(values, chip_breaker_height)}", + ], + ) + gcode.append(f"{linenumber(values)}{cmd}{nl}") + elif command == "G83": + # Rapid up to the retract height + gcode.append(f"{linenumber(values)}{G0_retract_z}") + last_stop_z = next_stop_z + else: + cmd = format_command_line( + values, ["G1", f"Z{format_for_axis(values, drill_z)}"] + ) + gcode.append(f"{linenumber(values)}{cmd}{F_feedrate}") + gcode.append(f"{linenumber(values)}{G0_retract_z}") + break + + +def output_G81_G82_drill_moves( + values: Values, + gcode: Gcode, + command: str, + params: PathParameters, + drill_z: float, + F_feedrate: str, + G0_retract_z: str, +) -> None: + """Output the movement G code for G81 and G82.""" + cmd: str + nl: str = "\n" + + cmd = format_command_line(values, ["G1", f"Z{format_for_axis(values, drill_z)}"]) + gcode.append(f"{linenumber(values)}{cmd}{F_feedrate}") + # pause where applicable + if command == "G82": + cmd = format_command_line(values, ["G4", f'P{str(params["P"])}']) + gcode.append(f"{linenumber(values)}{cmd}{nl}") + gcode.append(f"{linenumber(values)}{G0_retract_z}") + + +def parse_a_group(values: Values, gcode: Gcode, pathobj) -> None: """Parse a Group (compound, project, or simple path).""" - nl = "\n" - out = "" + comment: str + nl: str = "\n" if hasattr(pathobj, "Group"): # We have a compound or project. if values["OUTPUT_COMMENTS"]: comment = create_comment(values, f"Compound: {pathobj.Label}") - out += f"{linenumber(values)}{comment}{nl}" + gcode += f"{linenumber(values)}{comment}{nl}" for p in pathobj.Group: - out += parse_a_group(values, p) + parse_a_group(values, gcode, p) else: # parsing simple path # groups might contain non-path things like stock. if not hasattr(pathobj, "Path"): - return out + return if values["OUTPUT_PATH_LABELS"] and values["OUTPUT_COMMENTS"]: comment = create_comment(values, f"Path: {pathobj.Label}") - out += f"{linenumber(values)}{comment}{nl}" - out += parse_a_path(values, pathobj) - return out + gcode += f"{linenumber(values)}{comment}{nl}" + parse_a_path(values, gcode, pathobj) -def parse_a_path(values, pathobj): +def parse_a_path(values: Values, gcode: Gcode, pathobj) -> None: """Parse a simple Path.""" - nl = "\n" - out = "" + adaptive_op_variables: Tuple[bool, float, float] + cmd: str + command: str + command_line: CommandLine + current_location: PathParameters = {} # keep track for no doubles + drill_retract_mode: str = "G98" + lastcommand: str = "" + motion_location: PathParameters = {} # keep track of last motion location + nl: str = "\n" + parameter: str + parameter_value: str - adaptiveOp = False - opHorizRapid = 0 - opVertRapid = 0 + current_location.update( + Path.Command("G0", {"X": -1, "Y": -1, "Z": -1, "F": 0.0}).Parameters + ) + adaptive_op_variables = determine_adaptive_op(values, pathobj) - lastcommand = None - firstmove = Path.Command("G0", {"X": -1, "Y": -1, "Z": -1, "F": 0.0}) - currLocation = {} # keep track for no doubles - currLocation.update(firstmove.Parameters) # set First location Parameters - - if values["OUTPUT_ADAPTIVE"] and "Adaptive" in pathobj.Name: - adaptiveOp = True - if hasattr(pathobj, "ToolController"): - tc = pathobj.ToolController - if hasattr(tc, "HorizRapid") and tc.HorizRapid > 0: - opHorizRapid = Units.Quantity(tc.HorizRapid, Units.Velocity) - else: - FreeCAD.Console.PrintWarning( - f"Tool Controller Horizontal Rapid Values are unset{nl}" - ) - if hasattr(tc, "VertRapid") and tc.VertRapid > 0: - opVertRapid = Units.Quantity(tc.VertRapid, Units.Velocity) - else: - FreeCAD.Console.PrintWarning( - f"Tool Controller Vertical Rapid Values are unset{nl}" - ) - - for c in PathUtils.getPathWithPlacement(pathobj).Commands: - - # List of elements in the command, code, and params. - outstring = [] - # command may contain M code, G code, comment string, etc. + for c in pathobj.Path.Commands: command = c.Name + command_line = [] + + # Modify the command name if necessary if command[0] == "(": if not values["OUTPUT_COMMENTS"]: continue if values["COMMENT_SYMBOL"] != "(" and len(command) > 2: command = create_comment(values, command[1:-1]) - - if ( - values["OUTPUT_ADAPTIVE"] - and adaptiveOp - and command in values["RAPID_MOVES"] - ): - if opHorizRapid and opVertRapid: - command = "G1" - else: - outstring.append(f"(Tool Controller Rapid Values are unset){nl}") - - outstring.append(command) - + cmd = check_for_an_adaptive_op( + values, command, command_line, adaptive_op_variables + ) + if cmd: + command = cmd + # Add the command name to the command line + command_line.append(command) # if modal: suppress the command if it is the same as the last one if values["MODAL"] and command == lastcommand: - outstring.pop(0) + command_line.pop(0) # Now add the remaining parameters in order for parameter in values["PARAMETER_ORDER"]: if parameter in c.Parameters: parameter_value = values["PARAMETER_FUNCTIONS"][parameter]( - values, command, parameter, c.Parameters[parameter], currLocation + values, + command, + parameter, + c.Parameters[parameter], + current_location, ) if parameter_value: - outstring.append(f"{parameter}{parameter_value}") + command_line.append(f"{parameter}{parameter_value}") - if ( - values["OUTPUT_ADAPTIVE"] - and adaptiveOp - and command in values["RAPID_MOVES"] - and opHorizRapid - and opVertRapid - ): - if "Z" not in c.Parameters: - param_num = format_for_feed(values, opHorizRapid) - else: - param_num = format_for_feed(values, opVertRapid) - outstring.append(f"F{param_num}") - - # store the latest command + set_adaptive_op_speed( + values, command, command_line, c.Parameters, adaptive_op_variables + ) + # Remember the current command lastcommand = command - currLocation.update(c.Parameters) - # Memorizes the current position for calculating the related movements - # and the withdrawal plan - if command in values["MOTION_COMMANDS"]: - if "X" in c.Parameters: - values["CURRENT_X"] = Units.Quantity(c.Parameters["X"], Units.Length) - if "Y" in c.Parameters: - values["CURRENT_Y"] = Units.Quantity(c.Parameters["Y"], Units.Length) - if "Z" in c.Parameters: - values["CURRENT_Z"] = Units.Quantity(c.Parameters["Z"], Units.Length) - - if command in ("G98", "G99"): - values["DRILL_RETRACT_MODE"] = command - elif command in ("G90", "G91"): + # Remember the current location + current_location.update(c.Parameters) + if command in ("G90", "G91"): + # Remember the motion mode values["MOTION_MODE"] = command - - if ( - values["TRANSLATE_DRILL_CYCLES"] - and command in values["DRILL_CYCLES_TO_TRANSLATE"] + elif command in ("G98", "G99"): + # Remember the drill retract mode for drill_translate + drill_retract_mode = command + if command in values["MOTION_COMMANDS"]: + # Remember the current location for drill_translate + motion_location.update(c.Parameters) + if check_for_drill_translate( + values, + gcode, + command, + command_line, + c.Parameters, + motion_location, + drill_retract_mode, ): - if values["OUTPUT_COMMENTS"]: # Comment the original command - comment = create_comment( - values, - values["COMMAND_SPACE"] - + format_outstring(values, outstring) - + values["COMMAND_SPACE"], - ) - out += f"{linenumber(values)}{comment}{nl}" - out += drill_translate(values, command, c.Parameters) - # Erase the line we just translated - outstring = [] + command_line = [] + check_for_spindle_wait(values, gcode, command, command_line) + if check_for_tool_change(values, gcode, command, command_line): + command_line = [] + if check_for_suppressed_commands(values, gcode, command, command_line): + command_line = [] + # Add a line number to the front and a newline to the end of the command line + if command_line: + gcode += ( + f"{linenumber(values)}{format_command_line(values, command_line)}{nl}" + ) + check_for_tlo(values, gcode, command, c.Parameters) + check_for_machine_specific_commands(values, gcode, command) - if values["SPINDLE_WAIT"] > 0 and command in ("M3", "M03", "M4", "M04"): - out += f"{linenumber(values)}{format_outstring(values, outstring)}{nl}" - num = format_outstring(values, ["G4", f'P{values["SPINDLE_WAIT"]}']) - out += f"{linenumber(values)}{num}{nl}" - outstring = [] - # Check for Tool Change: - if command in ("M6", "M06"): - if values["OUTPUT_COMMENTS"]: - comment = create_comment(values, "Begin toolchange") - out += f"{linenumber(values)}{comment}{nl}" - if values["OUTPUT_TOOL_CHANGE"]: - if values["STOP_SPINDLE_FOR_TOOL_CHANGE"]: - # stop the spindle - out += f"{linenumber(values)}M5{nl}" - for line in values["TOOL_CHANGE"].splitlines(False): - out += f"{linenumber(values)}{line}{nl}" - elif values["OUTPUT_COMMENTS"]: - # convert the tool change to a comment - comment = create_comment( - values, - values["COMMAND_SPACE"] - + format_outstring(values, outstring) - + values["COMMAND_SPACE"], - ) - out += f"{linenumber(values)}{comment}{nl}" - outstring = [] +def set_adaptive_op_speed( + values: Values, + command: str, + command_line: CommandLine, + params: PathParameters, + adaptive_op_variables: Tuple[bool, float, float], +) -> None: + """Set the appropriate feed speed for an adaptive op.""" + adaptiveOp: bool + opHorizRapid: float + opVertRapid: float + param_num: str - if command == "message" and values["REMOVE_MESSAGES"]: - if values["OUTPUT_COMMENTS"] is False: - out = [] - else: - outstring.pop(0) # remove the command - - if command in values["SUPPRESS_COMMANDS"]: - if values["OUTPUT_COMMENTS"]: - # convert the command to a comment - comment = create_comment( - values, - values["COMMAND_SPACE"] - + format_outstring(values, outstring) - + values["COMMAND_SPACE"], - ) - out += f"{linenumber(values)}{comment}{nl}" - # remove the command - outstring = [] - - # prepend a line number and append a newline - if len(outstring) >= 1: - if values["OUTPUT_LINE_NUMBERS"]: - # In this case we don't want a space after the line number - # because the space is added in the join just below. - outstring.insert(0, (linenumber(values, ""))) - - # append the line to the final output - out += values["COMMAND_SPACE"].join(outstring) - # Note: Do *not* strip `out`, since that forces the allocation - # of a contiguous string & thus quadratic complexity. - out += f"{nl}" - - # add height offset - if command in ("M6", "M06") and values["USE_TLO"]: - out += f'{linenumber(values)}G43 H{str(int(c.Parameters["T"]))}{nl}' - - # Check for comments containing machine-specific commands - # to pass literally to the controller - if values["ENABLE_MACHINE_SPECIFIC_COMMANDS"]: - m = re.match(r"^\(MC_RUN_COMMAND: ([^)]+)\)$", command) - if m: - raw_command = m.group(1) - out += f"{linenumber(values)}{raw_command}{nl}" - return out + (adaptiveOp, opHorizRapid, opVertRapid) = adaptive_op_variables + if ( + values["OUTPUT_ADAPTIVE"] + and adaptiveOp + and command in values["RAPID_MOVES"] + and opHorizRapid + and opVertRapid + ): + if "Z" not in params: + param_num = format_for_feed(values, opHorizRapid) + else: + param_num = format_for_feed(values, opVertRapid) + command_line.append(f"F{param_num}") diff --git a/src/Mod/Path/Path/Post/scripts/refactored_centroid_post.py b/src/Mod/Path/Path/Post/scripts/refactored_centroid_post.py index a517b30e53..fd076f7f50 100644 --- a/src/Mod/Path/Path/Post/scripts/refactored_centroid_post.py +++ b/src/Mod/Path/Path/Post/scripts/refactored_centroid_post.py @@ -131,10 +131,6 @@ def init_values(values): # values["PREAMBLE"] = """G53 G00 G17""" # - # Output any messages. - # - values["REMOVE_MESSAGES"] = False - # # Any commands in this value are output after the header but before the preamble, # then again after the TOOLRETURN but before the POSTAMBLE. # diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 13e5360eae..483e934e92 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if (PCL_SURFACE_FOUND AND PCL_FEATURES_FOUND) add_definitions(-DHAVE_PCL_SURFACE) diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 145fc94c1c..2bf3d465a0 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/ReverseEngineering/Gui/Resources/translations/ReverseEngineering_pt-BR.ts b/src/Mod/ReverseEngineering/Gui/Resources/translations/ReverseEngineering_pt-BR.ts index 88fab0f281..a6216d170c 100644 --- a/src/Mod/ReverseEngineering/Gui/Resources/translations/ReverseEngineering_pt-BR.ts +++ b/src/Mod/ReverseEngineering/Gui/Resources/translations/ReverseEngineering_pt-BR.ts @@ -460,7 +460,7 @@ Select - Selecionar + Selecione diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index c6a17d7158..ab314f7ff3 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -1,10 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppRobot -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index 589f0d8693..90dab20ac1 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -1,11 +1,3 @@ -if(MSVC) - add_definitions(-DFCGuiRobot -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index 4476da5eaf..94c1956faa 100644 --- a/src/Mod/Sandbox/Gui/CMakeLists.txt +++ b/src/Mod/Sandbox/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_PART -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_PART -DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/Gui diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt index d6a600bd4b..f3ee9500af 100644 --- a/src/Mod/Sketcher/App/CMakeLists.txt +++ b/src/Mod/Sketcher/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppSketcher -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - # Uncomment this code if you want to try Eigen's multithread #find_package(OpenMP) #if (OPENMP_FOUND) diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index 08772bda5a..d824371974 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts index 4b19439706..c52c6967ab 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts @@ -2270,59 +2270,59 @@ invalid constraints, degenerated geometry, etc. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. - - + + BSpline Geometry Index (GeoID) is out of bounds. - + You are requesting no change in knot multiplicity. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. - + The multiplicity cannot be decreased beyond zero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. - + Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. @@ -6244,7 +6244,7 @@ The grid spacing change if it becomes smaller than this number of pixel. - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_be.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_be.ts index b4768a1fed..3d8ac55fe2 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_be.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_be.ts @@ -163,7 +163,7 @@ Creates a clone of the geometry taking as reference the last selected point - Стварае клон геаметрыі, у якасці эталону ўжывае апошнюю абраную кропку + Стварае дублікат геаметрыі, у якасці эталону ўжывае апошнюю абраную кропку @@ -1776,7 +1776,7 @@ invalid constraints, degenerated geometry, etc. Add arc angle constraint - Add arc angle constraint + Дадаць абмежаванне вугла дугі @@ -2274,59 +2274,59 @@ invalid constraints, degenerated geometry, etc. Памылка аўтаматычнага абмежавання: Невырашальны эскіз пасля ўжывання абмежаванняў роўнасці. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Немагчыма разлічыць скрыжаванне крывых. Паспрабуйце дадаць абмежаванні супадзенняў паміж вяршынямі крывых, якія вы збіраецеся акругліць. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline ідэнтыфікатар геаметрыі (GeoID) знаходзіцца за межамі дапушчальных значэнняў. - + You are requesting no change in knot multiplicity. Вы не запытваеце аніякіх зменах у кратнасці вузлоў. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Ідэнтыфікатар геаметрыі (GeoId) не з'яўляецца крывой B-сплайна. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Індэкс вузла знаходзіцца за межамі дапушчальных значэнняў. Звярніце ўвагу, што ў адпаведнасці з назначэннем OCC першы вузел мае індэкс 1, а не 0. - + The multiplicity cannot be increased beyond the degree of the B-spline. Кратнасць не можа быць павялічана звыш ступені B-сплайна. - + The multiplicity cannot be decreased beyond zero. Кратнасць не можа быць паменшана ніжэй за 0. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OpenCASCADE не можа паменшыць кратнасць у межах найбольшай дакладнасці. - + Knot cannot have zero multiplicity. Вузел не можа мець нулявую кратнасць. - + Knot multiplicity cannot be higher than the degree of the BSpline. Кратнасць вузла не можа быць вышэй ступені B-сплайна. - + Knot cannot be inserted outside the BSpline parameter range. Вузел не можа быць устаўлены за межы дыяпазону наладаў B-сплайна. @@ -5406,7 +5406,7 @@ This is done by analyzing the sketch geometries and constraints. Creates a clone of the geometry taking as reference the last selected point - Стварае дублікат геаметрыі, у якасці эталону ўжывае апошнюю абраную кропку + Стварае клон геаметрыі, у якасці эталону ўжывае апошнюю абраную кропку @@ -6293,7 +6293,7 @@ The grid spacing change if it becomes smaller than this number of pixel.Эскіз мае часткова залішнія абмежаванні! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Парабалы былі перанесены. Перанесеныя файлы не будуць адчыняцца ў папярэдніх версіях FreeCAD!! @@ -6678,9 +6678,9 @@ Points must be set closer than a fifth of the grid spacing to a grid line to sna Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Абмяжоўвае кантэкстуальную ў залежнасці ад вашага выбару. +У залежнасці ад вашага выбару ў вас можа быць некалькі даступных абмежаванняў. Вы можаце перамыкацца паміж імі, калі ўжываеце клавішу <M>. +Пстрычка <левай кнопкай мышы> па пустой прасторы пацвердзіць бягучае абмежаванне. Пстрычка <правай кнопкай мышы> ці націск клавішы <Esc> прывядзе да адмены. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ca.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ca.ts index ad21227f34..2721658ad9 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ca.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ca.ts @@ -2277,59 +2277,59 @@ restriccions invàlides, geometries degenerades, etc. Error d'autorestricció: croquis irresoluble si s'apliquen restriccions d'igualtat. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. No es pot esbrinar la intersecció de corbes. Proveu d'afegir una restricció de coincidència entre els vèrtexs de les corbes que intenteu arrodonir. - - + + BSpline Geometry Index (GeoID) is out of bounds. l'index de geometria BSpline (GeoID) esta fora de les restriccions. - + You are requesting no change in knot multiplicity. Se us ha demanat que no canvieu la multiplicitat del nus. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. L'índex de geometria (GeoId) proporcionada no és una corba de B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. L'índex del nus és fora dels límits. Tingueu en compte que d'acord amb la notació d'OCC, el primer nus té l'índex 1 i no zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. La multiplicitat no pot augmentar més enllà del grau de la B-spline. - + The multiplicity cannot be decreased beyond zero. La multiplicitat no es pot reduir més enllà de zero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC no pot reduir la multiplicitat dins de la tolerància màxima. - + Knot cannot have zero multiplicity. El node no pot tenir multiplicitat zero. - + Knot multiplicity cannot be higher than the degree of the BSpline. La multiplicitat de nodes no pot ser superior al grau de la BSpline. - + Knot cannot be inserted outside the BSpline parameter range. El node no es pot inserir fora de l'interval de paràmetres BSpline. @@ -6279,7 +6279,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_cs.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_cs.ts index 7d6754c1e3..8b80ae90e1 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_cs.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_cs.ts @@ -2278,59 +2278,59 @@ neplatných vazeb, degenerované geometrie atd. Chyba automatických vazeb: Neřešitelný náčrt po aplikaci vazeb rovnosti. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Nelze odhadnout průsečík křivek. Zkuste přidat vazbu totožnosti mezi vrcholy křivek, které chcete zaoblit. - - + + BSpline Geometry Index (GeoID) is out of bounds. Geometrický index (GeoID) B-splajnu je mimo meze. - + You are requesting no change in knot multiplicity. Nepožadujete změnu v násobnosti uzlů. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Daný geometrický index (GeoId) neodpovídá B-splajn křivce. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Index uzlu je mimo hranice. Všimněte si, že v souladu s OCC zápisem je index prvního uzlu 1 a ne 0. - + The multiplicity cannot be increased beyond the degree of the B-spline. Násobnost nemůže být zvýšena nad stupeň B-splajnu. - + The multiplicity cannot be decreased beyond zero. Násobnost nemůže být snížena pod nulu. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC není schopno snížit násobnost na maximální toleranci. - + Knot cannot have zero multiplicity. Uzel nemůže mít nulovou násobnost. - + Knot multiplicity cannot be higher than the degree of the BSpline. Násobnost uzlu nemůže být vyšší než stupeň BSplajnu. - + Knot cannot be inserted outside the BSpline parameter range. Nelze vložit uzel mimo rozsah parametrů BSplajnu. @@ -6294,7 +6294,7 @@ Rozteč mřížky se změní, pokud bude menší než tento počet pixelů.Náčrt má částečně nadbytečné vazby! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Paraboly byly migrovány. Migrované soubory se v předchozích verzích FreeCADu neotevřou!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_de.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_de.ts index 39afaeb948..eaac142534 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_de.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_de.ts @@ -434,7 +434,7 @@ Fix the diameter of a circle or an arc - Durchmesser eines Kreises oder Kreisbogens festlegen + Legt den Durchmesser eines Kreises oder Kreisbogens fest @@ -784,7 +784,7 @@ with respect to a line or a third point Create fillet - Verrundung erstellen + Abrundung erstellen @@ -1591,7 +1591,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add horizontal alignment - Horizontale Ausrichtung hinzufügen + Randbedingung Horizontale Ausrichtung hinzufügen @@ -1602,7 +1602,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add vertical alignment - Vertikale Ausrichtung hinzufügen + Randbedingung Vertikale Ausrichtung hinzufügen @@ -1617,60 +1617,60 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add fixed constraint - Sperr-Einschränkung hinzufügen + Randbedingung Sperren hinzufügen Add 'Block' constraint - Fixier-Einschränkung hinzufügen + Randbedingung 'Fixieren' hinzufügen Add block constraint - Fixier-Einschränkung hinzufügen + Randbedingung Fixieren hinzufügen Add coincident constraint - Übereinstimmungseinschränkung hinzufügen + Randbedingung Koinzidenz festlegen hinzufügen Add distance from horizontal axis constraint - Einschränkung des Abstands zur horizontalen Achse hinzufügen + Randbedingung Abstand von der horizontalen Achse hinzufügen Add distance from vertical axis constraint - Einschränkung des Abstands zur vertikalen Achse hinzufügen + Randbedingung Abstand von der vertikalen Achse hinzufügen Add point to point distance constraint - Einschränkung des Abstands zweier Punkte hinzufügen + Randbedingung Punk-zu-Punkt-Abstand hinzufügen Add point to line Distance constraint - Einschränkung des Abstands eines Punktes zu einer Linie hinzufügen + Randbedingung Punkt-zu-Line-Abstand hinzufügen Add circle to circle distance constraint - Kreisabstand hinzufügen + Randbedingung Kreis-zu-Kreis-Abstand hinzufügen Add circle to line distance constraint - Abstand von Kreis zu Linie hinzufügen + Randbedingung Kreis-zu-Line-Abstand hinzufügen @@ -1680,7 +1680,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add length constraint - Längeneinschränkung hinzufügen + Randbedingung Abstand hinzufügen @@ -1692,71 +1692,71 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add lock constraint - Add lock constraint + Randbedingung Sperren hinzufügen Add 'Distance to origin' constraint - Add 'Distance to origin' constraint + Randbedingung 'Abstand zum Ursprung' hinzufügen Add Distance constraint - Add Distance constraint + Randbedingung Abstand festlegen hinzufügen Add 'Horizontal' constraints - Add 'Horizontal' constraints + Randbedingungen 'Horizontal festlegen' hinzufügen Add 'Vertical' constraints - Add 'Vertical' constraints + Randbedingungen 'Vertikal festlegen' hinzufügen Add Symmetry constraint - Add Symmetry constraint + Randbedingung Symmetrie festlegen hinzufügen Add Symmetry constraints - Add Symmetry constraints + Randbedingungen Symmetrie festlegen hinzufügen Add Distance constraints - Add Distance constraints + Randbedingungen Abstand festlegen hinzufügen Add Horizontal constraint - Add Horizontal constraint + Randbedingung Horizontal festlegen hinzufügen Add Vertical constraint - Add Vertical constraint + Randbedingung Vertikal festlegen hinzufügen Add Block constraint - Add Block constraint + Randbedingung Fixieren hinzufügen Add Angle constraint - Add Angle constraint + Randbedingung Winkel festlegen hinzufügen @@ -1764,76 +1764,76 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add Equality constraint - Add Equality constraint + Randbedingung Gleichheit festlegen hinzufügen Add Equality constraints - Add Equality constraints + Randbedingungen Gleichheit festlegen hinzufügen Add Radius constraint - Add Radius constraint + Randbedingung Radius festlegen hinzufügen Add arc angle constraint - Add arc angle constraint + Randbedingung Bogenwinkel festlegen hinzufügen Add concentric and length constraint - Add concentric and length constraint + Randbedingung Konzentrisch und Länge festlegen hinzufügen Add DistanceX constraint - Add DistanceX constraint + Randbedingung Länge X festlegen hinzufügen Add DistanceY constraint - Add DistanceY constraint + Randbedingung Länge Y festlegen hinzufügen Add point to circle Distance constraint - Add point to circle Distance constraint + Randbedingung Punkt-zu-Kreis-Abstand hinzufügen Add point on object constraint - Punkt-auf-Objekt-Einschränkung hinzufügen + Randbedingung Punkt-auf-Objekt hinzufügen Add point to point horizontal distance constraint - Einschränkung des horizontalen Abstands zweier Punkte hinzufügen + Randbedingung Horizontaler Punkt-zu-Punkt-Abstand hinzufügen Add fixed x-coordinate constraint - Einschränkung zur Sperrung der x-Koordinate hinzufügen + Randbedingung X-Koordinate festlegen hinzufügen Add point to point vertical distance constraint - Einschränkung des vertikalen Abstands zweier Punkte hinzufügen + Randbedingung Vertikaler Punkt-zu-Punkt-Abstand hinzufügen Add fixed y-coordinate constraint - Einschränkung zur Sperrung der y-Koordinate hinzufügen + Randbedingung Y-Koordinate festlegen hinzufügen Add parallel constraint - Parallelitätseinschränkung hinzufügen + Randbedingung Parallel festlegen hinzufügen @@ -1844,12 +1844,12 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add perpendicular constraint - Rechtwinkligkeitseinschränkung hinzufügen + Randbedingung Rechtwinklig festlegen hinzufügen Add perpendicularity constraint - Rechtwinkligkeitseinschränkung hinzufügen + Randbedingung Rechtwinkligkeit festlegen hinzufügen @@ -1870,7 +1870,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add tangent constraint - Tangenteneinschränkung hinzufügen + Randbedingung Tangential festlegen hinzufügen @@ -1888,7 +1888,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add tangent constraint point - Punkt für Tangenteneinschränkung hinzufügen + Randbedingung Tangente im Punkt festlegen hinzufügen @@ -1896,7 +1896,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add radius constraint - Radius-Einschränkung hinzufügen + Randbedingung Radius festlegen hinzufügen @@ -1904,7 +1904,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add diameter constraint - Durchmesser-Einschränkung hinzufügen + Randbedingung Durchmesser festlegen hinzufügen @@ -1912,7 +1912,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add radiam constraint - Radiam-Beschränkung hinzufügen + Randbedingung Radiam festlegen hinzufügen @@ -1922,13 +1922,13 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add angle constraint - Winkeleinschränkung hinzufügen + Randbedingung Winkel festlegen hinzufügen Add equality constraint - Gleichheitseinschränkung hinzufügen + Randbedingung Gleichheit festlegen hinzufügen @@ -1937,12 +1937,12 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Add symmetric constraint - Symmetrieeinschränkung hinzufügen + Randbedingung Symmetrie festlegen hinzufügen Add Snell's law constraint - Einschränkung nach Snellius-Gesetz (Lichtbrechung) hinzufügen + Randbedingung nach Snellius-Gesetz hinzufügen @@ -2070,12 +2070,12 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Create fillet - Abrundung erstellen + Verrundung erstellen Trim edge - Kante beschneiden + Kante zuschneiden @@ -2277,59 +2277,59 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen.Fehler automatische Beschränkungen: unlösbare Skizze nach dem Anwenden von gleichheits Beschränkungen. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Der Schnittpunkt der Kurven kann nicht ermittelt werden. Die Randbedingung Koinzidenz festlegen, angewendet auf die Endpunkte der Kurven, die verrundet werden sollen, kann hier helfen. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline Geometrie Index (GeoID) ist außerhalb des gültigen Bereichs. - + You are requesting no change in knot multiplicity. Sie fordern keine Änderung in der Multiplizität der Knoten. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Der bereitgestellte Geometrieindex (GeoId) ist keine B-Spline-Kurve. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Der Knotenindex ist außerhalb der Grenzen. Beachten Sie, dass der erste Knoten gemäß der OCC-Notation den Index 1 und nicht Null hat. - + The multiplicity cannot be increased beyond the degree of the B-spline. Die Vielfachheit kann nicht über den Grad des B-Splines hinaus erhöht werden. - + The multiplicity cannot be decreased beyond zero. Die Vielfachheit kann nicht über Null hinaus verringert werden. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC kann die Multiplizität innerhalb der maximalen Toleranz nicht verringern. - + Knot cannot have zero multiplicity. Ein Knoten kann nicht die Vielfachheit Null haben. - + Knot multiplicity cannot be higher than the degree of the BSpline. Die Vielfachheit kann nicht höher als der Grad des B-Splines sein. - + Knot cannot be inserted outside the BSpline parameter range. Knoten kann nicht außerhalb des BSpline-Parameterbereichs eingefügt werden. @@ -2574,7 +2574,7 @@ ungültigen Einschränkungen, degenerierten Geometrien, etc überprüfen. Cannot add a constraint between two external geometries. - Es ist nicht möglich eine Einschränkung zwischen zwei externen Geometrien hinzuzufügen. + Es ist nicht möglich eine Randbedingung zwischen zwei externen Geometrien hinzuzufügen. @@ -4169,12 +4169,12 @@ Diese Einstellung ist nur für die Symbolleiste. Was auch immer ausgewählt wurd Single tool - Single tool + Einzelnes Werkzeug Separated tools - Separated tools + Getrennte Werkzeuge @@ -4893,7 +4893,7 @@ Es wurden keine Beschränkungen zu diesen Punkten gefunden. Construction - Konstruktion + Hilfsgeometrie @@ -5430,7 +5430,7 @@ Dies erfolgt durch Analyse der Skizzengeometrien und Randbedingungen. Fix the diameter of a circle or an arc - Durchmesser eines Kreises oder Kreisbogens festlegen + Legt den Durchmesser eines Kreises oder Kreisbogens fest @@ -5448,7 +5448,7 @@ Dies erfolgt durch Analyse der Skizzengeometrien und Randbedingungen. Fix the radius of a circle or an arc - Radius eines Kreises oder Kreisbogens festlegen + Legt den Radius eines Kreises oder Kreisbogens fest @@ -6288,7 +6288,7 @@ Die Rasterweite ändert sich, wenn er kleiner als diese Anzahl von Pixeln wird.< Die Skizze enthält teilweise redundante Randbedingungen! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabeln wurden intern umstrukturiert. Solche Dateien lassen sich mit früheren Versionen von FreeCAD nicht mehr öffnen!! @@ -6329,7 +6329,7 @@ Die Rasterweite ändert sich, wenn er kleiner als diese Anzahl von Pixeln wird.< Error - Fehlermeldungen + Fehler @@ -6662,16 +6662,16 @@ Punkte müssen näher als ein Fünftel der Rasterweite an eine Rasterlinie geset Dimension - Maßeintrag + Abmessung Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Kontextabhängige Randbedingung, basierend auf der aktuellen Auswahl. +Abhängig von der Auswahl stehen möglicherweise mehrere Randbedingungen zur Verfügung. Diese können mit der M-Taste gewechselt werden. +Ein Linksklick auf einen leeren Bereich, bestätigt die aktuell vorausgewählte Randbedingung. Ein Rechtsklick oder das Drücken von Esc bricht die Ausführung ab. @@ -6692,7 +6692,7 @@ Left clicking on empty space will validate the current constraint. Right clickin Dimension - Abmessung + Maßeintrag @@ -6710,7 +6710,7 @@ Left clicking on empty space will validate the current constraint. Right clickin Fix the radius of a circle or an arc - Radius eines Kreises oder Kreisbogens festlegen + Legt den Radius eines Kreises oder Kreisbogens fest diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_el.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_el.ts index e603a530b9..7718ab3fbe 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_el.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_el.ts @@ -2277,60 +2277,60 @@ invalid constraints, degenerated geometry, etc. Σφάλμα αυτόματου περιορισμού: Άλυτο σχέδιο μετά την εφαρμογή περιορισμών ισότητας. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Δεν είναι δυνατή η εύρεση τομής καμπυλών. Προσπαθήστε να προσθέσετε τον περιορισμό ταύτισης μεταξύ κορυφών των καμπυλών που σκοπεύετε να συμπληρώσετε. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline Geometry Index (GeoID) is out of bounds. - + You are requesting no change in knot multiplicity. Δεν απαιτείτε καμία αλλαγή της πολλαπλότητας κόμβου. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. The Geometry Index (GeoId) provided is not a B-spline curve. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Ο δείκτης κόμβου είναι εκτός ορίων. Σημειώστε πως σύμφωνα με το σύστημα σημειογραφίας του OCC, ο πρώτος κόμβος έχει δείκτη 1 και όχι μηδέν. - + The multiplicity cannot be increased beyond the degree of the B-spline. The multiplicity cannot be increased beyond the degree of the B-spline. - + The multiplicity cannot be decreased beyond zero. Η πολλαπλότητα δεν δύναται να είναι χαμηλότερη από το μηδέν. - + OCC is unable to decrease the multiplicity within the maximum tolerance. To ΟCC αδυνατεί να μειώσει την πολλαπλότητα εντός των ορίων μέγιστης ανοχής. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6292,7 +6292,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_es-AR.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_es-AR.ts index 9edae3c31a..a053f9d296 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_es-AR.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_es-AR.ts @@ -1781,7 +1781,7 @@ restricciones inválidas, geometrías degeneradas, etc. Add arc angle constraint - Add arc angle constraint + Añadir restricción de ángulo de arco @@ -2279,59 +2279,59 @@ restricciones inválidas, geometrías degeneradas, etc. Error de auto-restricción: Croquis sin solución después de aplicar restricciones de igualdad. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. No se puede adivinar la intersección de las curvas. Intente agregar una restricción coincidente entre los vértices de las curvas que pretende redondear. - - + + BSpline Geometry Index (GeoID) is out of bounds. Índice de Geometría BSpline (GeoID) está fuera de límites. - + You are requesting no change in knot multiplicity. No está solicitando ningún cambio en la multiplicidad de nudos. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. El índice de geometría (GeoId) proporcionado no es una curva B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. El índice de nudos está fuera de los límites. Tenga en cuenta que de acuerdo con la notación OCC, el primer nudo tiene índice 1 y no 0. - + The multiplicity cannot be increased beyond the degree of the B-spline. La multiplicidad no puede incrementarse más allá del grado de la B-spline. - + The multiplicity cannot be decreased beyond zero. La multiplicidad no puede ser disminuida más allá de cero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC es incapaz de disminuir la multiplicidad dentro de la tolerancia máxima. - + Knot cannot have zero multiplicity. El nodo no puede tener una multiplicidad cero. - + Knot multiplicity cannot be higher than the degree of the BSpline. La multiplicidad del nodo no puede ser mayor que el grado de la BSpline. - + Knot cannot be inserted outside the BSpline parameter range. El nodo no puede ser insertado fuera del rango de parámetros de la B-Spline. @@ -6294,7 +6294,7 @@ El espaciado de la cuadrícula cambia si es menor que este número de píxeles.< ¡El croquis tiene restricciones parcialmente redundantes! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas ha sido migrado. Los archivos migrados no se abrirán en versiones anteriores de FreeCAD!! @@ -6675,9 +6675,9 @@ Los puntos deben estar más cerca de una quinta parte del espacio de la cuadríc Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Restringe contextualmente basado en su selección. +Dependiendo de su selección puede tener varias restricciones disponibles. Puede ciclar a través de ellas usando la tecla M. +Al hacer clic izquierdo en el espacio vacío validará la restricción actual. Al hacer clic derecho o pulsar Esc se cancelará. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_es-ES.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_es-ES.ts index 9f92a408d1..84cd814236 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_es-ES.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_es-ES.ts @@ -1780,7 +1780,7 @@ restricciones inválidas, geometrías degeneradas, etc. Add arc angle constraint - Add arc angle constraint + Añadir restricción de ángulo de arco @@ -2278,59 +2278,59 @@ restricciones inválidas, geometrías degeneradas, etc. Error de autorestricción: croquis sin solución después de aplicar restricciones de igualdad. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. No se puede adivinar la intersección de curvas. Intente agregar una restricción coincidente entre los vértices de las curvas que pretende redondear. - - + + BSpline Geometry Index (GeoID) is out of bounds. Índice de geometría BSpline (GeoID) está fuera de restricciones. - + You are requesting no change in knot multiplicity. Usted esta solicitando no cambio en multiplicidad de nudo. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. El índice de geometría (GeoID) proporcionado no es una curva B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. El índice de nudo es fuera de los limites. Note que según en concordancia con notación de la OCC, el primer nudo tiene índice 1 y no 0. - + The multiplicity cannot be increased beyond the degree of the B-spline. La multiplicidad no puede incrementarse más allá del grado de la B-spline. - + The multiplicity cannot be decreased beyond zero. La multiplicidad no puede ser disminuida más allá de cero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC es incapaz de disminuir la multiplicidad dentro de la tolerancia máxima. - + Knot cannot have zero multiplicity. El nodo no puede tener una multiplicidad cero. - + Knot multiplicity cannot be higher than the degree of the BSpline. La multiplicidad del nodo no puede ser mayor que el grado de la BSpline. - + Knot cannot be inserted outside the BSpline parameter range. El nodo no puede ser insertado fuera del rango de parámetros de la B-Spline. @@ -6290,7 +6290,7 @@ El espaciado de la cuadrícula cambia si es menor que este número de píxeles.< El croquis contiene restricciones parcialmente redundantes! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas ha sido migrado. Los archivos migrados no se abrirán en versiones anteriores de FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_eu.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_eu.ts index adf47eea1e..27b252860e 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_eu.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_eu.ts @@ -1782,7 +1782,7 @@ murrizketak, geometria degeneratuak, etab. aztertuta. Add arc angle constraint - Add arc angle constraint + Gehitu arkuaren angelu-murrizketa @@ -2280,59 +2280,59 @@ murrizketak, geometria degeneratuak, etab. aztertuta. Automurrizketa-errorea: Ebatzi ezin den krokisa berdintasun-murrizketak aplikatu ondoren. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Ezin izan da kurben ebakidura antzeman. Saiatu bat datorren murrizketa bat gehitzen biribildu nahi dituzun kurben erpinen artean. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline geometria-indizea (GeoID) mugetatik kanpo dago. - + You are requesting no change in knot multiplicity. Adabegi-aniztasunean aldaketarik ez egitea eskatzen ari zara. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Hornitutako geometria-indizea (GeoId) ez da Bspline kurba bat. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Adabegi-indizea mugetatik kanpo dago. Kontuan izan, OCC notazioaren arabera, lehen adabegiaren indize-zenbakiak 1 izan behar duela, ez 0. - + The multiplicity cannot be increased beyond the degree of the B-spline. Aniztasuna ezin da handitu Bspline-aren gradutik gora. - + The multiplicity cannot be decreased beyond zero. Aniztasuna ezin da txikitu zerotik behera. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC-k ezin du aniztasuna txikitu tolerantzia maximoaren barruan. - + Knot cannot have zero multiplicity. Adabegiak ezin du zero aniztasuna izan. - + Knot multiplicity cannot be higher than the degree of the BSpline. Adabegi-aniztasunak ezin du izan B-spline kurbaren graduak baino handiagoa. - + Knot cannot be inserted outside the BSpline parameter range. Adabegia ezin da txertatu B-spline parametro-barrutiaren kanpoaldean. @@ -6296,7 +6296,7 @@ Sareta-tartea aldatuko da pixel-zenbaki hau baino txikiagoa bihurtzen bada.Krokisak partzialki erredundanteak diren murrizketak ditu! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolak migratu dira. Migratutako fitxategiak ezin dira ireki FreeCADen aurreko bertsioetan. @@ -6676,9 +6676,9 @@ Puntuak sareta-tartearen bosten bat baino hurbilago ezarri behar dira lerro bate Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Murriztu testuinguruaren arabera, hautapenean oinarrituta. +Hautapenaren arabera, murriztapen batzuk edo besteak egon daitezke erabilgarri. Haien artean saltatzeko, erabili M tekla. +Hutsi dagoen espazioan klik eginda, uneko murriztapena baliozkotuko da. Eskuineko klik eginda edo Esc erabilita ekintza bertan behera geratuko da. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_fi.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_fi.ts index 27410b27f8..e5625f1581 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_fi.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_fi.ts @@ -1222,7 +1222,7 @@ X- tai Y-akselia tai origoa. Wrong selection - Virheellinen valinta + Väärä valinta @@ -2281,59 +2281,59 @@ virheellisiä rajoitteita, rappeutunutta geometriaa jne. Automaattinen rajoitusvirhe: Ratkaisematon luonnos kun käytetään yhdenmukaisia rajoitteita. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Ei kyetty arvaamaan reunojen risteämispistettä. Kokeile lisätä yhtenevyysrajoite pyöristettävien reunojen kärkipisteiden välille. - - + + BSpline Geometry Index (GeoID) is out of bounds. B-splinin geometria-indeksi (GeoID) on sallittujen rajojen ulkopuolella. - + You are requesting no change in knot multiplicity. Solmun moninkertaisuusarvoon ei pyydetty muutosta. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Annettu geometria-indeksi (GeoID) ei vastaa B-splini-käyrää. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Solmun indeksi on rajojen ulkopuolella. Huomaa, että OCC: n notaation mukaisesti ensimmäisellä solmulla on indeksi 1 eikä nolla. - + The multiplicity cannot be increased beyond the degree of the B-spline. Monimuotoisuusarvoa ei voi kasvattaa B-splinin astetta suuremmaksi. - + The multiplicity cannot be decreased beyond zero. Moninkertaisuusarvoa ei voi pienentää negatiiviseksi. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC ei pysty pienentämään moninkertaisuusarvoa pysyäkseen suurimmassa sallitussa toleranssissa. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6298,7 +6298,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_fr.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_fr.ts index 3af178096d..75ea4d4aba 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_fr.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_fr.ts @@ -403,7 +403,7 @@ Constrain block - Contraindre un blocage + Contrainte de blocage @@ -1217,7 +1217,7 @@ as mirroring reference. Wrong selection - Sélection incorrecte + Mauvaise sélection @@ -1777,7 +1777,7 @@ les contraintes invalides, les géométries dégénérées, etc. Add arc angle constraint - Add arc angle constraint + Ajouter une contrainte d'angle d'arc @@ -2275,59 +2275,59 @@ les contraintes invalides, les géométries dégénérées, etc. Erreur de contrainte automatique : esquisse insoluble après l'application des contraintes d'égalité. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. L'intersection des courbes n'a pas pu être trouvée. Essayez d’ajouter une contrainte de coïncidence entre les sommets des courbes sur lesquels vous souhaitez appliquer un congé. - - + + BSpline Geometry Index (GeoID) is out of bounds. L'Index de la géométrie de la B-spline (GeoID) est hors limites. - + You are requesting no change in knot multiplicity. Vous ne demandez aucun changement dans la multiplicité du nœud. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. L’Index de la géométrie (GeoID) fourni n’est pas une courbe B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. L’index du nœud est hors limites. Notez que, conformément à la notation OCC, le premier nœud a un indice de 1 et non pas de zéro. - + The multiplicity cannot be increased beyond the degree of the B-spline. La multiplicité ne peut pas être augmentée au-delà du degré de la B-spline. - + The multiplicity cannot be decreased beyond zero. La multiplicité ne peut pas être diminuée au-delà de zéro. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC ne parvient pas à diminuer la multiplicité selon la tolérance maximale. - + Knot cannot have zero multiplicity. Le nœud ne peut pas avoir zéro de multiplicité. - + Knot multiplicity cannot be higher than the degree of the BSpline. La multiplicité du nœud ne peut pas être supérieure au degré de la courbe BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Le nœud ne peut pas être inséré en dehors de la plage de paramètres de la B-spline. @@ -2551,7 +2551,7 @@ les contraintes invalides, les géométries dégénérées, etc. Wrong selection - Sélection invalide + Sélection incorrecte @@ -4880,7 +4880,7 @@ Toutefois, aucune contrainte liée aux extrémités n'a été trouvée. Settings - Réglages + Paramètres @@ -4894,7 +4894,7 @@ Toutefois, aucune contrainte liée aux extrémités n'a été trouvée. Construction - Construction + Construction  @@ -5417,7 +5417,7 @@ Cela est fait en analysant les géométries et les contraintes de l'esquisse. Copy - Copie + Copier @@ -6174,7 +6174,7 @@ L'algorithme Eigen Sparse QR est optimisé pour les matrices peu denses, génér Distance between two subsequent grid lines. If 'Grid Auto Spacing' is enabled, will be used as base value. - Distance entre deux lignes de grille successives. + Distance entre deux lignes successives de la grille. Si l'option "Espacement automatique de la grille" est activée, elle sera utilisée comme valeur de base. @@ -6202,7 +6202,7 @@ L'espacement de la grille est modifié s'il devient inférieur à ce nombre de p Major grid lines - Lignes pricipales de la grille + Lignes principales de la grille @@ -6218,18 +6218,18 @@ L'espacement de la grille est modifié s'il devient inférieur à ce nombre de p Line pattern - Motif de ligne + Motif des lignes Line pattern used for grid lines. - Motif de ligne utilisé pour la grille. + Motif des lignes utilisé pour la grille. Line width - Largeur de ligne + Largeur des lignes @@ -6240,12 +6240,12 @@ L'espacement de la grille est modifié s'il devient inférieur à ce nombre de p Line color - Couleur de ligne + Couleur des lignes Line pattern used for grid division. - Motif de ligne utilisé pour la division de la grille. + Motif des lignes utilisé pour la division de la grille. @@ -6273,7 +6273,7 @@ L'espacement de la grille est modifié s'il devient inférieur à ce nombre de p Distance between two subsequent grid lines. - Distance entre 2 lignes consécutives de la grille. + Distance entre deux lignes consécutives de la grille. @@ -6289,7 +6289,7 @@ L'espacement de la grille est modifié s'il devient inférieur à ce nombre de p L'esquisse a des contraintes partiellement redondantes ! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Les paraboles ont été migrées. Les fichiers migrés ne pourront pas être ouverts par les versions précédentes de FreeCAD !! @@ -6670,9 +6670,9 @@ Les points doivent être placés à moins d'un cinquième de l'espacement de la Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Contrainte contextuellement basée sur votre sélection. +Selon celle-ci, vous pourriez avoir plusieurs contraintes disponibles. Vous pouvez les parcourir à l'aide de la touche M. +Un clic gauche dans un espace vide validera la contrainte en cours. Cliquez avec le bouton droit ou appuyez sur Échap pour annuler. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_gl.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_gl.ts index 9a46054774..804ef64ec8 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_gl.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_gl.ts @@ -2280,59 +2280,59 @@ invalid constraints, degenerated geometry, etc. Erro auto constrición: esbozo sen solución despois de aplicar constricións de igualdade. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Non se pode adiviñar a intersección de curvas. Tenta engadir unha constrición entre os vértices das curvas que queres achaflanar. - - + + BSpline Geometry Index (GeoID) is out of bounds. A xeometría BSpline de Index (GeoID) está fora da construción. - + You are requesting no change in knot multiplicity. Vostede está solicitando sen troco en multiplicidade de nodo. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. A Xeometría Index (Geold) proporcionada non é unha curva BSpline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. O índice de nodo está fora dos límites. Note que según en concordancia coa notación da OCC, o primeiro nodo ten índice 1 e non 0. - + The multiplicity cannot be increased beyond the degree of the B-spline. A multiplicidade non pode incrementada máis alá do grao da BSpline. - + The multiplicity cannot be decreased beyond zero. A multiplicidade non pode ser diminuida máis alá de cero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC non é quen de diminuir a multiplicidade dentro da tolerancia máxima. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6294,7 +6294,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_hr.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_hr.ts index cffd9a9ed5..f4d2b47549 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_hr.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_hr.ts @@ -2348,61 +2348,61 @@ nevaljana ograničenja, degenerirana geometrija itd. Automatsko ograničenje, pogreška: nerješiva skica nakon primjene izjednačavajućih ograničenja. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Nije moguće odrediti sjecište krivulje. Pokušajte dodati podudarno ograničenje između vrhova krivulje koju namjeravate obrubiti. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline Indeks Geometrije (GeoID) je izvan granica. - + You are requesting no change in knot multiplicity. Vi zahtijevate: bez promjena u mnoštvu čvorova. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Indeks Geometrija (GeoId) pod uvjetom da nije B-spline krivulja. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Čvor indeks je izvan granica. Imajte na umu da u skladu s OCC notacijom, prvi čvor ima indeks 1 a ne nula. - + The multiplicity cannot be increased beyond the degree of the B-spline. Mnoštvo se ne može povećavati iznad stupanja mnoštva b-spline krive. - + The multiplicity cannot be decreased beyond zero. Mnoštvo se ne može smanjiti ispod nule. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC je uspio smanjiti mnoštvo unutar maksimalne tolerancije. - + Knot cannot have zero multiplicity. Čvor ne može sa nulom multiplicirati. - + Knot multiplicity cannot be higher than the degree of the BSpline. Mnoštvo čvorova ne može biti veće od stupnja BSplina. - + Knot cannot be inserted outside the BSpline parameter range. Čvor se ne može umetnuti izvan raspona parametara BSpline. @@ -6440,7 +6440,7 @@ Razmak mreže se mijenja ako postane manji od ovog broja piksela. Skica ima djelomično suvišna ograničenja! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabole su migrirane. Migrirane datoteke neće se otvoriti u prethodnim verzijama FreeCAD-a!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_hu.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_hu.ts index 820b6c1461..ffa5c9ebe3 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_hu.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_hu.ts @@ -1220,7 +1220,7 @@ mint tükörreferencia hivatkozás. Wrong selection - Rossz kijelölés + Hibás kijelölés @@ -2278,59 +2278,59 @@ invalid constraints, degenerated geometry, etc. Autókényszer hiba: megoldhatatlan vázlat egyenlőségi kényszer alkalmazása után. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Nem tudja meghatározni a görbék metszéspontját. Próbáljon meg hozzáadni egybeesés kényszerítést a görbék csúcsaihoz, melyeket le szeretné kerekíteni. - - + + BSpline Geometry Index (GeoID) is out of bounds. Bgörbe geometria Index (GeoID) nem rendelkezik kényszerítésekkel. - + You are requesting no change in knot multiplicity. Nem kér változtatást a csomó többszörözésére. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. A megadott geometria Index (GeoId) nem egy Bgörbe. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. A csomó jelölés határvonalakon kívülre esik. Ne feledje, hogy a megfelelő OCC jelölés szerint, az első csomót jelölése 1 és nem nulla. - + The multiplicity cannot be increased beyond the degree of the B-spline. A sokszorozás nem nőhet a B-görbe szögének értéke fölé. - + The multiplicity cannot be decreased beyond zero. A sokszorozást nem csökkentheti nulla alá. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC képtelen csökkenteni a sokszorozást a maximális megengedett tűrésen belül. - + Knot cannot have zero multiplicity. A csomónak nem lehet nulla sokszorozása. - + Knot multiplicity cannot be higher than the degree of the BSpline. Csomó sokszorozás nem lehet magasabb, mint a B-görbe mértéke. - + Knot cannot be inserted outside the BSpline parameter range. Csomó nem illeszthető be a B-görbe paramétertartományon kívülre. @@ -6292,7 +6292,7 @@ A rácsháló távolsága megváltozik, ha kisebb lesz, mint ez a pixelszám.A vázlat részlegesen felesleges kényszerítéseket tartalmaz! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! A parabolákat áttelepítették. Az áttelepített fájlok nem nyílnak meg a FreeCAD korábbi verzióiban!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_id.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_id.ts index e495094e71..0e548fe96b 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_id.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_id.ts @@ -2282,59 +2282,59 @@ invalid constraints, degenerated geometry, etc. Autoconstrain error: Unsolvable sketch after applying equality constraints. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline Geometry Index (GeoID) is out of bounds. - + You are requesting no change in knot multiplicity. Bspline GeoId berada di luar batas. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. The Geometry Index (GeoId) provided is not a B-spline curve. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Indeks simpul berada di luar batas. Perhatikan bahwa sesuai dengan notasi OCC, simpul pertama memiliki indeks 1 dan bukan nol. - + The multiplicity cannot be increased beyond the degree of the B-spline. The multiplicity cannot be increased beyond the degree of the B-spline. - + The multiplicity cannot be decreased beyond zero. Multiplisitas tidak dapat ditingkatkan melampaui tingkat b-spline. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC tidak dapat mengurangi multiplisitas dalam toleransi maksimum. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6291,7 +6291,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_it.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_it.ts index d08e9b21e9..5ad80449e4 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_it.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_it.ts @@ -2279,59 +2279,59 @@ vincoli non validi, geometria degenerata, ecc. Errore di vincolo automatico: schizzo non risolvibile dopo l'applicazione dei vincoli di uguaglianza. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Impossibile determinare l'intersezione delle curve. Provare ad aggiungere un vincolo di coincidenza tra i vertici delle curve che si intende raccordare. - - + + BSpline Geometry Index (GeoID) is out of bounds. L'indice della geometria della B-spline (GeoID) è fuori limite. - + You are requesting no change in knot multiplicity. Non stai richiedendo modifiche nella molteplicità dei nodi. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. L'indice della geometria (GeoID) fornito non è una curva B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. L'indice del nodo è fuori dai limiti. Notare che, in conformità alla numerazione OCC, il primo nodo ha indice 1 e non zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. La molteplicità non può essere aumentata oltre il grado della B-spline. - + The multiplicity cannot be decreased beyond zero. La molteplicità non può essere diminuita al di là di zero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC non è in grado di diminuire la molteplicità entro la tolleranza massima. - + Knot cannot have zero multiplicity. Il nodo non può avere una molteplicità zero. - + Knot multiplicity cannot be higher than the degree of the BSpline. La molteplicità del nodo non può essere superiore al grado della BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Il nodo non può essere inserito al di fuori dell'intervallo di parametri B-Spline. @@ -6289,7 +6289,7 @@ La spaziatura della griglia cambia se diventa più piccola di questo numero di p Lo schizzo contiene vincoli parzialmente ridondanti! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Le parabole sono state convertite. I file convertiti non si apriranno nelle versioni precedenti di FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ja.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ja.ts index ee9bf37c10..701bda35b6 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ja.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ja.ts @@ -2273,59 +2273,59 @@ invalid constraints, degenerated geometry, etc. 自動拘束エラー: 等値拘束の適用後にスケッチの求解に失敗しました。 - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. 曲線の交点を推定できません。フィレット対象の曲線の頂点の間に一致拘束を追加してみてください。 - - + + BSpline Geometry Index (GeoID) is out of bounds. B-スプラインのジオメトリー番号（ジオID）が範囲外です。 - + You are requesting no change in knot multiplicity. ノット多重度で変更が起きないように要求しています。 - - + + The Geometry Index (GeoId) provided is not a B-spline curve. 入力されたジオメトリー番号（ジオID）がB-スプライン曲線になりません。 - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. ノット・インデックスが境界外です。OCCの記法に従うと最初のノットは1と非ゼロのインデックスを持ちます。 - + The multiplicity cannot be increased beyond the degree of the B-spline. B-スプラインの次数を越えて多重度を増やすことはできません。 - + The multiplicity cannot be decreased beyond zero. 0を越えて多重度を減らすことはできません。 - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCCは最大許容範囲内で多重度を減らすことができまぜん。 - + Knot cannot have zero multiplicity. ノットがゼロ多重性を持つことはでいません。 - + Knot multiplicity cannot be higher than the degree of the BSpline. B-スプラインの次数を超えてノット多重度を増やすことはできません。 - + Knot cannot be inserted outside the BSpline parameter range. B-スプラインパラメーターの範囲外にノットを挿入することはできません。 @@ -6280,7 +6280,7 @@ The grid spacing change if it becomes smaller than this number of pixel.スケッチに一部が冗長な拘束があります! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! 放物線がバージョン変換されました。変換されたファイルは以前のバージョンのFreeCADでは開けません!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ka.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ka.ts index ab34dde49c..1cfafe556a 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ka.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ka.ts @@ -158,7 +158,7 @@ Clone - ასლი + კლონი @@ -785,7 +785,7 @@ with respect to a line or a third point Create fillet - მომრგვალების შექმნა + მომრგვალებული ნაზოლის შექმნა @@ -1019,7 +1019,7 @@ with respect to a line or a third point Decrease knot multiplicity - კვანძის ჯერადობის შემცირება + კვანძის გამრავლებადობის შემცირება @@ -1110,7 +1110,7 @@ with respect to a line or a third point Increase knot multiplicity - კვანძის ჯერადობის გაზრდა + კვანძის გამრავლებადობის გაზრდა @@ -1780,7 +1780,7 @@ invalid constraints, degenerated geometry, etc. Add arc angle constraint - Add arc angle constraint + რკალის კუთხის შეზღუდვის დამატება @@ -2071,7 +2071,7 @@ invalid constraints, degenerated geometry, etc. Create fillet - მომრგვალებული ნაზოლის შექმნა + მომრგვალების შექმნა @@ -2121,12 +2121,12 @@ invalid constraints, degenerated geometry, etc. Increase knot multiplicity - კვანძის გამრავლებადობის გაზრდა + კვანძის ჯერადობის გაზრდა Decrease knot multiplicity - კვანძის გამრავლებადობის შემცირება + კვანძის ჯერადობის შემცირება @@ -2278,59 +2278,59 @@ invalid constraints, degenerated geometry, etc. ავტომატური შეზღუდვის შეცდომა: თანასწორობის შეზღუდვების გადატარების შემდეგ ესკიზი ამოხსნადი არაა. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. მრუდების კვეთის გამოცნობის შეცდომა. სცადეთ დაამატოთ დამთხვევების შეზღუდვები მრუდების წვეროებზე, რომლის მომრგვალებასაც ცდილობთ. - - + + BSpline Geometry Index (GeoID) is out of bounds. B-სპლაინის გეომეტრიის ინდექსი (GeoID) დაშვებულ ლიმიტებს გარეთაა. - + You are requesting no change in knot multiplicity. თქვენ არ ითხოვთ ცვლილებას კვანძის გაყოფადობაში. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. გეომეტრიის მითითებული ინდექსი (GeoID) B-სპლაინის მრუდს არ წარმოადგენს. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. კვანძის ინდექსი საზღვრებს გარეთაა. დაიმახსოვრეთ, რომ OCC ნოტაციების შესაბამისად, პირველი კვანძის ინდექსი 1-ია და არა 0. - + The multiplicity cannot be increased beyond the degree of the B-spline. სიმრავლე არ შეიძლება გაიზარდოს B-სპლაინის დონის მიღმა. - + The multiplicity cannot be decreased beyond zero. სიმრავლე არ შეიძლება შემცირდეს ნულს მიღმა. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC-ს არ შეუძლია შეამციროს სიმრავლე მაქსიმალური ტოლერანტობის ფარგლებში. - + Knot cannot have zero multiplicity. კვანძებს არ შეიძლება ნულოვანი მამრავლი ჰქონდეს. - + Knot multiplicity cannot be higher than the degree of the BSpline. კვანძის მამრავლი არ შეიძლება B-სპლაინის დონეზე დიდი იყოს. - + Knot cannot be inserted outside the BSpline parameter range. კვანძის ჩასმა B-სპლაინის პარამეტრების დიაპაზონის გარეთ შეუძლებელია. @@ -2554,7 +2554,7 @@ invalid constraints, degenerated geometry, etc. Wrong selection - არასწორი არჩევანი + არასწორი მონიშნული @@ -3903,7 +3903,7 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c Reference - ბმა + მითითება @@ -4882,7 +4882,7 @@ However, no constraints linking to the endpoints were found. Settings - გამართვა + მორგება @@ -4896,7 +4896,7 @@ However, no constraints linking to the endpoints were found. Construction - კონსტრუქცია + მშენებლობა @@ -5414,7 +5414,7 @@ This is done by analyzing the sketch geometries and constraints. Clone - კლონი + ასლი @@ -6293,7 +6293,7 @@ The grid spacing change if it becomes smaller than this number of pixel.ესკიზი ნაწილობრივ დამატებით შეზღუდვებს შეიცავს! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! პარაბოლები მიგრირებულია. მიგრირებული ფაილები FreeCAD-ის წინა ვერსიებში არ გაიხსნება!! @@ -6674,9 +6674,9 @@ Points must be set closer than a fifth of the grid spacing to a grid line to sna Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + შეზღუდვა, რომელიც კონტექსტურად თქვენს მონიშნულზეა დამოკიდებული. +თქვენს მონიშნულზე დამოკიდებულებით, შეიძლება რამდენიმე შეზღუდვა გქონდეთ ხელმისაწვდომი. მათ შორის გადართვა M ღილაკით შეგიძლიათ. +თავისუფალ ადგილას მარცხენა ღილაკის დაწკაპუნება მიმდინარე შეზღუდვას გადაამოწმებს, მარჯვენა წკაპი ან Esc ღილაკი კი გააუქმებს მას. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ko.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ko.ts index a8c0d23f38..fec68eba6d 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ko.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ko.ts @@ -2273,59 +2273,59 @@ invalid constraints, degenerated geometry, etc. 자동구속 오류: 동일 구속 적용 후 해결할 수 없는 스케치 - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. 곡선의 교차점을 추정할 수 없습니다. 모깎기 하려는 곡선의 정점들 사이에 일치 구속을 추가해 보십시오. - - + + BSpline Geometry Index (GeoID) is out of bounds. B스플라인 형상 인덱스(GeoID) 가 범위를 벗어났습니다. - + You are requesting no change in knot multiplicity. 매듭점 다중성에 대한 변경을 요청하지 않으셨습니다. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. 제공된 형상 지수(GeoId) 는 B-스플라인 곡선이 아닙니다. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. 매듭 지수가 범위를 벗어났습니다. OCC 표기법에 따라 첫 번째 매듭은 0이 아닌 지수 1을 가집니다. - + The multiplicity cannot be increased beyond the degree of the B-spline. 다중도는 B-스플라인의 정도 이상으로 증가할 수 없습니다. - + The multiplicity cannot be decreased beyond zero. 다중도는 0 이상으로 감소할 수 없습니다. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC는 최대 공차 내에서 다중도를 감소시킬 수 없습니다. - + Knot cannot have zero multiplicity. 매듭은 0개의 다중도를 가질 수 없습니다. - + Knot multiplicity cannot be higher than the degree of the BSpline. 매듭 다중도는 B스플라인의 정도보다 높을 수 없습니다. - + Knot cannot be inserted outside the BSpline parameter range. 매듭은 B스플라인 매개변수 범위 밖에서 삽입할 수 없습니다. @@ -6289,7 +6289,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_nl.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_nl.ts index 183f70452e..f333b31edb 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_nl.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_nl.ts @@ -140,17 +140,17 @@ Constrain radius - Straal bematen + Beperk de straal Constrain diameter - Bemaat de diameter + Beperk de diameter Constrain auto radius/diameter - Bemaat straal/diameter automatisch + Beperk automatisch de straal/diameter @@ -395,7 +395,7 @@ Fix the angle of a line or the angle between two lines - Bemaat de hoek van een lijn of de hoek tussen twee lijnen + Zet de hoek van een lijn of de hoek tussen twee lijnen vast @@ -429,12 +429,12 @@ Constrain diameter - Bemaat de diameter + Beperk de diameter Fix the diameter of a circle or an arc - Bemaat de diameter van een cirkel of een boog + Zet de diameter van een cirkel of een boog vast @@ -460,7 +460,7 @@ Fix the horizontal distance between two points or line ends - De horizontale afstand tussen twee punten of lijneinden bematen + De horizontale afstand tussen twee punten of lijneinden vastzetten @@ -473,7 +473,7 @@ Fix the vertical distance between two points or line ends - De verticale afstand tussen twee punten of lijneinden bematen + De verticale afstand tussen twee punten of lijneinden vastzetten @@ -560,7 +560,7 @@ on the selected vertex Constrain auto radius/diameter - Bemaat straal/diameter automatisch + Beperk automatisch de straal/diameter @@ -1623,12 +1623,12 @@ ongeldige constraints, gedegenereerde geometrie, etc. Add 'Block' constraint - Voeg 'Block' beperking toe + Voeg een 'Fixerende' beperking toe Add block constraint - Blok beperking toevoegen + Voeg een fixerende beperking toe @@ -1712,52 +1712,52 @@ ongeldige constraints, gedegenereerde geometrie, etc. Add 'Horizontal' constraints - Add 'Horizontal' constraints + Voeg 'Horizontale' beperkingen toe Add 'Vertical' constraints - Add 'Vertical' constraints + Voeg "Verticale' beperkingen toe Add Symmetry constraint - Add Symmetry constraint + Voeg een symmetrische beperking toe Add Symmetry constraints - Add Symmetry constraints + Voeg symmetrische beperkingen toe Add Distance constraints - Add Distance constraints + Voeg een afstand beperking toe Add Horizontal constraint - Add Horizontal constraint + Voeg een horizontale beperking toe Add Vertical constraint - Add Vertical constraint + Voeg een verticale beperking toe Add Block constraint - Add Block constraint + Voeg een fixerende beperking toe Add Angle constraint - Add Angle constraint + Voeg een hoek beperking toe @@ -1765,42 +1765,42 @@ ongeldige constraints, gedegenereerde geometrie, etc. Add Equality constraint - Add Equality constraint + Voeg een gelijkwaardigheid beperking toe Add Equality constraints - Add Equality constraints + Voeg gelijkwaardigheid beperkingen toe Add Radius constraint - Add Radius constraint + Voeg een straal beperking toe Add arc angle constraint - Add arc angle constraint + Voeg een booghoek beperking toe Add concentric and length constraint - Add concentric and length constraint + Voeg een concentriciteits en lengte beperking toe Add DistanceX constraint - Add DistanceX constraint + Voeg een afstandsbeperking in x-richting toe Add DistanceY constraint - Add DistanceY constraint + Voeg een afstandsbeperking in y-richting toe Add point to circle Distance constraint - Add point to circle Distance constraint + Voeg een punt-tot-cirkel afstandsbeperking toe @@ -2278,59 +2278,59 @@ ongeldige constraints, gedegenereerde geometrie, etc. Autoconstrain error: Defecte schets tijdens aanleggen van gelijkheids-constraint. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Niet in staat om het snijpunt van de bochten te raden. Probeer een samenvallende beperking toe te voegen tussen de vertexen van de curven die u wilt afronden. - - + + BSpline Geometry Index (GeoID) is out of bounds. B-spline Geometrie Index (GeoID) buiten bereik. - + You are requesting no change in knot multiplicity. U vraagt geen verandering in de knoop multipliciteit. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. De Geometrie Index (Geold) aangeleverd is geen B-spline lijn. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. De knoop-index is buiten de grenzen. Merk op dat volgens de OCC-notatie de eerste knoop index 1 heeft en niet nul. - + The multiplicity cannot be increased beyond the degree of the B-spline. De multipliciteit mag niet groter zijn dan het aantal graden van de B-spline. - + The multiplicity cannot be decreased beyond zero. De multipliciteit kan niet lager zijn dan nul. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC is niet in staat om de multipliciteit binnen de maximale tolerantie te verlagen. - + Knot cannot have zero multiplicity. Knooppunt kan geen multipliciteit van nul hebben. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knooppunt multipliciteit kan niet hoger zijn dan de graad van de B-spline. - + Knot cannot be inserted outside the BSpline parameter range. Knooppunt kan niet worden toegevoegd buiten de parameters van de B-spline. @@ -2700,7 +2700,7 @@ ongeldige constraints, gedegenereerde geometrie, etc. Select one vertex from the sketch other than the origin. - Kies een andere vertex uit de schets dan de oorsprong. + Selecteer een hoekpunt uit de schets, anders dan de oorsprong. @@ -2772,7 +2772,7 @@ ongeldige constraints, gedegenereerde geometrie, etc. Select exactly one line or one point and one line or two points from the sketch. - Selecteer precies één lijn of een punt en een lijn of twee punten uit de schets. + Selecteer precies één lijn, of een punt en een lijn, of twee punten, uit de schets. @@ -2783,7 +2783,7 @@ ongeldige constraints, gedegenereerde geometrie, etc. Select exactly one line or one point and one line or two points or two circles from the sketch. - Selecteer precies één lijn of één punt en één lijn, of twee punten of twee cirkels van de schets. + Selecteer precies één lijn, of één punt en één lijn, of twee punten, of twee cirkels, van de schets. @@ -2844,7 +2844,7 @@ ongeldige constraints, gedegenereerde geometrie, etc. Select exactly one line or up to two points from the sketch. - Selecteer precies een lijn of tot twee punten uit de schets. + Selecteer precies één lijn, of maximaal twee punten, uit de schets. @@ -2881,7 +2881,7 @@ ongeldige constraints, gedegenereerde geometrie, etc. Select at least two lines from the sketch. - Kies tenminste twee lijnen van de schets. + Selecteer tenminste twee lijnen uit de schets. @@ -3712,7 +3712,7 @@ Geaccepteerde combinaties: twee curven; een eindpunt en een curve; twee eindpunt Point Coincidence - Point Coincidence + Samenvallend punt @@ -4134,12 +4134,12 @@ Hiervoor is het nodig om de bewerkingsmodus opnieuw in te schakelen. Dimension Constraint - Dimension Constraint + Maat beperking Dimensioning constraints: - Dimensioning constraints: + Maatvoering beperkingen: @@ -4148,16 +4148,16 @@ Hiervoor is het nodig om de bewerkingsmodus opnieuw in te schakelen. - Select the type of dimensioning constraints for your toolbar: -'Single tool': A single tool for all dimensioning constraints in the toolbar : Distance, Distance X / Y, Angle, Radius. (Others in dropdown) -'Separated tools': Individual tools for each dimensioning constraint. -'Both': You will have both the 'Dimension' tool and the separated tools. -This setting is only for the toolbar. Whichever you chose, all tools are always available in the menu and through shortcuts. + Selecteer het type maatvoering beperkingen voor uw werkbalk: +'Enkel gereedschap': Een enkel hulpmiddel voor alle maatvoering beperkingen in de werkbalk: Afstand, Afstand X / Y, Hoek, Radius. (Overigen in dropdown) +'Gescheiden gereedschappen': Individuele gereedschappen voor elke maatvoering beperking. +'Beide': U krijgt zowel het 'Maatvoering' gereedschap als de gescheiden gereedschappen. +Deze instelling is alleen voor de werkbalk. Welke keuze je ook maakt, alle tools zijn altijd beschikbaar in het menu en via snelkoppelingen. Dimension tool diameter/radius mode: - Dimension tool diameter/radius mode: + Maatvoering gereedschap diameter/straal modus: @@ -4165,20 +4165,20 @@ This setting is only for the toolbar. Whichever you chose, all tools are always 'Auto': The tool will apply radius to arcs and diameter to circles. 'Diameter': The tool will apply diameter to both arcs and circles. 'Radius': The tool will apply radius to both arcs and circles. - While using the Dimension tool you may chose how to handle circles and arcs: -'Auto': The tool will apply radius to arcs and diameter to circles. -'Diameter': The tool will apply diameter to both arcs and circles. -'Radius': The tool will apply radius to both arcs and circles. + Bij het gebruik van het maatvoering gereedschap kun je kiezen hoe om te gaan met cirkels en bogen: +'Auto': Het gereedschap past straal toe op bogen en diameter op cirkels. +'Diameter': Het gereedschap zal de diameter toepassen op zowel bogen als cirkels. +'Straal': Het gereedschap zal de straal toepassen op zowel bogen als cirkels. Single tool - Single tool + Enkelvoudig gereedschap Separated tools - Separated tools + Meervoudig gereedschap @@ -4505,7 +4505,7 @@ Ondersteunt alle eenheid systemen behalve 'US customary ' en 'Building US/Euro'. The current constraint creation tool will remain active after creation. - The current constraint creation tool will remain active after creation. + Huidige beperking gereedschap zal actief blijven na de aanmaak. @@ -4525,7 +4525,7 @@ Ondersteunt alle eenheid systemen behalve 'US customary ' en 'Building US/Euro'. Show dimensional constraint name with format - Show dimensional constraint name with format + Toon maatbeperking naam met lay-out @@ -4539,11 +4539,11 @@ Defaults to: %N = %V %N - name parameter %V - dimension value - The format of the dimensional constraint string presentation. -Defaults to: %N = %V + De lay-out van de tekst van de maatbeperking. +Standaard: %N = %V -%N - name parameter -%V - dimension value +%N - naam van de parameter +%V - waarde van de maat @@ -4553,12 +4553,12 @@ Defaults to: %N = %V Cursor coordinates will use the system decimals setting instead of the short form. - Cursor coordinates will use the system decimals setting instead of the short form. + Cursor coördinaten gebruiken voor decimalen de instellingen van het systeem in plaats van de korte vorm. Use system decimals setting for cursor coordinates - Use system decimals setting for cursor coordinates + Gebruik de systeem instellingen van decimalen voor de cursor coördinaten @@ -4621,13 +4621,13 @@ Dit werkt alleen als "Camera positie herstellen na bewerken" is ingeschakeld. Open a sketch in Section View mode by default. Then objects are only visible behind the sketch plane. - Open a sketch in Section View mode by default. -Then objects are only visible behind the sketch plane. + Open een schets standaard in doorsnede modus. +Dan zijn alleen achter het schets vlak objecten zichtbaaar. Open sketch in Section View mode - Open sketch in Section View mode + Open de schets in doorsnede modus @@ -4637,7 +4637,7 @@ Then objects are only visible behind the sketch plane. Applies current visibility automation settings to all sketches in open documents. - Applies current visibility automation settings to all sketches in open documents. + Past de huidige zichtbaarheid automatisering instellingen toe op alle schetsen in open documenten. @@ -5035,7 +5035,7 @@ Er zijn echter geen beperkingen gevonden die verband houden met de eindpunten. The sketch has unconstrained elements giving rise to those Degrees Of Freedom. Click to select the unconstrained elements. - The sketch has unconstrained elements giving rise to those Degrees Of Freedom. Click to select the unconstrained elements. + De schets heeft onbegrensde elementen die aanleiding geven tot deze graden van vrijheid. Klik om de onbegrensde elementen te selecteren. @@ -5083,7 +5083,7 @@ Dit is puur gebaseerd op samenhang en oriëntatie van de hoekpunten in de schets Fixes found missing coincidences by adding extra coincident constrains - Fixes found missing coincidences by adding extra coincident constrains + Repareert de gevonden ontbrekende samenvallende punten door extra samenvallende beperkingen toe te voegen @@ -5098,12 +5098,12 @@ Dit is puur gebaseerd op samenhang en oriëntatie van de hoekpunten in de schets Defines the X/Y tolerance inside which missing coincidences are searched. - Defines the X/Y tolerance inside which missing coincidences are searched. + Definieert de X/Y-tolerantie waarin ontbrekende samenvallende punten worden gezocht. If checked, construction geometries are ignored in the search - If checked, construction geometries are ignored in the search + Indien aangevinkt worden bouwgeometrieën genegeerd in de zoekopdracht @@ -5140,7 +5140,7 @@ Dit wordt gedaan door de geometrie en beperkingen van de schets te analyseren. Finds invalid/malformed constrains in the sketch - Finds invalid/malformed constrains in the sketch + Vindt foutieve/onjuiste beperkingen in de schets @@ -5185,7 +5185,7 @@ Dit wordt gedaan door de geometrie en beperkingen van de schets te analyseren. Fixes found reversed external geometries by swapping their endpoints - Fixes found reversed external geometries by swapping their endpoints + Repareert de omgekeerde externe geometriën door hun eindpunten te wisselen @@ -5200,7 +5200,7 @@ Dit wordt gedaan door de geometrie en beperkingen van de schets te analyseren. Enables/updates constraint orientation locking - Enables/updates constraint orientation locking + Vergrendeling van de beperkingensoriëntatie inschakelen/updaten @@ -5210,7 +5210,7 @@ Dit wordt gedaan door de geometrie en beperkingen van de schets te analyseren. Disables constraint orientation locking - Disables constraint orientation locking + Vergrendeling van de beperkingensoriëntatie uitschakelen @@ -5329,7 +5329,7 @@ Dit wordt gedaan door de geometrie en beperkingen van de schets te analyseren. %n DoF(s) - %n vrijheidsgra(a)d(en) + %n vrijheidsgra(a)d(en) %n DoF(s) @@ -5435,7 +5435,7 @@ Dit wordt gedaan door de geometrie en beperkingen van de schets te analyseren. Fix the diameter of a circle or an arc - Bemaat de diameter van een cirkel of een boog + Zet de diameter van een cirkel of een boog vast @@ -5453,7 +5453,7 @@ Dit wordt gedaan door de geometrie en beperkingen van de schets te analyseren. Fix the radius of a circle or an arc - De straal van een cirkel of boog bematen + De straal van een cirkel of boog vastzetten @@ -5691,7 +5691,7 @@ Dit wordt gedaan door de geometrie en beperkingen van de schets te analyseren. Select sketch - Kies schets + Selecteer schets @@ -6082,12 +6082,12 @@ Eigen Sparse-QR-algoritme is geoptimaliseerd voor spaarzame matrices; meestal sn P&rofiles - P&rofiles + P&rofiles S&ketch - S&ketch + S&ketch @@ -6295,7 +6295,7 @@ De rasterafstand verandert als deze kleiner wordt dan dit aantal pixels.De schets heeft deels overbodige beperkingen! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolen zijn geconverteerd. Geconverteerde bestanden kunnen niet in vorige versies van FreeCAD worden geopend!! @@ -6351,7 +6351,7 @@ De rasterafstand verandert als deze kleiner wordt dan dit aantal pixels. The constraint has invalid index information and is malformed. - The constraint has invalid index information and is malformed. + De beperking heeft ongeldige index informatie en is onjuist vormgegeven. @@ -6367,7 +6367,7 @@ De rasterafstand verandert als deze kleiner wordt dan dit aantal pixels. Invalid Constraint - Invalid Constraint + Ongeldige beperking @@ -6384,22 +6384,22 @@ De rasterafstand verandert als deze kleiner wordt dan dit aantal pixels. Cannot create arc of hyperbola from invalid angles, try again! - Cannot create arc of hyperbola from invalid angles, try again! + Kan geen boog van de hyperbool maken met ongeldige hoeken, probeer opnieuw! Cannot create arc of hyperbola - Cannot create arc of hyperbola + Kan geen boog van de hyperbool maken Cannot create arc of parabola - Cannot create arc of parabola + Kan de boog van de parabool niet maken Error adding B-Spline pole - Error adding B-Spline pole + Fout bij het toevoegen van de B-Spline pool @@ -6415,17 +6415,17 @@ De rasterafstand verandert als deze kleiner wordt dan dit aantal pixels. Error deleting last pole - Error deleting last pole + Fout bij het verwijderen van de laatste pool Cannot add knot point - Cannot add knot point + Kan het knooppunt niet toevoegen Cannot add internal alignment points - Cannot add internal alignment points + Kan de interne uitlijningspunten niet toevoegen @@ -6604,12 +6604,12 @@ De punten moeten dichter dan een vijfde van de rastergrootte bij een rasterlijn Configure rendering order - Configure rendering order + Configureren van de rendering volgorde Reorder the items in the list to configure rendering order. - Reorder the items in the list to configure rendering order. + De items in de lijst opnieuw sorteren om de rendering volgorde te configureren. @@ -6676,9 +6676,8 @@ De punten moeten dichter dan een vijfde van de rastergrootte bij een rasterlijn Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Beperk de samenhang gebaseerd op uw keuzes. +Afhankelijk van uw keuzes zijn er mogelijk meerdere beperkingen beschikbaar. U kunt er doorheen bladeren met behulp van de M toets. Klik uw linker muis toets in een leeg vlak om de huidige beperking te valideren. Klik uw rechter muis toets, of klik Esc, om de bewerking af te breken. @@ -6686,12 +6685,12 @@ Left clicking on empty space will validate the current constraint. Right clickin Show/hide circular helper for arcs - Show/hide circular helper for arcs + Toon/verberg de ronde hulp voor bogen Switches between showing and hiding the circular helper for all arcs - Switches between showing and hiding the circular helper for all arcs + Schakelt tussen het tonen en verbergen van de ronde hulp voor alle bogen @@ -6712,12 +6711,12 @@ Left clicking on empty space will validate the current constraint. Right clickin Constrain radius - Straal bematen + Beperk de straal Fix the radius of a circle or an arc - De straal van een cirkel of boog bematen + De straal van een cirkel of boog vastzetten diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pl.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pl.ts index b696b3e55e..e0e91b9229 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pl.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pl.ts @@ -163,7 +163,7 @@ Creates a clone of the geometry taking as reference the last selected point - Tworzy prostą kopię geometrii przyjmującej jako odniesienie ostatni wybrany punkt + Tworzy klon geometrii przyjmując za punkt odniesienia ostatni wybrany punkt @@ -1111,7 +1111,7 @@ w odniesieniu do linii lub trzeciego punktu Increase knot multiplicity - Zwiększ liczebność węzłów + Zwiększ liczbę węzłów @@ -1782,7 +1782,7 @@ nieprawidłowych wiązań, zdegenerowanej geometrii itp. Add arc angle constraint - Add arc angle constraint + Dodaj wiązanie kąta łuku @@ -2123,7 +2123,7 @@ nieprawidłowych wiązań, zdegenerowanej geometrii itp. Increase knot multiplicity - Zwiększ liczbę węzłów + Zwiększ liczebność węzłów @@ -2280,59 +2280,59 @@ nieprawidłowych wiązań, zdegenerowanej geometrii itp. Błąd wiązań automatycznych: Nierozwiązywalny szkic przy stosowaniu wiązania równości. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Nie można ustalić punktu przecięcia się krzywych. Spróbuj dodać wiązanie zbieżne pomiędzy wierzchołkami krzywych, które zamierzasz zaokrąglić. - - + + BSpline Geometry Index (GeoID) is out of bounds. Indeks geometrii krzywej złożonej (GeoID) jest poza wiązaniem. - + You are requesting no change in knot multiplicity. Żądasz niezmienności w wielokrotności węzłów. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Podany indeks geometrii krzywej złożonej (GeoId) nie jest łukiem krzywej złożonej. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Indeks węzłów jest poza wiązaniem. Zauważ, że zgodnie z zapisem OCC, pierwszy węzeł ma indeks 1, a nie zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. Wielokrotność nie może być zwiększona poza stopień krzywej złożonej. - + The multiplicity cannot be decreased beyond zero. Wielokrotność nie może zostać zmniejszona poniżej zera. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC nie jest w stanie zmniejszyć wielokrotności w ramach maksymalnej tolerancji. - + Knot cannot have zero multiplicity. Węzeł nie może mieć zerowej krotności. - + Knot multiplicity cannot be higher than the degree of the BSpline. Krotność węzłów nie może być większa niż stopień krzywej złożonej. - + Knot cannot be inserted outside the BSpline parameter range. Węzła nie można wstawić poza zakresem parametrów krzywej złożonej. @@ -2556,7 +2556,7 @@ nieprawidłowych wiązań, zdegenerowanej geometrii itp. Wrong selection - Niewłaściwy wybór + Nieprawidłowy wybór @@ -4899,7 +4899,7 @@ Nie znaleziono jednak żadnych powiązań z punktami końcowymi. Construction - Konstrukcja + Konstrukcyjny @@ -5411,7 +5411,7 @@ Odbywa się to przez analizę geometrii szkicu i wiązań. Creates a clone of the geometry taking as reference the last selected point - Tworzy klon geometrii przyjmując za punkt odniesienia ostatni wybrany punkt + Tworzy prostą kopię geometrii przyjmującej jako odniesienie ostatni wybrany punkt @@ -6298,7 +6298,7 @@ Rozstaw siatki zmienia się, jeśli staje się mniejszy niż określona liczba p Szkic zawiera częściowo zbędne wiązania! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabole zostały poddane migracji. Pliki po imporcie nie otworzą się w poprzednich wersjach programu FreeCAD!! @@ -6679,9 +6679,10 @@ Przytrzymaj CTRL, aby włączyć "Przyciąganie pod kątem". Kąt zaczyna się o Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Zwiąż kontekstowo na podstawie dokonanego wyboru. +W zależności od dokonanego wyboru dostępnych może być kilka rodzajów wiązań. Można je przeglądać za pomocą klawisza M. +Kliknięcie lewym przyciskiem myszki na pustym miejscu spowoduje zatwierdzenie bieżącego wiązania. +Kliknięcie prawym przyciskiem myszy lub naciśnięcie Esc spowoduje anulowanie. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pt-BR.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pt-BR.ts index 509acab2c0..08fb02d90a 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pt-BR.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pt-BR.ts @@ -2280,59 +2280,59 @@ restrições inválidas, geometria corrompida, etc. Erro de restrição automática: esboço insolúvel após a aplicação de restrições de igualdade. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Não é possível adivinhar a intersecção das curvas. Tente adicionar uma restrição coincidente entre os vértices das curvas que você pretende filetar. - - + + BSpline Geometry Index (GeoID) is out of bounds. Índice de geometria BSpline (GeoID) está fora dos limites. - + You are requesting no change in knot multiplicity. Você não solicitou nenhuma mudança de multiplicidade em nós. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. O índice de geometria (GeoId) fornecida não é uma curva B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. O índice do nó está fora dos limites. Note que, de acordo com a notação do OCC, o primeiro nó tem índice 1 e não zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. A multiplicidade não pode ser aumentada além do grau de B-spline. - + The multiplicity cannot be decreased beyond zero. A multiplicidade não pode ser diminuída abaixo de zero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. O OCC não consegue diminuir a multiplicidade dentro de tolerância máxima. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6295,7 +6295,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pt-PT.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pt-PT.ts index b90e631f92..3b8ff2b944 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pt-PT.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_pt-PT.ts @@ -2280,59 +2280,59 @@ invalid constraints, degenerated geometry, etc. Erro de restrição automática: esboço insolúvel após a aplicação de restrições de igualdade. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Não é possível calcular a interseção das curvas. Tente adicionar uma restrição coincidente entre os vértices das curvas das quais pretende fazer a concordância. - - + + BSpline Geometry Index (GeoID) is out of bounds. Índice de geometria BSpline (GeoID) está fora dos limites. - + You are requesting no change in knot multiplicity. Você não está a solicitar nenhuma mudança na multiplicidade de nó. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. O índice de geometria (GeoId) fornecida não é uma curva B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. O índice do nó está fora dos limites. Note que, de acordo com a notação de OCC, o primeiro nó tem índice 1 e não zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. A multiplicidade não pode ser aumentada além do grau de B-spline. - + The multiplicity cannot be decreased beyond zero. A multiplicidade não pode ser diminuída, abaixo de zero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC é incapaz de diminuir a multiplicidade dentro de tolerância máxima. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6296,7 +6296,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ro.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ro.ts index 3daf49018d..57fda0419f 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ro.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ro.ts @@ -2280,59 +2280,59 @@ constrângeri nevalide, geometrie degenerată, etc. Eroare de autoconstrângere: schiță nerezolvabilă după aplicarea constrângerilor de egalitate. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Nu puteți ghici intersecția curbelor. Încercați să adăugați o constrângere de potrivire între vârfurile curbelor pe care intenționați să le completați. - - + + BSpline Geometry Index (GeoID) is out of bounds. Indicele de geometrie BSpline (GeoID) nu este în limite maxime. - + You are requesting no change in knot multiplicity. Nu cereți nicio schimbare în multiplicitatea nodului. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Indicele de geometrie (GeoId) furnizat nu este o curbă B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Indexul nod este în afara limitelor. Reţineţi că în conformitate cu notaţia OCC, primul nod are indexul 1 şi nu zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. Multiplicitatea nu poate fi crescută dincolo de gradul curbei B-spline. - + The multiplicity cannot be decreased beyond zero. Multiplicitatea nu poate fi diminuată sub zero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC este în imposibilitatea de a reduce multiplicarea în limitele toleranței maxime. - + Knot cannot have zero multiplicity. Nu poate avea multiplicitate zero. - + Knot multiplicity cannot be higher than the degree of the BSpline. Multiplicitatea nodului nu poate fi mai mare decât gradul BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Nu se poate insera un nod în afara intervalului parametrului BSpline. @@ -6293,7 +6293,7 @@ Schimbarea spațierii grilei dacă devine mai mică decât acest număr de pixel Schița are constrângeri parțial redundante! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolele au fost migrate. Fișierele migrate nu vor fi deschise în versiunile anterioare de FreeCAD! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ru.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ru.ts index 856fbfbebe..239e7b52ce 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ru.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_ru.ts @@ -1218,7 +1218,7 @@ as mirroring reference. Wrong selection - Неправильное выделение + Неправильный выбор @@ -1777,7 +1777,7 @@ invalid constraints, degenerated geometry, etc. Add arc angle constraint - Add arc angle constraint + Добавить ограничение угла дуги @@ -2275,59 +2275,59 @@ invalid constraints, degenerated geometry, etc. Ошибка автоограничения: Эскиз нерешаем после добавлении ограничения равенства. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Не удалось рассчитать пересечение кривых. Попробуйте добавить ограничение совпадения между вершинами кривых, которые вы намерены скруглить. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline идентификатор геометрии (GeoID) находится вне границ. - + You are requesting no change in knot multiplicity. Вы не запрашиваете никаких изменений в множественности узлов. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Идентификатор геометрии (GeoId) не является B-сплайн кривой. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Индекс узла выходит за границы. Обратите внимание, что в соответствии с нотацией OCC первый узел имеет индекс 1, а не ноль. - + The multiplicity cannot be increased beyond the degree of the B-spline. Кратность не может быть увеличена сверх степени B-сплайна. - + The multiplicity cannot be decreased beyond zero. Кратность не может быть уменьшена ниже нуля. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC неспособен уменьшить кратность в пределах максимального допуска. - + Knot cannot have zero multiplicity. Узел не может иметь нулевой кратности. - + Knot multiplicity cannot be higher than the degree of the BSpline. Кратность узла не может быть выше степени BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Узел не может быть вставлен за пределы диапазона параметров BSpline. @@ -2348,7 +2348,7 @@ invalid constraints, degenerated geometry, etc. Sketcher - Набросок + Sketcher @@ -2551,7 +2551,7 @@ invalid constraints, degenerated geometry, etc. Wrong selection - Неправильный выбор + Неправильное выделение @@ -4890,7 +4890,7 @@ However, no constraints linking to the endpoints were found. Construction - Конструктор + Конструкция @@ -5415,7 +5415,7 @@ This is done by analyzing the sketch geometries and constraints. Copy - Копировать + Скопировать @@ -6084,7 +6084,7 @@ Eigen Sparse QR algorithm is optimized for sparse matrices; usually faster Sketcher - Sketcher + Набросок @@ -6287,7 +6287,7 @@ The grid spacing change if it becomes smaller than this number of pixel.Sketch имеет частично избыточные ограничения! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Параболы были перенесены. Перемещенные файлы не будут открыты в предыдущих версиях FreeCAD!! @@ -6328,7 +6328,7 @@ The grid spacing change if it becomes smaller than this number of pixel. Error - Ошибки + Ошибка @@ -6668,9 +6668,9 @@ Points must be set closer than a fifth of the grid spacing to a grid line to sna Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Ограничьте контекстуально на основе вашего выбора. +В зависимости от вашего выбора у вас может быть несколько доступных ограничений. Вы можете переключаться между ними, используя клавишу M. +Щелчок левой кнопкой мыши по пустому пространству подтвердит текущее ограничение. Щелчок правой кнопкой мыши или нажатие Esc приведет к отмене. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sl.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sl.ts index 0f059b9005..140c53ef69 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sl.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sl.ts @@ -2278,59 +2278,59 @@ neveljavna omejila, izrojene geometrije, ... Napaka samodejnega omejila: Nerešljiv očrt po uveljavitiv enakostnega omejila. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Ni mogoče uganiti presečišča krivulj. Poskusite dodati omejilo sovpadanja med vozlišči krivulj, ki jih nameravate zaokrožiti. - - + + BSpline Geometry Index (GeoID) is out of bounds. Kazalo geometrije B-zlepka (GeoID) je izven omejitev. - + You are requesting no change in knot multiplicity. Ne zahtevate spremembe večkratnosti vozla. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Priskrbljeno kazalo geometrije (GeoId) ni krivulja B-zlepek. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Oznaka vozla je izven meja. Upoštevajte, da ima v skladu z OCC zapisom prvi vozel oznako 1 in ne nič. - + The multiplicity cannot be increased beyond the degree of the B-spline. Večkratnost ne more biti povečana preko stopnje B-zlepka. - + The multiplicity cannot be decreased beyond zero. Večkratnost ne more biti zmanjšana pod ničlo. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC ne more zmanjšati večkratnost znotraj največjega dopustnega odstopanja. - + Knot cannot have zero multiplicity. Večkratnost vozla ne more biti nič. - + Knot multiplicity cannot be higher than the degree of the BSpline. Večkratnost vozla ne more biti večja od stopnje B-zlepka. - + Knot cannot be inserted outside the BSpline parameter range. Vozla ni mogoče vstaviti izven razpona določilke B-zlepka. @@ -6295,7 +6295,7 @@ Medčrtna razdalja se spremeni, če postane manjša od tega števila slikovnih t Očrt vsebuje deloma čezmerna omejila! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabole so bile preseljene. Preseljenih datotek ne bo mogoče odpreti v prejšnjih FreeCADih! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sr-CS.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sr-CS.ts index 9820a7621c..7bf987326e 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sr-CS.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sr-CS.ts @@ -1780,7 +1780,7 @@ nevažeća ograničenja, degenerisanu geometriju, itd. Add arc angle constraint - Add arc angle constraint + Dodaj ograničenje ugla luka @@ -2278,59 +2278,59 @@ nevažeća ograničenja, degenerisanu geometriju, itd. Greška automatskog ograničavanja: Nerešiva skica posle primene ograničenja jednakosti. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Nije moguće odrediti presečnu tačku krivih. Pokušaj da dodaš ograničenje podudarnosti između tačaka krivih gde nameravaš da napraviš zaobljenje. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline Geometry Index (GeoID) is out of bounds. - + You are requesting no change in knot multiplicity. Ne zahtevate promenu u višestrukosti čvorova. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. The Geometry Index (GeoId) provided is not a B-spline curve. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. Višestrukost se ne može povećati iznad stepena B-splajn krive. - + The multiplicity cannot be decreased beyond zero. Višestrukost ne može biti manje od nule. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC nije u stanju da smanji višestrukost unutar maksimalne tolerancije. - + Knot cannot have zero multiplicity. Čvor ne može imati nultu višestrukost. - + Knot multiplicity cannot be higher than the degree of the BSpline. Višestrukost čvorova ne može biti veća od stepena B-Splajn krive. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6296,7 +6296,7 @@ Razmak mreže se menja ako postane manji od ovog broja piksela. Skica ima delimično suvišna ograničenja! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! @@ -6677,9 +6677,9 @@ Tačke se moraju nalaziti na udaljenosti manjoj od 1/5 razmaka linija mreže da Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Ograniči kontekstualno na osnovu izbora. +U zavisnosti od izbora, moguće je na raspolaganju imati nekoliko vrsta ograničenja. Možeš da se krećeš kroz njih pomoću tastera M. +Levi klik na prazan prostor potvrdiće trenutno ograničenje. Desni klik ili pritisak na Esc će poništiti. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sr.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sr.ts index 08c573bf5b..17324baf28 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sr.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sr.ts @@ -1780,7 +1780,7 @@ invalid constraints, degenerated geometry, etc. Add arc angle constraint - Add arc angle constraint + Додај ограничење угла лука @@ -2278,59 +2278,59 @@ invalid constraints, degenerated geometry, etc. Грешка аутоматског ограничавања: Нерешива скица после примене ограничења једнакости. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Није могуће одредити пресечну тачку кривих. Покушај да додаш ограничење подударности између тачака кривих где намераваш да направиш заобљење. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline Geometry Index (GeoID) is out of bounds. - + You are requesting no change in knot multiplicity. Не захтевате промену у вишеструкости чворова. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. The Geometry Index (GeoId) provided is not a B-spline curve. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. Вишеструкост се не може повећати изнад степена Б-сплајн криве. - + The multiplicity cannot be decreased beyond zero. Вишеструкост не може бити мање од нуле. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC није у стању да смањи вишеструкост унутар максималне толеранције. - + Knot cannot have zero multiplicity. Чвор не може имати нулту вишеструкост. - + Knot multiplicity cannot be higher than the degree of the BSpline. Вишеструкост чворова не може бити већа од степена Б-Сплајн криве. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6296,7 +6296,7 @@ The grid spacing change if it becomes smaller than this number of pixel.Скица има делимично сувишна ограничења! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! @@ -6677,9 +6677,9 @@ Points must be set closer than a fifth of the grid spacing to a grid line to sna Constrain contextually based on your selection. Depending on your selection you might have several constraints available. You can cycle through them using M key. Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. - Constrain contextually based on your selection. -Depending on your selection you might have several constraints available. You can cycle through them using M key. -Left clicking on empty space will validate the current constraint. Right clicking or pressing Esc will cancel. + Ограничи контекстуално на основу избора. +У зависности од избора, могуће је на располагању имати неколико врста ограничења. Можеш да се крећеш кроз њих помоћу тастера М. +Леви клик на празан простор потврдиће тренутно ограничење. Десни клик или притисак на Esc ће поништити. diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sv-SE.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sv-SE.ts index 69af870bce..406f1f0352 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sv-SE.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_sv-SE.ts @@ -2280,59 +2280,59 @@ invalid constraints, degenerated geometry, etc. Auto-begränsningsfel: Olösbar skiss efter tillämpning av likhetsbegränsningar. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Kan inte finna skärning mellan kurvorna. Försök att lägga till en sammanfallande-begränsning mellan ändpunkterna på kurvorna du vill avrunda. - - + + BSpline Geometry Index (GeoID) is out of bounds. B-spline-geometriindex (GeoID) är inte giltigt. - + You are requesting no change in knot multiplicity. Du efterfrågar ingen ändring i knutmultipliciteten. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Geometriindex (GeoId) som är angivet är inte en B-spline-kurva. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Knutindex är inte giltigt. Notera att i enlighet med OCC-notation så har första knuten index 1 och inte index 0. - + The multiplicity cannot be increased beyond the degree of the B-spline. Multipliciteten kan inte ökas mer än graden av B-spline:n. - + The multiplicity cannot be decreased beyond zero. Multipliciteten kan inte minskas under 0. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC kan inte minsta multipliciteten inom den maximala toleransen. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6297,7 +6297,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_tr.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_tr.ts index c8224e8ade..75fefa7f00 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_tr.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_tr.ts @@ -2276,59 +2276,59 @@ bozulmuş geometriye vb. bakarak bir eskizi doğrulayın. Otomatik kısıtlama hatası: Eşitlik kısıtlamaları uygulandıktan sonra eskiz çözülemez. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Eğrilerin kesişimini tahmin edemiyoruz. Dilimlemeyi planladığınız eğrilerin köşeleri arasında çakışan bir kısıtlama eklemeyi deneyin. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline Geometri Dizini (GeoID) sınırların dışında. - + You are requesting no change in knot multiplicity. Düğüm çokluğunda herhangi bir değişiklik istemiyorsunuz. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Sağlanan Geometri Dizini (GeoId) bir B-spline eğrisi değil. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Düğüm endeksi sınırların dışındadır. OCC gösterimine göre, ilk düğümün indeks 1'i olduğunu ve sıfır olmadığını unutmayın. - + The multiplicity cannot be increased beyond the degree of the B-spline. Çeşitlilik, B-spline'nın derecesinin ötesinde artırılamaz. - + The multiplicity cannot be decreased beyond zero. Çokluk sıfırdan aşağıya düşürülemez. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC, maksimum tolerans dahilinde çokluğu azaltamıyor. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6289,7 +6289,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_uk.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_uk.ts index 837503b642..d88f5f3132 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_uk.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_uk.ts @@ -2277,59 +2277,59 @@ invalid constraints, degenerated geometry, etc. Помилка автообмеження: Ескіз не вирішується після додавання обмеження рівності. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. Не вдалося розрахувати перетин кривих. Спробуйте додати обмеження збігу між вершинами кривих, які ви хочете заокруглити. - - + + BSpline Geometry Index (GeoID) is out of bounds. BSpline ідентифікатор геометрії (GeoID) знаходиться поза межами. - + You are requesting no change in knot multiplicity. Ви просите не змінювати кратність вузлів. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. Ідентифікатор геометрії (GeoId) не є кривою B-сплайн. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. Індекс вузла виходить за межі. Зверніть увагу, що відповідно до нотації OCC перший вузол має індекс 1, а не нуль. - + The multiplicity cannot be increased beyond the degree of the B-spline. Кратність не може бути збільшена понад ступінь B-сплайну. - + The multiplicity cannot be decreased beyond zero. Кратність не може бути зменшена нижче нуля. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC нездатний зменшити кратність у межах максимального допуску. - + Knot cannot have zero multiplicity. Вузол не може мати нульову кратність. - + Knot multiplicity cannot be higher than the degree of the BSpline. Кратність вузла не повинна перевищувати ступінь B-сплайна. - + Knot cannot be inserted outside the BSpline parameter range. Вузол не можна розмістити за межами діапазону параметрів B-сплайну. @@ -6297,7 +6297,7 @@ The grid spacing change if it becomes smaller than this number of pixel.Скетч має частково надлишкові обмеження! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Перенесено параболи. Перенесені файли не відкриватимуться у попередніх версіях FreeCAD!!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_val-ES.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_val-ES.ts index ecf9c18552..6cc17aaafb 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_val-ES.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_val-ES.ts @@ -2280,59 +2280,59 @@ invalid constraints, degenerated geometry, etc. Error de restricció: esbós irresoluble si s'apliquen restriccions d'igualtat. - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. No s'ha trobat la intersecció de les corbes. Intenteu afegir una restricció coincident entre els vèrtexs de les corbes que esteu intentant arrodonir. - - + + BSpline Geometry Index (GeoID) is out of bounds. L'índex de geometria BSpline (GeoID) està fora de les restriccions. - + You are requesting no change in knot multiplicity. Se us ha demanat que no canvieu la multiplicitat del nus. - - + + The Geometry Index (GeoId) provided is not a B-spline curve. L'índex de geometria (GeoId) proporcionat no és una corba de B-spline. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. L'índex del nus és fora dels límits. Tingueu en compte que d'acord amb la notació d'OCC, el primer nus té l'índex 1 i no zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. La multiplicitat no es pot augmentar més enllà del grau del B-spline. - + The multiplicity cannot be decreased beyond zero. La multiplicitat no es pot reduir més enllà de zero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC no pot reduir la multiplicitat dins de la tolerància màxima. - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. Knot cannot be inserted outside the BSpline parameter range. @@ -6278,7 +6278,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_zh-CN.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_zh-CN.ts index e21b9f5c0a..c0ea033b42 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_zh-CN.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_zh-CN.ts @@ -76,7 +76,7 @@ Copy the geometry of another sketch - Copy the geometry of another sketch + 复制另一个草图的几何元素 @@ -408,7 +408,7 @@ Block the selected edge from moving - Block the selected edge from moving + 阻止选中的边移动 @@ -513,8 +513,7 @@ Create both a horizontal and a vertical distance constraint on the selected vertex - Create both a horizontal and a vertical distance constraint -on the selected vertex + 在选中的顶点上同时创建水平和垂直距离约束 @@ -574,14 +573,13 @@ on the selected vertex Constrain refraction (Snell's law) - Constrain refraction (Snell's law) + 折射约束 (斯涅尔定律) Create a refraction law (Snell's law)constraint between two endpoints of rays and an edge as an interface. - Create a refraction law (Snell's law)constraint between two endpoints of rays -and an edge as an interface. + 通过指定两光线端点和一条边作为折射界面创建折射约束（斯涅尔定律） @@ -694,7 +692,7 @@ with respect to a line or a third point Create arc of ellipse - Create arc of ellipse + 创建椭圆弧线 @@ -707,7 +705,7 @@ with respect to a line or a third point Create arc of hyperbola - Create arc of hyperbola + 创建双曲线弧线 @@ -720,7 +718,7 @@ with respect to a line or a third point Create arc of parabola - Create arc of parabola + 创建抛物线弧线 @@ -738,7 +736,7 @@ with respect to a line or a third point Create a B-spline by control points in the sketch. - Create a B-spline by control points in the sketch. + 通过草图中的控制点创建B样条曲线。 @@ -881,7 +879,7 @@ with respect to a line or a third point Create a periodic B-spline by control points in the sketch. - Create a periodic B-spline by control points in the sketch. + 通过草图中的控制点创建封闭的B样条曲线。 @@ -1136,12 +1134,12 @@ with respect to a line or a third point Join curves - Join curves + 连接曲线 Join two curves at selected end points - Join two curves at selected end points + 在选定的端点处连接两条曲线 @@ -1664,12 +1662,12 @@ invalid constraints, degenerated geometry, etc. Add circle to circle distance constraint - Add circle to circle distance constraint + 添加圆到圆距离约束 Add circle to line distance constraint - Add circle to line distance constraint + 添加圆到线距离约束 @@ -1691,71 +1689,71 @@ invalid constraints, degenerated geometry, etc. Add lock constraint - Add lock constraint + 添加锁定约束 Add 'Distance to origin' constraint - Add 'Distance to origin' constraint + 添加“到原点的距离”约束 Add Distance constraint - Add Distance constraint + 添加距离约束 Add 'Horizontal' constraints - Add 'Horizontal' constraints + 添加“水平”约束 Add 'Vertical' constraints - Add 'Vertical' constraints + 添加“垂直”约束 Add Symmetry constraint - Add Symmetry constraint + 添加对称约束 Add Symmetry constraints - Add Symmetry constraints + 添加对称约束 Add Distance constraints - Add Distance constraints + 添加距离约束 Add Horizontal constraint - Add Horizontal constraint + 添加水平约束 Add Vertical constraint - Add Vertical constraint + 添加垂直约束 Add Block constraint - Add Block constraint + 添加锁定约束 Add Angle constraint - Add Angle constraint + 添加角度约束 @@ -1763,22 +1761,22 @@ invalid constraints, degenerated geometry, etc. Add Equality constraint - Add Equality constraint + 添加相等约束 Add Equality constraints - Add Equality constraints + 添加相等约束 Add Radius constraint - Add Radius constraint + 添加半径约束 Add arc angle constraint - Add arc angle constraint + 添加圆弧角度约束 @@ -1788,17 +1786,17 @@ invalid constraints, degenerated geometry, etc. Add DistanceX constraint - Add DistanceX constraint + 添加x距离约束 Add DistanceY constraint - Add DistanceY constraint + 添加y距离约束 Add point to circle Distance constraint - Add point to circle Distance constraint + 添加点到圆距离约束 @@ -2099,7 +2097,7 @@ invalid constraints, degenerated geometry, etc. Add hexagon - Add hexagon + 添加六边形 @@ -2134,7 +2132,7 @@ invalid constraints, degenerated geometry, etc. Join Curves - Join Curves + 连接曲线 @@ -2149,12 +2147,12 @@ invalid constraints, degenerated geometry, etc. Copy/clone/move geometry - Copy/clone/move geometry + 复制/克隆/移动几何体 Create copy of geometry - Create copy of geometry + 创建几何形状副本 @@ -2202,27 +2200,27 @@ invalid constraints, degenerated geometry, etc. Drag Point - Drag Point + 拖动点 Drag Curve - Drag Curve + 拖动曲线 Drag Constraint - Drag Constraint + 拖动约束 Modify sketch constraints - Modify sketch constraints + 修改草图约束 Add Knot Point - Add Knot Point + 添加节点 @@ -2276,59 +2274,59 @@ invalid constraints, degenerated geometry, etc. 自动约束错误: 应用相等约束后草图无法求解。 - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. 无法猜测曲线的交叉点。尝试在你打算做圆角的曲线顶点之间添加一个重合约束。 - - + + BSpline Geometry Index (GeoID) is out of bounds. 贝赛尔样条几何图形索引(GeoID) 超出了界限。 - + You are requesting no change in knot multiplicity. 你被要求不对多重性节点做任何修改。 - - + + The Geometry Index (GeoId) provided is not a B-spline curve. 提供的几何图形索引 (GeoId) 不是贝赛尔样条曲线 - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. 结指数超出界限。请注意, 按照 OCC 符号, 第一个节点的索引为1, 而不是0。 - + The multiplicity cannot be increased beyond the degree of the B-spline. 无法重复增加到超过贝塞尔曲线的自由度。 - + The multiplicity cannot be decreased beyond zero. 多重性不能小于0. - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC 无法在最大公差范围内减少多重性。 - + Knot cannot have zero multiplicity. Knot cannot have zero multiplicity. - + Knot multiplicity cannot be higher than the degree of the BSpline. Knot multiplicity cannot be higher than the degree of the BSpline. - + Knot cannot be inserted outside the BSpline parameter range. 不能在B样条参数范围之外插入节点。 @@ -2588,7 +2586,7 @@ invalid constraints, degenerated geometry, etc. Keep notifying me of constraint substitutions - Keep notifying me of constraint substitutions + 随时通知我是否有可替换的约束 @@ -6288,7 +6286,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_zh-TW.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_zh-TW.ts index b842204cb5..a1d93f78d6 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_zh-TW.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher_zh-TW.ts @@ -2275,59 +2275,59 @@ invalid constraints, degenerated geometry, etc. 自動拘束錯誤: 套用對稱拘束後無法解出此草圖 - + Unable to guess intersection of curves. Try adding a coincident constraint between the vertices of the curves you are intending to fillet. 無法猜測曲線交叉點。試著添加共點拘束在你要倒圓角的點及曲線間。 - - + + BSpline Geometry Index (GeoID) is out of bounds. B 雲形線幾何索引 (GeoID) 超出範圍。 - + You are requesting no change in knot multiplicity. 您正在要求不要改變結點多重性 - - + + The Geometry Index (GeoId) provided is not a B-spline curve. 提供的幾何索引 (GeoId) 不是 B 雲形線曲線。 - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. 結點索引超過範圍。請注意在 OCC 表示中，第一個結點的索引為 1 而不是 0。 - + The multiplicity cannot be increased beyond the degree of the B-spline. 結點多重性不能比 B 雲形線之多項式次數高 - + The multiplicity cannot be decreased beyond zero. 多重性不能減少到超過零。 - + OCC is unable to decrease the multiplicity within the maximum tolerance. OCC 無法在最大容差範圍內降低多重性。 - + Knot cannot have zero multiplicity. 結點之多重性不能為零。 - + Knot multiplicity cannot be higher than the degree of the BSpline. 結點多重性不能比 B 雲形線之次數高。 - + Knot cannot be inserted outside the BSpline parameter range. 結點不能在 B 雲形線參數範圍外面插入 @@ -5774,7 +5774,7 @@ Do you want to detach it from the support? Link - 連結 + 鏈結 @@ -6278,7 +6278,7 @@ The grid spacing change if it becomes smaller than this number of pixel.The Sketch has partially redundant constraints! - + Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! Parabolas were migrated. Migrated files won't open in previous versions of FreeCAD!! @@ -6600,7 +6600,7 @@ Points must be set closer than a fifth of the grid spacing to a grid line to sna Toggle grid - Toggle grid + 切換格線 diff --git a/src/Mod/Spreadsheet/Gui/Command.cpp b/src/Mod/Spreadsheet/Gui/Command.cpp index 6bc7ab5adb..144f72c519 100644 --- a/src/Mod/Spreadsheet/Gui/Command.cpp +++ b/src/Mod/Spreadsheet/Gui/Command.cpp @@ -191,7 +191,7 @@ void CmdSpreadsheetImport::activated(int iMsg) { Q_UNUSED(iMsg); QString selectedFilter; - QString formatList = QObject::tr("All (*)"); + QString formatList = QObject::tr("CSV (*.csv *.CSV);;All (*)"); QString fileName = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Import file"), QString(), @@ -251,7 +251,7 @@ void CmdSpreadsheetExport::activated(int iMsg) if (sheetView) { Sheet* sheet = sheetView->getSheet(); QString selectedFilter; - QString formatList = QObject::tr("All (*)"); + QString formatList = QObject::tr("CSV (*.csv *.CSV);;All (*)"); QString fileName = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export file"), QString(), diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_be.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_be.ts index d7e43b34e5..f12a869dff 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_be.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_be.ts @@ -896,7 +896,7 @@ Do you want to continue? Error: - Error: + Памылка: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_de.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_de.ts index 5fbe638bfd..ceef6e91bb 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_de.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_de.ts @@ -898,7 +898,7 @@ Möchten Sie fortfahren? Error: - Error: + Fehler: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_el.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_el.ts index 64e369af2f..8edde963f9 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_el.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_el.ts @@ -533,8 +533,7 @@ by that property. Type in an expression to specify the object and property name to dynamically switch the design configuration. The property will be created if not exist. - Type in an expression to specify the object and property name to dynamically -switch the design configuration. The property will be created if not exist. + Πληκτρολογήστε μια έκφραση για να καθορίσετε το όνομα του αντικειμένου και της ιδιότητας για να αλλάξετε δυναμικά τη διαμόρφωση σχεδιασμού. Η ιδιότητα θα δημιουργηθεί αν δεν υπάρχει. @@ -890,7 +889,7 @@ Do you want to continue? Error: - Error: + Σφάλμα: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_es-AR.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_es-AR.ts index 96f6de54f3..9123c40971 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_es-AR.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_es-AR.ts @@ -903,7 +903,7 @@ Do you want to continue? Error: - Error: + Error: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_es-ES.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_es-ES.ts index c96d365dde..14d0afcf07 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_es-ES.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_es-ES.ts @@ -901,7 +901,7 @@ Do you want to continue? Error: - Error: + Error: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_eu.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_eu.ts index bbf43f8850..2b25225b42 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_eu.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_eu.ts @@ -901,7 +901,7 @@ Jarraitu? Error: - Error: + Errorea: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_fr.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_fr.ts index b9dab2cd12..cfadd6e733 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_fr.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_fr.ts @@ -898,7 +898,7 @@ Voulez-vous continuer ? Error: - Error: + Erreur : diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_ka.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_ka.ts index 21619aa298..53a41cfbd8 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_ka.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_ka.ts @@ -892,7 +892,7 @@ Do you want to continue? Error: - Error: + შეცდომა: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_nl.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_nl.ts index 3abbf269a5..daf3df7c34 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_nl.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_nl.ts @@ -890,7 +890,7 @@ Wilt u doorgaan? Error: - Error: + Fout: @@ -1010,7 +1010,7 @@ waarbij: Insert %n non-contiguous rows - Voeg %n afzonderlijke kolommen in + Voeg %n afzonderlijke rijen in Insert %n non-contiguous rows diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_pl.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_pl.ts index 90c1360922..f8f9540f72 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_pl.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_pl.ts @@ -900,7 +900,7 @@ Czy chcesz kontynuować? Error: - Error: + Błąd: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_ru.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_ru.ts index 05c70e8a9d..1044cfa387 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_ru.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_ru.ts @@ -898,7 +898,7 @@ Do you want to continue? Error: - Error: + Ошибка: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_sr-CS.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_sr-CS.ts index f0061fa1ac..a886ba143a 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_sr-CS.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_sr-CS.ts @@ -901,7 +901,7 @@ Da li želiš da nastaviš? Error: - Error: + Greška: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_sr.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_sr.ts index fe9d517976..ca35a9beb4 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_sr.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_sr.ts @@ -901,7 +901,7 @@ Do you want to continue? Error: - Error: + Грешка: diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_uk.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_uk.ts index 387df89243..70f8bac82c 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_uk.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_uk.ts @@ -900,7 +900,7 @@ Do you want to continue? Error: - Error: + Помилка: diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage.ts b/src/Mod/Start/Gui/Resources/translations/StartPage.ts index 723ad06be7..1569570f56 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage.ts @@ -329,7 +329,7 @@ - + Show additional folder @@ -344,7 +344,7 @@ - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here @@ -395,138 +395,138 @@ By using ";;" to separate paths, you can add several folders here - + Fonts and colors - + The background of the main start page area - + Background color - + in FreeCAD - + In external browser - + Background color down gradient - + The color of the version text - + Link color - + An optional image to display as background - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below - + Page background color - + The color of the text on the main pages - + Background image - + Page text color - + The color of the links - + The background color of the boxes inside the pages - + Box background color - + The background color behind the panels - + The down gradient for the background color (currently unsupported) - + Open links - + Background text color - + Use FreeCAD style sheet - + Font family - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts - + Arial,Helvetica,sans - + The base font size to use for all texts of the Start page - + px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_be.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_be.ts index 2b287ed8ee..445752bcec 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_be.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_be.ts @@ -335,7 +335,7 @@ Паказаць змест каталогу з прыкладамі - + Show additional folder Паказаць дадатковы каталог @@ -350,7 +350,7 @@ Калі птушка, апошнія паведамленні з форума FreeCAD будуць адлюстраваныя на ўкладцы Актыўнасць - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Неабавязковы карыстальніцкі каталог, які будзе адлюстраваны ў ніжняй частцы першай старонкі. @@ -402,138 +402,138 @@ By using ";;" to separate paths, you can add several folders here Паказаць файлы мініяцюры - + Fonts and colors Шрыфты і колеры - + The background of the main start page area Фон вобласці галоўнай пачатковай старонцы - + Background color Колер фону - + in FreeCAD у FreeCAD - + In external browser У вонкавым аглядальніку - + Background color down gradient Колер ніжняга градыента фону - + The color of the version text Колер тэксту версіі - + Link color Колер спасылкі - + An optional image to display as background Неабавязковая выява для адлюстравання ў якасці фону - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Калі птушка, і ў агульных перавагах паказана табліца стыляў, яна будзе ўжыта і колеры будуць пераназначаныя, названыя ніжэй - + Page background color Колер фону старонкі - + The color of the text on the main pages Колер тэксту на галоўных старонках - + Background image Фонавая выява - + Page text color Колер тэксту на старонцы - + The color of the links Колер спасылак - + The background color of the boxes inside the pages Колер фону палёў унутры старонак - + Box background color Колер фону поля - + The background color behind the panels Колер фону ззаду панэляў - + The down gradient for the background color (currently unsupported) Ніжні градыент колеру фону (у бягучым часе не падтрымліваецца) - + Open links Адчыніць спасылкі - + Background text color Колер фону тэксту - + Use FreeCAD style sheet Ужываць табліцу стыляў FreeCAD - + Font family Сямейства шрыфтоў - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Сямейства шрыфтоў, якія ўжываюцца на пачатковай старонцы. Можа быць іменем шрыфту, альбо серыяй рэзервовых шрыфтоў, якія падзеленыя коскамі - + Arial,Helvetica,sans Arial, Helvetica, Sans - + The base font size to use for all texts of the Start page Асноўны памер шрыфту, які будзе ўжыты для ўсіх тэкстаў пачатковай старонкі - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ca.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_ca.ts index ea35d81f31..7b00919a56 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_ca.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_ca.ts @@ -329,7 +329,7 @@ Mostra el contingut de la carpeta d'exemples - + Show additional folder Mostra la carpeta addicional @@ -344,7 +344,7 @@ Si està marcat, es mostraran les últimes entrades del fòrum FreeCAD en la pestanya Activitat - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here An optional custom folder to be displayed at the bottom of the first page. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Tipus de lletra i colors - + The background of the main start page area El fons de l'àrea principal de la pàgina pàgina d'inici - + Background color Color de fons - + in FreeCAD al FreeCAD - + In external browser A un navegador extern - + Background color down gradient Background color down gradient - + The color of the version text El color del text de la versió - + Link color Color de l’enllaç - + An optional image to display as background Una imatge opcional per a mostrar com a fons - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below - + Page background color Color de fons de la pàgina - + The color of the text on the main pages El color del text a les pàgines principals - + Background image Imatge de fons - + Page text color Color del text de la pàgina - + The color of the links El color dels enllaços - + The background color of the boxes inside the pages El color de fons dels quadres a les pàgines - + Box background color Color de fons dels quadres - + The background color behind the panels El color de fons darrere dels panells - + The down gradient for the background color (currently unsupported) El degradat del color del fons (actualment incompatible) - + Open links Enllaços oberts - + Background text color Color de fons del text - + Use FreeCAD style sheet Utilitza el full d'estil de FreeCAD - + Font family Tipus de Font - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts La família de tipus de lletra de la pàgina d'inici. Pot ser el nom d'un tipus de lletra o una sèrie de tipus de lletra alternatives separades per comes - + Arial,Helvetica,sans Arial,Helvetica,Sans - + The base font size to use for all texts of the Start page La mida del tipus de lletra base per a tots els textos de la pàgina d'inici - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_cs.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_cs.ts index 92caa7fed2..0f2588c343 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_cs.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_cs.ts @@ -329,7 +329,7 @@ Zobrazit obsah složky s příklady - + Show additional folder Zobrazit další složku @@ -344,7 +344,7 @@ Je-li zaškrtnuto, poslední příspěvky z FreeCAD fóra se zobrazí v záložce Aktivita - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Volitelná vlastní složka, která se zobrazí v dolní části první stránky. @@ -396,138 +396,138 @@ Pomocí ";;" pro oddělení cest, zde můžete přidat více složekZobrazit náhledy souborů - + Fonts and colors Písma a barvy - + The background of the main start page area Pozadí plochy hlavní úvodní stránky - + Background color Barva pozadí - + in FreeCAD ve FreeCADu - + In external browser V externím prohlížeči - + Background color down gradient Spodní gradient barvy pozadí - + The color of the version text Barva textu verze - + Link color Barva odkazu - + An optional image to display as background Volitelný obrázek pro zobrazení na pozadí - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Je-li zaškrtnuto a styl FreeCADu je specifikovaný v Obecném nastavení, pak bude použit namísto barev níže - + Page background color Barva pozadí stránky - + The color of the text on the main pages Barva textu na hlavních stránkách - + Background image Obrázek na pozadí - + Page text color Barva textu na stránce - + The color of the links Barva odkazů - + The background color of the boxes inside the pages Barva pozadí sekcí na stránce - + Box background color Barva pozadí sekce - + The background color behind the panels Barva pozadí za panely - + The down gradient for the background color (currently unsupported) Spodní gradient pro barvu pozadí (momentálně není podporováno) - + Open links Otevřít odkazy - + Background text color Barva textu na pozadí - + Use FreeCAD style sheet Použít styl FreeCADu - + Font family Rodina fontů - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Rodina písma použitá na úvodní stránce. To může být název písma nebo čárkami oddělená řada náhradních písem - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Základní velikost písma pro všechen text na Úvodní stránce - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_de.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_de.ts index 386cd65f90..32aa109002 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_de.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_de.ts @@ -330,7 +330,7 @@ Wie Sie FreeCAD selbst kompilieren können, der FreeCAD-Quellcode strukturiert i Inhalt des Beispiel-Ordners "examples" anzeigen - + Show additional folder Zusätzlichen Ordner anzeigen @@ -345,7 +345,7 @@ Wie Sie FreeCAD selbst kompilieren können, der FreeCAD-Quellcode strukturiert i Wenn diese Option aktiviert ist, erscheinen die neuesten Beiträge aus dem FreeCAD-Forum auf der Registerkarte "Aktivitäten" - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Ein optionaler benutzerdefinierter Ordner, der unten auf der ersten Seite angezeigt wird. @@ -397,138 +397,138 @@ Wird ";;" verwendet, um Pfade zu trennen, können hier mehrere Ordner hinzugefü Datei-Vorschaubilder anzeigen - + Fonts and colors Schriftarten und Farben - + The background of the main start page area Hintergrund des Startseiten-Hauptbereichs - + Background color Hintergrundfarbe - + in FreeCAD in FreeCAD - + In external browser In externem Browser öffnen - + Background color down gradient Hintergrundfarbverlauf unten - + The color of the version text Die Farbe des Versionstextes - + Link color Link-Farbe - + An optional image to display as background Ein optionales Hintergrundbild - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Wenn diese Option aktiviert und in den allgemeinen Einstellungen ein Stylesheet angegeben ist, werden die Farben durch die hier angegebenen überschrieben - + Page background color Hintergrundfarbe der Seite - + The color of the text on the main pages Die Textfarbe auf den Hauptseiten - + Background image Hintergrundbild - + Page text color Textfarbe auf Seiten - + The color of the links Die Farbe der Links - + The background color of the boxes inside the pages Die Hintergrundfarbe der Kästen auf den Seiten - + Box background color Hintergrundfarbe der Kästen - + The background color behind the panels Die Hintergrundfarbe hinter den Paneelen - + The down gradient for the background color (currently unsupported) Der Farbverlauf (abwärts) der Hintergrundfarbe (zur Zeit nicht unterstützt) - + Open links Links öffnen - + Background text color Hintergrundfarbe des Textes - + Use FreeCAD style sheet FreeCAD-Stylesheet verwenden - + Font family Schriftart - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Die auf der Startseite verwendete Schriftfamilie. Kann eine Schriftart oder eine durch Kommata getrennte Liste von Ausweichschriftarten sein - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page Die Basis-Schriftgröße für Text auf der Startseite - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_el.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_el.ts index 970e1218e3..bfbe2669b6 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_el.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_el.ts @@ -11,7 +11,7 @@ Welcome to FreeCAD - Welcome to FreeCAD + Καλώς ήλθατε στο FreeCAD @@ -36,32 +36,32 @@ Link to the FreeCAD blog - Link to the FreeCAD blog + Σύνδεσμος στο blog του FreeCAD New file - New file + Νέο αρχείο Empty File - Empty File + Κενό Αρχείο Create an empty FreeCAD file - Create an empty FreeCAD file + Δημιουργήστε ένα κενό αρχείο FreeCAD Open File - Open File + Άνοιγμα Αρχείου Open an existing CAD file or 3D model - Open an existing CAD file or 3D model + Άνοιγμα ενός υπάρχοντος αρχείου CAD ή 3D μοντέλου @@ -86,7 +86,7 @@ BIM/Architecture - BIM/Architecture + BIM/Αρχιτεκτονική @@ -329,7 +329,7 @@ Εμφάνιση περιεχομένων φακέλων με παραδείγματα - + Show additional folder Εμφάνιση πρόσθετου φακέλου @@ -344,7 +344,7 @@ Εάν αυτό είναι επιλεγμένο, οι τελευταίες δημοσιεύσεις από το φόρουμ του FreeCAD θα εμφανιστούν στην καρτέλα Δραστηριότητα - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Ένας προσαρμοσμένος φάκελος θα εμφανίζεται στο κάτω μέρος της πρώτης σελίδας. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Γραμματοσειρές και χρώματα - + The background of the main start page area Το φόντο της περιοχής της Αρχικής Σελίδας - + Background color Χρώμα υποβάθρου - + in FreeCAD στο FreeCAD - + In external browser Σε εξωτερικό πρόγραμμα περιήγησης - + Background color down gradient Χρώμα φόντου προς τα κάτω - + The color of the version text Το χρώμα κειμένου έκδοσης - + Link color Χρώμα συνδέσμου - + An optional image to display as background Προαιρετική εικόνα για προβολή ως φόντο - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Εάν αυτό είναι επιλεγμένο στις Γενικές προτιμήσεις, θα χρησιμοποιηθεί και θα αντικαταστήσει τα παρακάτω χρώματα - + Page background color Χρώμα Φόντου Σελίδας - + The color of the text on the main pages Το χρώμα του κειμένου στις κύριες σελίδες - + Background image Εικόνα φόντου - + Page text color Χρώμα κειμένου σελίδας - + The color of the links Το χρώμα των συνδέσμων - + The background color of the boxes inside the pages Το χρώμα φόντου των πλαισίων μέσα στις σελίδες - + Box background color Χρώμα φόντου πλαισίου - + The background color behind the panels Το χρώμα φόντου πίσω από τους πίνακες - + The down gradient for the background color (currently unsupported) Η κάτω βαθμίδα για το χρώμα φόντου (αυτή τη στιγμή δεν υποστηρίζεται) - + Open links Άνοιγμα συνδέσμων - + Background text color Χρώμα κειμένου φόντου - + Use FreeCAD style sheet Χρήση φύλλου στυλ FreeCAD - + Font family Οικογένεια γραμματοσειράς - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Η γραμματοσειρά που θα χρησιμοποιηθεί στην αρχική σελίδα. Μπορεί να είναι ένα όνομα γραμματοσειράς ή μια σειρά γραμματοσειρών με εφεδρικές γραμματοσειρές - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page Το μέγεθος γραμματοσειράς που θα χρησιμοποιηθεί για όλα τα κείμενα της σελίδας Έναρξη - + px px @@ -567,12 +567,12 @@ By using ";;" to separate paths, you can add several folders here Advanced - Advanced + Για προχωρημένους Custom HTML Template - Custom HTML Template + Προσαρμοσμένο Πρότυπο HTML @@ -582,7 +582,7 @@ By using ";;" to separate paths, you can add several folders here Custom CSS - Custom CSS + Προσαρμογή CSS diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_es-AR.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_es-AR.ts index 915b9b2a93..8ab4a60b62 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_es-AR.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_es-AR.ts @@ -81,7 +81,7 @@ Create a 2D draft with the Draft workbench - Create a 2D draft with the Draft workbench + Crear un borrador 2D con el entorno de trabajo Draft @@ -329,7 +329,7 @@ Mostrar el contenido de la carpeta de ejemplos - + Show additional folder Mostrar carpeta de usuario @@ -344,7 +344,7 @@ Si esta opción esta seleccionada, las últimas publicaciones del foro de FreeCAD se mostrarán en la pestaña de Actividad - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Una carpeta personalizada opcional que se mostrará en la parte inferior de la primera página. @@ -373,12 +373,12 @@ Al usar ";;" para separar las rutas, puede añadir varias carpetas aquí Workbench to switch to after loading a file from the Start page, only used if Start is the start up workbench - Workbench to switch to after loading a file from the Start page, only used if Start is the start up workbench + Entorno de trabajo al que cambiar después de cargar un archivo desde la página de inicio, sólo se utiliza si Inicio es el entorno de trabajo de inicio The size of file thumbnail icons in recent files and examples sections - The size of file thumbnail icons in recent files and examples sections + El tamaño de los iconos de miniatura de los archivos recientes y secciones de ejemplos @@ -393,141 +393,141 @@ Al usar ";;" para separar las rutas, puede añadir varias carpetas aquí Show file thumbnails - Show file thumbnails + Mostrar miniaturas del archivo - + Fonts and colors Fuentes y colores - + The background of the main start page area El fondo del área principal de la página de inicio - + Background color Color de fondo - + in FreeCAD en FreeCAD - + In external browser En navegador externo - + Background color down gradient Color de fondo en degradé - + The color of the version text El color del texto de la versión - + Link color Color de enlace - + An optional image to display as background Una imagen opcional para mostrar como fondo - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Si se selecciona, y se especifica una hoja de estilo en las preferencias generales, se utilizará y anulará los colores a continuación - + Page background color Color de fondo de página - + The color of the text on the main pages El color del texto en las páginas principales - + Background image Imagen de fondo - + Page text color Color del texto de la página - + The color of the links El color de los enlaces - + The background color of the boxes inside the pages El color de fondo de las cajas dentro de las páginas - + Box background color Color de fondo de la caja - + The background color behind the panels El color de fondo detrás de los paneles - + The down gradient for the background color (currently unsupported) El degradado para el color de fondo (actualmente no soportado) - + Open links Enlaces abiertos - + Background text color Color de fondo del texto - + Use FreeCAD style sheet Usar una hoja de estilo personalizada - + Font family Tipo de fuente - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts La familia de fuentes para usar en la página de inicio. Puede ser un nombre de fuente o una serie de fuentes alternativas separadas por comas - + Arial,Helvetica,sans Arial, Courier New, Tahoma, Osifont - + The base font size to use for all texts of the Start page El tamaño de fuente base para ser utilizado en todos los textos de la Página de inicio - + px px @@ -577,7 +577,7 @@ Al usar ";;" para separar las rutas, puede añadir varias carpetas aquí An optional HTML template that will be used instead of the default start page. - An optional HTML template that will be used instead of the default start page. + Una plantilla HTML opcional que será utilizada en lugar de la página de inicio predeterminada. @@ -587,7 +587,7 @@ Al usar ";;" para separar las rutas, puede añadir varias carpetas aquí <html><head/><body><p>You can paste your custom CSS here and the Start Page will apply it for you. To learn more about how you can style the Start Page, take a look at the HTML and CSS sources:</p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html</span></a></p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css</span></a></p></body></html> - <html><head/><body><p>You can paste your custom CSS here and the Start Page will apply it for you. To learn more about how you can style the Start Page, take a look at the HTML and CSS sources:</p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html</span></a></p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css</span></a></p></body></html> + <html><head/><body><p>Puedes pegar tu CSS personalizado aquí y la Página de Inicio lo aplicará para ti. Para aprender más sobre cómo puedes diseñar la página de inicio, echa un vistazo a las fuentes HTML y CSS:</p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html"><span style=" text-decoration: underline; color:#1d99f3;">https://github. om/FreeCAD/FreeCAD/blob/master/src/Mod/StartPage/StartPage.html</span></a></p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/StartPage/StartPage/StartPage.css</span></a></p></body></html> diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_es-ES.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_es-ES.ts index babcc87499..33bd7df418 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_es-ES.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_es-ES.ts @@ -81,7 +81,7 @@ Create a 2D draft with the Draft workbench - Create a 2D draft with the Draft workbench + Crear un borrador 2D con el entorno de trabajo Draft @@ -96,7 +96,7 @@ Recent files - Recent files + Archivos recientes @@ -329,7 +329,7 @@ Mostrar el contenido de la carpeta de ejemplos - + Show additional folder Mostrar carpeta de usuario @@ -344,7 +344,7 @@ Si esta opción esta seleccionada, las últimas publicaciones del foro de FreeCAD se mostrarán en la pestaña de Actividad - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Una carpeta personalizada opcional que se mostrará en la parte inferior de la primera página. @@ -373,12 +373,12 @@ Mediante el uso de ";;" para separar rutas, puede agregar varias carpetas aquí< Workbench to switch to after loading a file from the Start page, only used if Start is the start up workbench - Workbench to switch to after loading a file from the Start page, only used if Start is the start up workbench + Entorno de trabajo al que cambiar después de cargar un archivo desde la página de inicio, sólo se utiliza si Inicio es el entorno de trabajo de inicio The size of file thumbnail icons in recent files and examples sections - The size of file thumbnail icons in recent files and examples sections + El tamaño de los iconos de miniatura de los archivos recientes y secciones de ejemplos @@ -393,141 +393,141 @@ Mediante el uso de ";;" para separar rutas, puede agregar varias carpetas aquí< Show file thumbnails - Show file thumbnails + Mostrar miniaturas del archivo - + Fonts and colors Fuentes y colores - + The background of the main start page area El fondo del área principal de la página de inicio - + Background color Color de fondo - + in FreeCAD en FreeCAD - + In external browser En navegador externo - + Background color down gradient Color del gradiente de fondo - + The color of the version text El color del texto de la versión - + Link color Color del enlace - + An optional image to display as background Una imagen opcional para que aparezca como fondo - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Si se selecciona, y se especifica una hoja de estilo en las preferencias generales, se utilizará y anulará los colores a continuación - + Page background color Color de fondo de página - + The color of the text on the main pages El color del texto en las páginas principales - + Background image Imagen de fondo - + Page text color Color del texto de la página - + The color of the links El color de los enlaces - + The background color of the boxes inside the pages El color de fondo de las cajas dentro de las páginas - + Box background color Color de fondo de la caja - + The background color behind the panels El color de fondo detrás de los paneles - + The down gradient for the background color (currently unsupported) El degradado para el color de fondo (actualmente no soportado) - + Open links Enlaces abiertos - + Background text color Color de fondo del texto - + Use FreeCAD style sheet Utilice la hoja de estilo FreeCAD - + Font family Tipo de fuente - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts La familia de fuentes para usar en la página de inicio. Puede ser un nombre de fuente o una serie de fuentes alternativas separadas por comas - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page El tamaño de fuente base para ser utilizado en todos los textos de la Página de inicio - + px px @@ -577,7 +577,7 @@ Mediante el uso de ";;" para separar rutas, puede agregar varias carpetas aquí< An optional HTML template that will be used instead of the default start page. - An optional HTML template that will be used instead of the default start page. + Una plantilla HTML opcional que será utilizada en lugar de la página de inicio predeterminada. @@ -587,7 +587,7 @@ Mediante el uso de ";;" para separar rutas, puede agregar varias carpetas aquí< <html><head/><body><p>You can paste your custom CSS here and the Start Page will apply it for you. To learn more about how you can style the Start Page, take a look at the HTML and CSS sources:</p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html</span></a></p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css</span></a></p></body></html> - <html><head/><body><p>You can paste your custom CSS here and the Start Page will apply it for you. To learn more about how you can style the Start Page, take a look at the HTML and CSS sources:</p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html</span></a></p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css</span></a></p></body></html> + <html><head/><body><p>Puedes pegar tu CSS personalizado aquí y la Página de Inicio lo aplicará para ti. Para aprender más sobre cómo puedes diseñar la página de inicio, echa un vistazo a las fuentes HTML y CSS:</p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.html"><span style=" text-decoration: underline; color:#1d99f3;">https://github. om/FreeCAD/FreeCAD/blob/master/src/Mod/StartPage/StartPage.html</span></a></p><p><a href="https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/Start/StartPage/StartPage.css"><span style=" text-decoration: underline; color:#1d99f3;">https://github.com/FreeCAD/FreeCAD/blob/master/src/Mod/StartPage/StartPage/StartPage.css</span></a></p></body></html> diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_eu.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_eu.ts index d7a053395f..a7cbf45fa7 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_eu.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_eu.ts @@ -329,7 +329,7 @@ Erakutsi adibideen karpetako edukiak - + Show additional folder Erakutsi karpeta gehigarria @@ -344,7 +344,7 @@ Hau markatuta badago, FreeCAD foroko azken bidalketak bistaratuko dira 'Jarduera' fitxan - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Lehen orriaren beheko aldean bistaratuko den karpeta pertsonalizatua, aukerakoa. @@ -396,138 +396,138 @@ Bide-izenak bereizteko ";;" erabiliz, karpeta bat baino gehiago gehitu daiteke h Erakutsi fitxategi-miniaturak - + Fonts and colors Letra-tipoak eta koloreak - + The background of the main start page area Hasierako orriaren area nagusiaren atzeko planoa - + Background color Atzeko planoaren kolorea - + in FreeCAD FreeCADen - + In external browser Kanpoko nabigatzailean - + Background color down gradient Atzeko planoko kolorearen beherako gradientea - + The color of the version text Bertsio-testuaren kolorea - + Link color Estekatu kolorea - + An optional image to display as background Atzeko planoan erakutsiko den aukerako irudi bat - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Hau markatuta badago eta estilo-orri bat adierazi bada hobespen orokorretan, hura erabiliko da eta hemengo koloreak gainidatziko dira - + Page background color Orriaren atzeko planoaren kolorea - + The color of the text on the main pages Orri nagusien testuaren kolorea - + Background image Atzeko planoko irudia - + Page text color Orriko testuaren kolorea - + The color of the links Esteken kolorea - + The background color of the boxes inside the pages Orri barruko kutxen atzeko planoaren kolorea - + Box background color Kutxen atzeko planoaren kolorea - + The background color behind the panels Panelen atzeko planoaren kolorea - + The down gradient for the background color (currently unsupported) Atzeko planoaren kolorearen beheranzko gradientea (momentuz ez da onartzen) - + Open links Ireki estekak - + Background text color Atzeko planoko testuaren kolorea - + Use FreeCAD style sheet Erabili FreeCADen estilo-orria - + Font family Letra-tipoa - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Hasierako orrian erabiliko den letra-tipoa. Letra-tipo baten izena izan daiteke, edo komaz banandutako ordezko letra-tipoen izenak - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Hasierako orriko testu guztiek erabiliko duten oinarrizko letra-tamaina - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_fi.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_fi.ts index 6be6978c4a..e338a374c7 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_fi.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_fi.ts @@ -329,7 +329,7 @@ Näytä esimerkkien kansion sisältö - + Show additional folder Näytä ylimääräinen kansio @@ -344,7 +344,7 @@ Jos tämä on valittuna, viimeisimmät viestit FreeCAD-keskustelupalstalta näytetään aktiivisuusvälilehdessä - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here An optional custom folder to be displayed at the bottom of the first page. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Fontit ja värit - + The background of the main start page area Aloituspääsivun tausta - + Background color Taustaväri - + in FreeCAD FreeCAD:issa - + In external browser Ulkoisessa selaimessa - + Background color down gradient Background color down gradient - + The color of the version text Versiotekstin väri - + Link color Linkkien väri - + An optional image to display as background Valinnainen kuva näytetään taustakuvana - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below - + Page background color Sivun taustaväri - + The color of the text on the main pages Pääsivuilla olevan tekstin väri - + Background image Taustakuva - + Page text color Sivun tekstin väri - + The color of the links Linkkien väri - + The background color of the boxes inside the pages Sivujen sisällä olevien laatikoiden taustaväri - + Box background color Laatikon taustaväri - + The background color behind the panels Paneelien takana oleva taustaväri - + The down gradient for the background color (currently unsupported) Värisävyn alennus taustavärille (ei tällä hetkellä tuettu) - + Open links Avaa linkit - + Background text color Taustan tekstin väri - + Use FreeCAD style sheet Käytä FreeCAD-tyylisivua - + Font family Fonttiperhe - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Aloitussivulla käytettävä fonttiperhe. Se voi olla fontin nimi tai pilkulla erotettu sarja varafontteja - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Perusfontin koko, jota käytetään kaikkiin aloitussivun teksteihin - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_fr.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_fr.ts index 6afe6d5856..4a69a83845 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_fr.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_fr.ts @@ -329,7 +329,7 @@ Afficher le contenu du dossier d'exemples - + Show additional folder Afficher un dossier supplémentaire @@ -344,7 +344,7 @@ Si cette case est cochée, les derniers messages du forum FreeCAD s'afficheront dans l’onglet Activité - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Un dossier personnalisé optionnel à afficher en bas de la première page. @@ -396,138 +396,138 @@ En utilisant ";;" pour séparer les chemins, vous pouvez ajouter plusieurs dossi Afficher les miniatures de fichiers - + Fonts and colors Polices et couleurs - + The background of the main start page area L’arrière-plan de la zone principale de la page de démarrage - + Background color Couleur d'arrière-plan - + in FreeCAD dans FreeCAD - + In external browser Dans un navigateur externe - + Background color down gradient Couleur de fond en dégradé - + The color of the version text La couleur du texte de version - + Link color Couleur des liens - + An optional image to display as background Une image facultative à afficher comme arrière-plan - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Si cette case est cochée, et si une feuille de style est spécifiée dans les préférences générales, celle-ci sera utilisée et remplacera les couleurs ci-dessous - + Page background color Couleur d'arrière-plan de la page - + The color of the text on the main pages La couleur du texte sur les pages principales - + Background image Image d'arrière-plan - + Page text color Couleur du texte - + The color of the links La couleur des liens - + The background color of the boxes inside the pages La couleur d'arrière-plan des encadrés dans les pages - + Box background color Couleur d'arrière-plan des encadrés - + The background color behind the panels La couleur d’arrière-plan derrière les onglets - + The down gradient for the background color (currently unsupported) Le dégradé pour la couleur d’arrière-plan (actuellement non pris en charge) - + Open links Ouvrir les liens - + Background text color Couleur d'arrière-plan du texte - + Use FreeCAD style sheet Utiliser une feuille de style FreeCAD - + Font family Famille de polices - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts La famille de polices à utiliser sur la page de démarrage. Peut être un nom de police ou une série de polices alternatives séparée par des virgules - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page La taille de police de base à utiliser pour tous les textes de la page de démarrage - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_gl.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_gl.ts index 9c3dee7b26..0a76396a8c 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_gl.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_gl.ts @@ -329,7 +329,7 @@ Amosa exemplos contidos en carpetas - + Show additional folder Amosar cartafol adicional @@ -344,7 +344,7 @@ Se isto está activado, os últimos post dende o foro de FreeCAD amosaranse na lapela de actividade - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here An optional custom folder to be displayed at the bottom of the first page. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Fontes e cores - + The background of the main start page area Fondo da zona de traballo principal da páxina de inicio - + Background color Cor de fondo - + in FreeCAD en FreeCAD - + In external browser En navegador externo - + Background color down gradient Background color down gradient - + The color of the version text A cor do texto da versión - + Link color Cor da ligazón - + An optional image to display as background Imaxe opcional amosada de fondo - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below - + Page background color Cor de fondo da páxina - + The color of the text on the main pages Cor do texto nas páxinas principais - + Background image Imaxe do fondo - + Page text color Cor do texto da páxina - + The color of the links A cor das ligazóns - + The background color of the boxes inside the pages Cor de fondo das caixas dentro das páxinas - + Box background color Cor do fondo da caixa - + The background color behind the panels Cor de fondo detrás dos paneis - + The down gradient for the background color (currently unsupported) Cor debaixo do gradiente para o fondo (agora non soportado) - + Open links Abrir ligazóns - + Background text color Cor do texto de fondo - + Use FreeCAD style sheet Usar follas de estilo de FreeCAD - + Font family Familia de fontes - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts A familia de fontes usadas na páxina de inicio. Pode ser nomes das fontes ou unha serie de fontes separadas por comas - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page Tamaño da fonte base usado para tódolos textos da páxina de inicio - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_hr.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_hr.ts index 71ba76b4ab..69873016d9 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_hr.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_hr.ts @@ -329,7 +329,7 @@ Prikaži sadržaj mape primjera - + Show additional folder Pokaži dodatne mape @@ -344,7 +344,7 @@ Ako je to označeno, najnoviji postovi iz foruma FreeCAD prikazat će se na kartici aktivnosti - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Izborna prilagođena mapa koja će se prikazati na dnu prve stranice. @@ -396,138 +396,138 @@ Koristite ";;" da biste odvojili putove, ovdje možete dodati nekoliko mapaShow file thumbnails - + Fonts and colors Pisma i boje - + The background of the main start page area Pozadina od područja glavne početne stranice - + Background color Boja pozadine - + in FreeCAD u FreeCAD - + In external browser U vanjskom pregledniku - + Background color down gradient Boja pozadine Nijansa boje dolje - + The color of the version text Boja teksta verzije - + Link color Boja poveznice - + An optional image to display as background Opcionalna slika koja se prikazuje kao pozadina - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Ako je to označeno, i ako su stilski predlošci naznačeni u općim postavkama, to će se koristiti i nadjačati boju ispod - + Page background color Boja pozadine stranice - + The color of the text on the main pages Boja teksta na glavnoj stranici - + Background image Pozadinska slika - + Page text color Boja teksta stranice - + The color of the links Boja poveznica (linkova) - + The background color of the boxes inside the pages Boja okvira pozadine unutar stranice - + Box background color Boja pozadine okvira - + The background color behind the panels Boja pozadine iza panela - + The down gradient for the background color (currently unsupported) Prijelaz na dolje za boju pozadine (trenutno se ne podržava) - + Open links Otvori poveznice - + Background text color Boja teksta pozadine - + Use FreeCAD style sheet Korištenje FreeCAD liste stila - + Font family Obitelj Fontova - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Obitelj pisma (fonta) na početnoj stranici. Može biti naziv pisma ili niz pričuvni pisama odvojenih zarezom - + Arial,Helvetica,sans Arial, Helvetica, Sans - + The base font size to use for all texts of the Start page Veličina osnovnog pisma za sve tekstove na početnoj stranici - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_hu.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_hu.ts index 0dcf4f2fec..0d99eabbea 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_hu.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_hu.ts @@ -329,7 +329,7 @@ Mutassa a példák mappa tartalmát - + Show additional folder Mutassa a kiegészítő mappákat @@ -344,7 +344,7 @@ Ha bejelölt, a legutóbbi FreeCAD fórum bejegyzéseket kijelzi a Tevékenység táblázatban - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Az első oldal alján megjelenő opcionális mappa. @@ -396,138 +396,138 @@ A ";;" útvonalak külön-külön történő használatával több mappát is ho Miniatűr fájl megjelenítése - + Fonts and colors Betűtípusok és színek - + The background of the main start page area A fő kezdő oldal területének a háttere - + Background color Háttér szín - + in FreeCAD FreeCAD-ban - + In external browser Külső böngészőben - + Background color down gradient Háttérszín a színátmenet alján - + The color of the version text A verzió szövegének színe - + Link color Kapcsolat színe - + An optional image to display as background Egy lehetséges ábra a háttérképnek - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Ha bejelölt, ha az általános testreszabásokban egy stílus lapot meghatározott, ennek használatával felülírja az alul található színeket - + Page background color Oldal háttérszíne - + The color of the text on the main pages A fő oldalak szöveg színe - + Background image Háttérkép - + Page text color Oldal szöveg színe - + The color of the links A hivatkozások színe - + The background color of the boxes inside the pages Az oldalon levő téglatestek háttér színe - + Box background color Téglatest háttérszíne - + The background color behind the panels Panelek mögötti háttérszín - + The down gradient for the background color (currently unsupported) A háttérszín halványítása (jelenleg nem támogatott) - + Open links Nyitott kapcsolatok - + Background text color Háttér szöveg színe - + Use FreeCAD style sheet FreeCAD stíluslap használata - + Font family Betűkészlet - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts A kezdő oldalon használni kívánt betűcsalád. Állhat egy betűtípus nevéből vagy vesszővel elválasztott visszatérő betűtípus sorozatából - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page Alap betűméretet a kezdő oldal összes szövegének használatához - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_id.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_id.ts index 0fb93378d5..176623cab2 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_id.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_id.ts @@ -329,7 +329,7 @@ Show examples folder contents - + Show additional folder Show additional folder @@ -344,7 +344,7 @@ If this is checked, the latest posts from the FreeCAD forum will be displayed on the Activity tab - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here An optional custom folder to be displayed at the bottom of the first page. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Font dan warna - + The background of the main start page area The background of the main start page area - + Background color Warna latar belakang - + in FreeCAD in FreeCAD - + In external browser In external browser - + Background color down gradient Background color down gradient - + The color of the version text The color of the version text - + Link color Link color - + An optional image to display as background An optional image to display as background - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below - + Page background color Page background color - + The color of the text on the main pages The color of the text on the main pages - + Background image Gambar background - + Page text color Page text color - + The color of the links The color of the links - + The background color of the boxes inside the pages The background color of the boxes inside the pages - + Box background color Box background color - + The background color behind the panels The background color behind the panels - + The down gradient for the background color (currently unsupported) The down gradient for the background color (currently unsupported) - + Open links Open links - + Background text color Background text color - + Use FreeCAD style sheet Use FreeCAD style sheet - + Font family Keluarga font - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page The base font size to use for all texts of the Start page - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_it.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_it.ts index 038e9adc19..1a33c11f64 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_it.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_it.ts @@ -329,7 +329,7 @@ Mostra il contenuto della cartella degli esempi - + Show additional folder Mostra la cartella aggiuntiva @@ -344,7 +344,7 @@ Selezionando questa opzione, gli ultimi post dal forum di FreeCAD sono visualizzati nella scheda Attività - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Una cartella personalizzata opzionale da visualizzare in fondo alla prima pagina. @@ -396,138 +396,138 @@ Usando ";;" per separare i percorsi, puoi aggiungere diverse cartelle quiMostra miniature file - + Fonts and colors Font e colori - + The background of the main start page area Lo sfondo dell'area principale della pagina iniziale - + Background color Colore dello sfondo - + in FreeCAD in FreeCAD - + In external browser Nel browser esterno - + Background color down gradient Colore di sfondo a gradiente verso il basso - + The color of the version text Il colore del testo della versione - + Link color Colore del link - + An optional image to display as background Un'immagine facoltativa da visualizzare come sfondo - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Se questa opzione è selezionata e un foglio di stile è specificato nelle preferenze generali, verrà usato e sovrascriverà i colori sottostanti - + Page background color Colore di sfondo della pagina - + The color of the text on the main pages Il colore del testo nelle pagine principali - + Background image Immagine di sfondo - + Page text color Colore del testo della pagina - + The color of the links Il colore dei link - + The background color of the boxes inside the pages Il colore di sfondo dei riquadri all'interno delle pagine - + Box background color Colore di sfondo dei riquadri - + The background color behind the panels Il colore di sfondo dietro i pannelli - + The down gradient for the background color (currently unsupported) La sfumatura verso il basso del colore di sfondo (attualmente non supportato) - + Open links Apri il link - + Background text color Colore di sfondo del testo - + Use FreeCAD style sheet Usa il foglio di stile di FreeCAD - + Font family Tipo di carattere - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts La famiglia di caratteri da utilizzare nella pagina iniziale. Può essere un nome di carattere o una serie separata da virgole di caratteri di ripiego - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page La dimensione del carattere di base da utilizzare per tutti i testi della pagina iniziale - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ja.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_ja.ts index 6f40af861c..84f51975cd 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_ja.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_ja.ts @@ -329,7 +329,7 @@ サンプルフォルダの内容を表示 - + Show additional folder 追加フォルダを表示 @@ -344,7 +344,7 @@ ここにチェックを入れると、FreeCADフォーラムからの最新の投稿が現在のタブに表示されます - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here 最初のページの下部に表示される追加のカスタムフォルダ。 @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors フォント及び色 - + The background of the main start page area メインスタートページ領域の背景 - + Background color 背景色 - + in FreeCAD FreeCAD - + In external browser 外部ブラウザー - + Background color down gradient グラデーション背景色 - + The color of the version text バージョンの文字色 - + Link color リンクの色 - + An optional image to display as background 背景として表示するオプション画像 - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below チェックして一般ユーザー設定でスタイルシートを指定している場合、それを使用して以下の色を上書き - + Page background color ページ背景色 - + The color of the text on the main pages メインページの文字色 - + Background image 背景画像 - + Page text color ページ文字色 - + The color of the links リンクの色 - + The background color of the boxes inside the pages ページ内におけるボックスの背景色 - + Box background color ボックスの背景色 - + The background color behind the panels パネルの背景色 - + The down gradient for the background color (currently unsupported) 背景色用の下向きグラデーション (現在はサポートされていません) - + Open links リンクを開く - + Background text color テキスト背景色 - + Use FreeCAD style sheet FreeCAD スタイルシートを使用 - + Font family フォントの種類 - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts スタートページに用いるフォントファミリー。フォント名またはコンマで区切られた一連の代替えフォントにします - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page 開始ページのテキスト全てに使用する基本フォントサイズ - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ka.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_ka.ts index 42f79fd393..c4d573ad26 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_ka.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_ka.ts @@ -329,7 +329,7 @@ მაგალითების საქაღალდის შემცველობის ჩვენება - + Show additional folder დამატებითი საქაღალდის ჩვენება @@ -344,7 +344,7 @@ თუ ჩართლია, აქტივობის ჩანართზე FreeCAD-ის ფორუმიდან უახლესი პოსტები გამოჩნდება - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here არასავალდებულო ხელით მითითებული საქაღალდე პირველი გვერდის ქვედა ნაწილში საჩვენებლად. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here ფაილის მინიატურების ჩვენება - + Fonts and colors ფონტები და ფერები - + The background of the main start page area მთავარი საწყისი გვერდის ფონი - + Background color ფონის ფერი - + in FreeCAD freeCAD-ში - + In external browser გარე ბრაუზერში - + Background color down gradient ფონის ფენის გრადიენტი ქვემოთ - + The color of the version text ვერსიის ტექსტის ფერი - + Link color ბმულების ფერი - + An optional image to display as background არასავალდებულო სურათი ფონზე საჩვენებლად - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below თუ ეს ჩართულია და საერთო მორგების ფანჯარაში მითითებულია გვერდის სტილი, ის გამოყენებული იქნება ქვემო ფერების გადასაღებად - + Page background color გვერდის ფონის ფერი - + The color of the text on the main pages მთავარი გვერდების ტექსტის ფერი - + Background image ფონის გამოსახულება - + Page text color გვერდის ტექსტის ფერი - + The color of the links ბმულების ფერი - + The background color of the boxes inside the pages გვერდების შიგნით ყუთების ფონის ფერი - + Box background color ველის ფონის ფერი - + The background color behind the panels პანელების მიღმა ფერი - + The down gradient for the background color (currently unsupported) ქვედა გრადიენტი ფონის ფერისთვის (ჯერ მხარდაუჭერელია) - + Open links ბმულების გახსნა - + Background text color ფონის ტექსტის ფერი - + Use FreeCAD style sheet FreeCAD-ის სტილების გამოყენება - + Font family ფონტის ოჯახი - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts საწყის გვერდზე გამოსაყენებელი ფონტის ოჯახი. შეიძლება იყოს ფონტის სახელი ან მძიმით გამოყოფილი სარეზერვო ფონტის სია - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page საწყის გვერდის ყველა ტექსტის ბაზისური ფონტის ზომა - + px პქს diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ko.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_ko.ts index 3cbdde5ffa..c4cf43d9de 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_ko.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_ko.ts @@ -329,7 +329,7 @@ 예제 폴더 내용보기 - + Show additional folder 추가 폴더 표시 @@ -344,7 +344,7 @@ 이 항목을 선택하면 FreeCAD 포럼의 최신 게시물이 활동 탭에 표시됩니다. - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here 첫 페이지 하단에 표시할 선택적 사용자 지정 폴더입니다. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors 글꼴 및 색상 - + The background of the main start page area 기본 시작 페이지 영역의 배경 - + Background color 배경색 - + in FreeCAD FreeCAD에서 - + In external browser 외부 브라우저에서 - + Background color down gradient 배경색 다운 그라디언트 - + The color of the version text 버전 텍스트의 색상 - + Link color 링크 색상 - + An optional image to display as background 배경으로 표시할 선택적 이미지 - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below 이 항목이 선택되어 있고 일반 기본 설정에서 스타일 시트가 지정되어 있으면 이 스타일 시트가 사용되어 아래 색상을 무시합니다. - + Page background color 페이지 배경색 - + The color of the text on the main pages 기본 페이지의 텍스트 색상 - + Background image 배경 이미지 - + Page text color 페이지 텍스트 색상 - + The color of the links 링크 색상 - + The background color of the boxes inside the pages 페이지 내부 상자의 배경색 - + Box background color 패널 배경색 - + The background color behind the panels 패널 뒤의 배경색 - + The down gradient for the background color (currently unsupported) 배경색의 아래쪽 그라디언트 (현재 지원되지 않음) - + Open links 링크 열기 - + Background text color 배경 텍스트 색상 - + Use FreeCAD style sheet FreeCAD 스타일 시트 사용 - + Font family 글꼴 가족 - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts 시작 페이지에서 사용할 글꼴 모음. 글꼴 이름 또는 쉼표로 구분된 일련의 대체 글꼴일 수 있습니다. - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page 시작 페이지의 모든 텍스트에 사용할 기본 글꼴 크기 - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_nl.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_nl.ts index af745c138c..3457987975 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_nl.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_nl.ts @@ -329,7 +329,7 @@ Toon de inhoud van de map voorbeelden - + Show additional folder Toon een extra map @@ -344,7 +344,7 @@ Als dit aangevinkt is, worden de laatste berichten van het FreeCAD-forum weergegeven op het tabblad Activiteit - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Een optionele aangepaste map, die onderaan de eerste pagina wordt weergegeven. @@ -396,138 +396,138 @@ Door ";" te gebruiken kan je ook meerdere mappen toevoegen Toon bestand miniaturen - + Fonts and colors Lettertypen en kleuren - + The background of the main start page area De achtergrond van het hoofdgedeelte van de startpagina - + Background color Achtergrond - + in FreeCAD in FreeCAD - + In external browser In externe browser - + Background color down gradient Achtergrond kleur gradient - + The color of the version text De kleur van de versietekst - + Link color Linkkleur - + An optional image to display as background Een optionele afbeelding die als achtergrond wordt weergegeven - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Als dit aangevinkt is, en een stijlblad is gespecificeerd in de Algemene Voorkeuren, zal het stijlblad gebruikt worden in plaats van de onderstaande kleuren - + Page background color Pagina-achtergrondkleur - + The color of the text on the main pages De kleur van de tekst op de hoofdpagina's - + Background image Achtergrondafbeelding - + Page text color Paginatekstkleur - + The color of the links De kleur van de links - + The background color of the boxes inside the pages De achtergrondkleur van de kaders binnen de pagina's - + Box background color Achtergrondkleur van de kaders - + The background color behind the panels De achtergrondkleur achter de panelen - + The down gradient for the background color (currently unsupported) Het verloop naar beneden van de achtergrondkleur (momenteel niet ondersteund) - + Open links Koppelingen openen - + Background text color Achtergrondtekstkleur - + Use FreeCAD style sheet Gebruik het FreeCAD-stijlblad - + Font family Lettertypefamilie - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts De lettertypefamilie die gebruikt moet worden op de startpagina. Kan een lettertypenaam zijn of een door komma's gescheiden reeks reservelettertypen - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page De basistekstgrootte die gebruikt moet worden voor alle teksten op de startpagina - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pl.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_pl.ts index 09e68f1f4a..0325864b18 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_pl.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_pl.ts @@ -329,7 +329,7 @@ Pokaż zawartość folderu z przykładami - + Show additional folder Pokaż dodatkowy folder @@ -345,7 +345,7 @@ najnowsze posty z forum FreeCAD będą wyświetlane na karcie Aktywność - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Opcjonalny folder wyświetlany u dołu pierwszej strony. @@ -399,140 +399,140 @@ opcja używana tylko wtedy, gdy Start jest startowym środowiskiem pracyPokaż miniatury plików - + Fonts and colors Czcionki i kolory - + The background of the main start page area Tło obszaru głównej strony startowej - + Background color Kolor tła - + in FreeCAD w FreeCAD - + In external browser W przeglądarce zewnętrznej - + Background color down gradient Kolor tła u dołu gradientu - + The color of the version text Kolor tekstu dla wersji - + Link color Kolor odnośnika - + An optional image to display as background Obraz opcjonalny do wyświetlania jako tlo - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Jeśli ta opcja jest zaznaczona i arkusz stylów jest określony w Preferencjach ogólnych, zostanie on użyty i zastąpi poniższe kolory - + Page background color Kolor tła dla strony - + The color of the text on the main pages Kolor tekstu na głównych stronach - + Background image Obraz w tle - + Page text color Kolor tekstu na stronie - + The color of the links Kolor odnośników - + The background color of the boxes inside the pages Kolor tła pola zaznaczenia na stronach - + Box background color Kolor tła dla okienek - + The background color behind the panels Kolor tła pod panelami - + The down gradient for the background color (currently unsupported) Kolor gradientu tła u dołu (obecnie nieobsługiwany) - + Open links Otwórz odnośniki - + Background text color Kolor tekstu w tle - + Use FreeCAD style sheet Użyj arkusza stylów FreeCAD - + Font family Krój pisma - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Krój pisma, którego należy użyć na stronie startowej. Może to być nazwa czcionki lub seria nazw czcionek zapasowych oddzielonych przecinkami - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Rozmiar czcionki podstawowej dla wszystkich tekstów na stronie Startowej - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pt-BR.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_pt-BR.ts index 6ba3977d01..eab826fd4c 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_pt-BR.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_pt-BR.ts @@ -96,7 +96,7 @@ Recent files - Recent files + Arquivos recentes @@ -176,12 +176,12 @@ The <a href="http://forum.freecad.org">FreeCAD forum</a> is a great place to get help from other FreeCAD users and developers. The forum has many sections for different types of issues and discussion subjects. If in doubt, post in the more general <a href="https://forum.freecad.org/viewforum.php?f=3">Help on using FreeCAD</a> section. - The <a href="http://forum.freecad.org">FreeCAD forum</a> is a great place to get help from other FreeCAD users and developers. The forum has many sections for different types of issues and discussion subjects. If in doubt, post in the more general <a href="https://forum.freecad.org/viewforum.php?f=3">Help on using FreeCAD</a> section. + O <a href="http://forum.freecad.org"> fórum do FreeCAD </a> é um ótimo lugar para obter ajuda de outros usuários e desenvolvedores do FreeCAD. O fórum tem muitas seções para diferentes tipos de questões e assuntos de discussão. Em caso de dúvida, poste na seção mais geral "<a href="https://forum.freecad.org/viewforum.php?f=3">Help on using FreeCAD</a>". If it is the first time you are posting on the forum, be sure to <a href="https://forum.freecad.org/viewtopic.php?f=3&t=2264">read the guidelines</a> first! - If it is the first time you are posting on the forum, be sure to <a href="https://forum.freecad.org/viewtopic.php?f=3&t=2264">read the guidelines</a> first! + Se é a primeira vez que você está postando no fórum, certifique-se de <a href="https://forum.freecad.org/viewtopic.php?f=3&t=2264">ler as diretrizes</a> primeiro! @@ -196,7 +196,7 @@ The latest posts on the <a href="https://forum.freecad.org">FreeCAD forum</a>: - The latest posts on the <a href="https://forum.freecad.org">FreeCAD forum</a>: + As últimas postagens no <a href="https://forum.freecad.org">fórum do FreeCAD</a>: @@ -329,7 +329,7 @@ Mostrar o conteúdo da pasta de exemplos - + Show additional folder Mostrar uma pasta adicional @@ -344,7 +344,7 @@ Se esta opção for ativada, as últimas mensagens do fórum do FreeCAD serão mostradas no separador Atividade - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Uma pasta personalizada opcional a ser exibida na parte inferior da primeira página. @@ -373,7 +373,7 @@ Usando ";;" para separar caminhos, você pode adicionar várias pastas aqui Workbench to switch to after loading a file from the Start page, only used if Start is the start up workbench - Workbench to switch to after loading a file from the Start page, only used if Start is the start up workbench + Bancada de trabalho para alternar após carregar um arquivo da página inicial, usado somente se Começar é a bancada de trabalho inicial @@ -396,138 +396,138 @@ Usando ";;" para separar caminhos, você pode adicionar várias pastas aquiMostrar miniaturas de arquivos - + Fonts and colors Fontes e cores - + The background of the main start page area O fundo da área principal - + Background color Cor de fundo - + in FreeCAD no FreeCAD - + In external browser No navegador externo - + Background color down gradient Gradiente de fundo para baixo - + The color of the version text A cor do texto da versão - + Link color Cor dos links - + An optional image to display as background Uma imagem opcional a ser mostrada como plano de fundo - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Se esta opção for ativada e uma folha de estilo for especificada nas preferências gerais, ela será usada e substituirá as cores abaixo - + Page background color Cor de fundo da página - + The color of the text on the main pages A cor do texto nas páginas principais - + Background image Imagem de fundo - + Page text color Cor do texto da página - + The color of the links A cor dos links - + The background color of the boxes inside the pages A cor de fundo das caixas dentro das páginas - + Box background color Cor de fundo das caixas - + The background color behind the panels A cor de fundo atrás dos painéis - + The down gradient for the background color (currently unsupported) A cor de baixo do gradiente de fundo (atualmente não suportado) - + Open links Abrir links - + Background text color Cor dos textos de fundo - + Use FreeCAD style sheet Usar a folha de estilos do FreeCAD - + Font family Família de fonte - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts A família de fontes a ser usada na página inicial. Pode ser um nome de fonte ou uma série de fontes separada por vírgulas - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page O tamanho de base da fonte a ser usada em todos os textos da página inicial - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pt-PT.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_pt-PT.ts index 7bcdcc2451..8c56d5e71e 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_pt-PT.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_pt-PT.ts @@ -329,7 +329,7 @@ Mostrar conteúdo da pasta de exemplos - + Show additional folder Mostrar pasta adicional @@ -344,7 +344,7 @@ Se marcado, as últimas mensagens do fórum FreeCAD serão mostradas no separador Atividade - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Uma pasta personalizada opcional a ser exibida na parte inferior da primeira página. @@ -396,138 +396,138 @@ Usando ";;" para separar caminhos, podem ser adicionadas várias pastas aquiShow file thumbnails - + Fonts and colors Fontes e cores - + The background of the main start page area O fundo da página inicial principal - + Background color Cor de Fundo - + in FreeCAD no FreeCAD - + In external browser No navegador externo - + Background color down gradient Cor da base do gradiente do fundo - + The color of the version text A cor do texto da versão - + Link color Cor do link - + An optional image to display as background Uma imagem opcional a ser mostrada como plano de fundo - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Se marcado e se uma folha de estilo for especificada nas preferências gerais, esta será usada e substituirá as cores abaixo - + Page background color Cor de fundo da página - + The color of the text on the main pages A cor do texto nas páginas principais - + Background image Imagem de fundo - + Page text color Cor do texto da página - + The color of the links A cor dos links - + The background color of the boxes inside the pages A cor de fundo das caixas dentro das páginas - + Box background color Cor de fundo da caixa - + The background color behind the panels A cor de fundo atrás dos painéis - + The down gradient for the background color (currently unsupported) O gradiente para baixo para a cor de fundo (atualmente sem suporte) - + Open links Abrir ligação - + Background text color Cor do texto do fundo - + Use FreeCAD style sheet Usar Folha de estilos do FreeCAD - + Font family Família de fonte - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts A família de fontes para usar na página inicial. Pode ser um nome de fonte ou uma série de fontes separada por vírgulas - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page O tamanho da fonte base para usar de todos os textos da página inicial - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ro.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_ro.ts index 9e84e3746c..6a53dd48fa 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_ro.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_ro.ts @@ -330,7 +330,7 @@ de documentare, help pentru atelier și documentarea comenzilor individuale făr Afișați conținutul folderului cu exemple - + Show additional folder Afișați folderul suplimentar @@ -345,7 +345,7 @@ de documentare, help pentru atelier și documentarea comenzilor individuale făr În cazul în care această casetă este bifată, cele mai recente postări din FreeCAD forum vor fi afişate în fila de activitate - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Un dosar personalizat opțional care va fi afișat în partea de jos a primei pagini. @@ -397,138 +397,138 @@ Folosind ";;" pentru a separa căi, poți adăuga mai multe dosare aiciShow file thumbnails - + Fonts and colors Fonturi si culori - + The background of the main start page area Fundalul zonei principale a paginii de start - + Background color Culoarea de fundal - + in FreeCAD în FreeCAD - + In external browser În browser-ul extern - + Background color down gradient Culoare fundal gradient în jos - + The color of the version text Culoarea textului versiunii curente - + Link color Link-ul de culoare - + An optional image to display as background O imagine opţională pentru a fi afişată ca fundal - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below În cazul în care această casetă este bifată, dacă o foaie de stil este specificată în Preferinţe generale, acesta va fi folosită şi va înlocui culorile de mai jos - + Page background color Culoarea de fundal a paginii - + The color of the text on the main pages Culoarea textului pe paginile principale - + Background image Imagine de fundal - + Page text color Culoarea textului - + The color of the links Culoarea de link-uri - + The background color of the boxes inside the pages Culoarea de fundal a casetelor în interiorul paginilor - + Box background color Culoarea de fundal a casetei - + The background color behind the panels Culoarea de fundal în spatele panourilor - + The down gradient for the background color (currently unsupported) Gradient/degrade-ul în jos pentru culoarea de fundal (în prezent neacceptată) - + Open links A deschide Link-uri - + Background text color Culoarea de fundal a textului - + Use FreeCAD style sheet Utilizați o pagină cu stilul FreeCAD - + Font family Familia de fonturi - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Familia de fonturi pe care să o utilizați în pagina de start/principală. Poate fi un nume de font sau o serie de fonturi alternative separate prin virgule - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Dimensiunea fontului de bază pe care să o utilizați pentru toate textele de pe pagina de start/principală - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ru.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_ru.ts index 6591c23ae2..ce90d0db6e 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_ru.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_ru.ts @@ -329,7 +329,7 @@ Показать содержимое папки примеров - + Show additional folder Показать дополнительную папку @@ -344,7 +344,7 @@ Если этот флажок установлен, последние сообщения с форума FreeCAD будет отображаться на вкладке активности - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Дополнительная папка пользователя для отображения в нижней части первой страницы. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Показать значки файлов - + Fonts and colors Шрифты и цвета - + The background of the main start page area Фон главной стартовой страницы - + Background color Цвет фона - + in FreeCAD во FreeCAD - + In external browser Во внешнем браузере - + Background color down gradient Цвет нижнего градиента фона - + The color of the version text Цвет текста версии - + Link color Цвет ссылок - + An optional image to display as background Необязательное изображение для отображения в виде фона - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Если этот флажок установлен и в стиле указаны общие предпочтения, он будет использоваться и переопределит цвета ниже - + Page background color Цвет фона страницы - + The color of the text on the main pages Цвет текста на главных страницах - + Background image Фоновое изображение - + Page text color Цвет текста на странице - + The color of the links Цвет ссылок - + The background color of the boxes inside the pages Цвет фона поля внутри страниц - + Box background color Цвет фона поля - + The background color behind the panels Цвет фона позади панелей - + The down gradient for the background color (currently unsupported) Нижний градиент цвета фона (в настоящее время не поддерживается) - + Open links Открыть ссылки - + Background text color Фоновый цвет текста - + Use FreeCAD style sheet Использование стилей FreeCAD - + Font family Семейство шрифтов - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Семейство шрифтов, используемых на стартовой странице. Может быть имя шрифта или разделённый запятыми список запасных шрифтов - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Базовый размер шрифта для всего текста стартовой страницы - + px пикс. diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_sl.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_sl.ts index fad2e98f8a..6f1c3cd187 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_sl.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_sl.ts @@ -329,7 +329,7 @@ Prikaži vsebino mape s primeri - + Show additional folder Prikaži dodatno mapo @@ -344,7 +344,7 @@ Če je označno, bodo zadnje objave s FreeCAD foruma prikazane v zavihku dogajanja - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Mapa po meri, ki se lahko prikaže na dnu prve strani. @@ -396,138 +396,138 @@ Z ločevanjem poti z znaki ";;", lahko dodate več map Show file thumbnails - + Fonts and colors Pisave in barve - + The background of the main start page area Ozadje glavnega področja začetne strani - + Background color Barva ozadja - + in FreeCAD v FreeCAD-u - + In external browser V zunanjem brskalniku - + Background color down gradient Barvni preliv ozadja - + The color of the version text Barva besedila različice programa - + Link color Barva povezave - + An optional image to display as background Neobvezna slika za prikaz kot ozadje - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Če je to označeno in je seznam slogov določen v Splošnih prednastavitvah, bo ta uporabljen in bo povozil barve spodaj - + Page background color Barva ozadja strani - + The color of the text on the main pages Barva besedila prve strani - + Background image Slika ozadja - + Page text color Barva besedila strani - + The color of the links Barva povezav - + The background color of the boxes inside the pages Barva ozadja okvirjev znotraj strani - + Box background color Barva ozadja okvirja - + The background color behind the panels Barva ozadja za zavihki - + The down gradient for the background color (currently unsupported) Gradient navzdol za barvo ozadja (trenutno nepodprt) - + Open links Odpri povezave - + Background text color Barva ozadja besedila - + Use FreeCAD style sheet Uporabi FreeeCAD seznam slogov - + Font family Družina pisav - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Družina pisave uporabljena na začetni strani. Lahko je ime pisave ali niz z vejico ločenih nadomestnih pisav - + Arial,Helvetica,sans Arial, Helvetica, sans - + The base font size to use for all texts of the Start page Osnovna velikost črk za vsa besedila začetne strani - + px sl. točk diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_sr-CS.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_sr-CS.ts index 8ed1610910..bafc4f078e 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_sr-CS.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_sr-CS.ts @@ -329,7 +329,7 @@ Prikaži sadržaj fascikle sa primerima - + Show additional folder Prikaži dodatnu fasciklu @@ -344,7 +344,7 @@ Ako je ovo čekirano, poslednje objave sa FreeCAD foruma biće prikazane u kartici aktivnosti - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Opcija da se sopstvena fascikla prikazuje na dnu prve stranice. @@ -396,138 +396,138 @@ Ako koristiš ";;" da bi razdvojio putanje, možeš dodati nekoliko fascikliShow file thumbnails - + Fonts and colors Fontovi i boje - + The background of the main start page area Pozadina glavne oblasti početne stranice - + Background color Boja pozadine - + in FreeCAD u FreeCAD-u - + In external browser U spoljašnjem veb-pregledaču - + Background color down gradient Donja preliv boje pozadine - + The color of the version text Boja teksta informacionog teksta o verziji - + Link color Boja veze - + An optional image to display as background Neobavezna slika koja se prikazuje kao pozadina - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Ako je ovo čekirano i lista stilova je navedena u opštim podešavanjima, ona će se koristiti i zameniti boje ispod - + Page background color Boja pozadine stranice - + The color of the text on the main pages Boja teksta na glavnim stranicama - + Background image Pozadinska slika - + Page text color Boja teksta stranice - + The color of the links Boja veza - + The background color of the boxes inside the pages Boja pozadine okvira na stranicama - + Box background color Boja pozadine okvira - + The background color behind the panels Boja pozadine iza panela - + The down gradient for the background color (currently unsupported) Donji preliv boje pozadine (trenutno nije podržan) - + Open links Otvori veze - + Background text color Boja teksta pozadine - + Use FreeCAD style sheet Koristi FreeCAD listu stilova - + Font family Familija fontova - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Familija fontova koja će se koristiti na početnoj stranici. Može biti naziv fonta ili niz rezervnih fontova odvojenih zarezima - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Osnovna veličina fonta koja će se koristiti za sve tekstove početne stranice - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_sr.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_sr.ts index cbcacf3c38..9ad68c00d8 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_sr.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_sr.ts @@ -329,7 +329,7 @@ Прикажи садржај фасцикле са примерима - + Show additional folder Прикажи додатну фасциклу @@ -344,7 +344,7 @@ Ако је ово чекирано, последње објаве са FreeCAD форума биће приказане у картици активности - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Опција да се сопствена фасцикла приказује на дну прве странице. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Фонтови и боје - + The background of the main start page area Позадина главне области почетне странице - + Background color Боја позадине - + in FreeCAD у FreeCAD-у - + In external browser У спољашњем веб-прегледачу - + Background color down gradient Доња прелив боје позадине - + The color of the version text Боја текста информационог текста о верзији - + Link color Боја везе - + An optional image to display as background Необавезна слика која се приказује као позадина - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Ако је ово чекирано и листа стилова је наведена у општим подешавањима, она ће се користити и заменити боје испод - + Page background color Боја позадине странице - + The color of the text on the main pages Боја текста на главним страницама - + Background image Позадинска слика - + Page text color Боја текста странице - + The color of the links Боја веза - + The background color of the boxes inside the pages Боја позадине оквира на страницама - + Box background color Боја позадине оквира - + The background color behind the panels Боја позадине иза панела - + The down gradient for the background color (currently unsupported) Доњи прелив боје позадине (тренутно није подржан) - + Open links Отвори везе - + Background text color Боја текста позадине - + Use FreeCAD style sheet Користи FreeCAD листу стилова - + Font family Фамилија фонтова - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Фамилија фонтова која ће се користити на почетној страници. Може бити назив фонта или низ резервних фонтова одвојених зарезима - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Основна величина фонта која ће се користити за све текстове почетне странице - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_sv-SE.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_sv-SE.ts index 6a5589cd38..9100bf1182 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_sv-SE.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_sv-SE.ts @@ -329,7 +329,7 @@ Visa innehåll i exempelmapp - + Show additional folder Visa extra mapp @@ -344,7 +344,7 @@ Om detta är ikryssat kommer de senaste inläggen från FreeCADs forum att visas på aktivitetsfliken - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here An optional custom folder to be displayed at the bottom of the first page. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Teckensnitt och färger - + The background of the main start page area Bakgrund på startsidans huvuddel - + Background color Bakgrundsfärg - + in FreeCAD i FreeCAD - + In external browser I extern webbläsare - + Background color down gradient Background color down gradient - + The color of the version text Färg på versionstext - + Link color Länkfärg - + An optional image to display as background En alternativ bild att visa som bakgrund - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below - + Page background color Bakgrundsfärg för sida - + The color of the text on the main pages Textfärg på huvudsidorna - + Background image Bakgrundsbild - + Page text color Textfärg på sida - + The color of the links Färg på länkar - + The background color of the boxes inside the pages Bakgrundsfärg på lådor inuti sidor - + Box background color Bakgrundsfärg på lådor - + The background color behind the panels Bakgrundsfärg bakom paneler - + The down gradient for the background color (currently unsupported) Nedgradient för bakgrundsfärg (stöds ej än) - + Open links Öppna länkar - + Background text color Bakgrundsfärg på text - + Use FreeCAD style sheet Använd FreeCAD-formatmall - + Font family Teckensnitt - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Teckensnitt att använda på startsidan. Kan vara ett namn på ett teckensnitt eller en komma-separerad lista med reservteckensnitt - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Storlek på basteckensnitt för all text på startsidan - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_tr.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_tr.ts index 64edc57f98..8a3cfe55ed 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_tr.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_tr.ts @@ -329,7 +329,7 @@ Örnekler klasörü içeriğini göster - + Show additional folder Ek klasörü görüntüle @@ -344,7 +344,7 @@ Bu işaretliyse, FreeCAD forumundan en son gönderiler Etkinlik sekmesinde görüntülenecektir - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here İlk sayfanın altında görüntülenecek isteğe bağlı özel bir dizin. @@ -396,138 +396,138 @@ Yolları ayırmak için ";;" (çift noktalı virgül) kullanarak birden fazla di Dosya resimlerini göster - + Fonts and colors Yazı tipleri ve renkler - + The background of the main start page area Ana Başlangıç sayfa alanının arka planı - + Background color Arka plan rengi - + in FreeCAD FreeCAD’de - + In external browser Harici tarayıcıda - + Background color down gradient Arkaplan rengi aşağı geçişi - + The color of the version text Sürüm metninin rengi - + Link color Bağlantı Rengi - + An optional image to display as background İsteğe bağlı bir resmi, arka plan olarak görüntüle - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Eğer bu işaretlenirse ve Genel tercihlerde bir biçim sayfası belirtilirse, bu kullanılır ve aşağıdaki renkleri üzerine yazar - + Page background color Sayfa arka plan rengi - + The color of the text on the main pages Ana sayfalardaki metin rengi - + Background image Arka plan resmi - + Page text color Sayfa metninin rengi - + The color of the links Bağlantıların rengi - + The background color of the boxes inside the pages Sayfa içindeki kutuları arka plan rengi - + Box background color Kutu arka plan rengi - + The background color behind the panels Panellerin gerisindeki arka plan rengi - + The down gradient for the background color (currently unsupported) Arka plan renginin aşağı eğimi (şu anda desteklenmiyor) - + Open links Bağlantıları aç - + Background text color Arka plan metninin rengi - + Use FreeCAD style sheet FreeCAD stili hesap tablosu kullan - + Font family Yazı tipi - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Başlangıç sayfasında kullanılacak yazı tipi ailesi. Yazı tipi adı veya virgülle ayrılmış bir yazı tipi dizisi olabilir - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Başlangıç sayfasının tüm metinleri için kullanılacak temel font boyutu - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_uk.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_uk.ts index f0a1a8c9a5..1b1a22bd94 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_uk.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_uk.ts @@ -329,7 +329,7 @@ Показати вміст теки прикладів - + Show additional folder Показати додаткову теку @@ -344,7 +344,7 @@ Якщо позначено цей пункт, останні повідомлення з форуму FreeCAD будуть показані на вкладці Активність - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here Необовʼязкова тека користувача, яка буде зображатися внизу першої сторінки. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Шрифти і кольори - + The background of the main start page area Тло головної області стартової сторінки - + Background color Колір фону - + in FreeCAD у FreeCAD - + In external browser У зовнішньому браузері - + Background color down gradient Градієнт вниз кольору тла - + The color of the version text Колір тексту назви версії - + Link color Колір посилання - + An optional image to display as background Необовʼязкове зображення для показу як тло - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below Якщо цей прапорець встановлений і таблиця стилів вказана у загальних налаштуваннях, вона буде використана та скасує кольори, наведені нижче - + Page background color Колір тла сторінки - + The color of the text on the main pages Колір тексту на основних сторінках - + Background image Зображення тла - + Page text color Колір тексту сторінки - + The color of the links Колір посилання - + The background color of the boxes inside the pages Колір тла блоків на сторінках - + Box background color Колір тла блоків - + The background color behind the panels Колір тла позаду панелей - + The down gradient for the background color (currently unsupported) Встановлює градієнт вниз для кольору тла (нині не підтримується) - + Open links Відкрити посилання - + Background text color Колір тла тексту - + Use FreeCAD style sheet Використовувати стилі FreeCAD - + Font family Гарнітура - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts Сімейство шрифтів, яке використовується на стартовій сторінці. Може бути імʼям шрифту або переліком запасних шрифтів, розділених комами - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page Базовий розмір шрифту для всіх текстів Стартової сторінки - + px пікс. diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_val-ES.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_val-ES.ts index 7a78d3a082..07c8f83eeb 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_val-ES.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_val-ES.ts @@ -329,7 +329,7 @@ Mostra el contingut de la carpeta d'exemples - + Show additional folder Mostra una carpeta addicional @@ -344,7 +344,7 @@ Si està marcat, es mostraran les últimes entrades del fòrum FreeCAD en la pestanya Activitat - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here An optional custom folder to be displayed at the bottom of the first page. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors Tipus de lletra i colors - + The background of the main start page area El fons de l'àrea principal de la pàgina pàgina d'inici - + Background color Color de fons - + in FreeCAD en FreeCAD - + In external browser En un navegador extern - + Background color down gradient Background color down gradient - + The color of the version text El color del text de la versió - + Link color Color de l'enllaç - + An optional image to display as background Una imatge opcional per a mostrar com a fons - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below - + Page background color Color de fons de la pàgina - + The color of the text on the main pages El color del text de les pàgines principals - + Background image Imatge de fons - + Page text color Color del text de la pàgina - + The color of the links El color dels enllaços - + The background color of the boxes inside the pages El color de fons de les caixes dins de les pàgines - + Box background color Color de fons de la caixa - + The background color behind the panels El color de fons darrere dels panells - + The down gradient for the background color (currently unsupported) El degradat del color del fons (actualment incompatible) - + Open links Obri els enllaços - + Background text color Color de fons del text - + Use FreeCAD style sheet Utilitza el full d'estil de FreeCAD - + Font family Tipus lletra - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts La família de tipus de lletra de la pàgina d'inici. Pot ser el nom d'un tipus de lletra o una sèrie de tipus de lletra alternatives separades per comes - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page La mida del tipus de lletra base per a tots els textos de la pàgina d'inici - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_zh-CN.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_zh-CN.ts index 0d4ac80ea9..e282032079 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_zh-CN.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_zh-CN.ts @@ -329,7 +329,7 @@ 显示示例文件夹内容 - + Show additional folder 显示其他文件夹 @@ -344,7 +344,7 @@ 如果选中此项，FreeCAD 论坛的最新帖子将会在活动选项卡上显示 - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here 一个可选的自定义文件夹，将显示在第一页的底部。 @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors 字体和颜色 - + The background of the main start page area 开始页页面主背景 - + Background color 背景颜色 - + in FreeCAD 在 FreeCAD 中 - + In external browser 在外部浏览器中 - + Background color down gradient 背景颜色向下渐变 - + The color of the version text 版本文本的颜色 - + Link color 链接颜色 - + An optional image to display as background 可选的图像作为背景显示 - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below 如果选中此项并且在常规首选项中指定了样式表，它将被使用并覆盖下面的颜色 - + Page background color 页面背景颜色 - + The color of the text on the main pages 主页文字的颜色 - + Background image 背景图片 - + Page text color 页面文本颜色 - + The color of the links 链接的颜色 - + The background color of the boxes inside the pages 页面内框的背景颜色 - + Box background color 框背景颜色 - + The background color behind the panels 面板背后的背景颜色 - + The down gradient for the background color (currently unsupported) 背景颜色的向下渐变(目前不支持) - + Open links 打开链接 - + Background text color 背景文字颜色 - + Use FreeCAD style sheet 使用 FreeCAD 样式表 - + Font family 字体系列 - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts 在起始页上使用的字体系列。 可以是字体名称或逗号分隔的后备字体系列 - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page 用于开始页面所有文本的基本字体大小 - + px px diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_zh-TW.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_zh-TW.ts index 8e3dc1dc9b..dc07e486b9 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage_zh-TW.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage_zh-TW.ts @@ -329,7 +329,7 @@ 顯示範例的資料夾內容 - + Show additional folder 顯示額外的資料夾 @@ -344,7 +344,7 @@ 如果這個被點取, 最後面貼在FreeCAD論壇討論, 將會顯示在活動的分頁 - + An optional custom folder to be displayed at the bottom of the first page. By using ";;" to separate paths, you can add several folders here An optional custom folder to be displayed at the bottom of the first page. @@ -396,138 +396,138 @@ By using ";;" to separate paths, you can add several folders here Show file thumbnails - + Fonts and colors 字型與顏色 - + The background of the main start page area The background of the main start page area - + Background color 背景顏色 - + in FreeCAD 在FreeCAD中 - + In external browser 在外部瀏覽器 - + Background color down gradient Background color down gradient - + The color of the version text 版本文字的顏色 - + Link color 連結顏色 - + An optional image to display as background An optional image to display as background - + If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below If this is checked and a style sheet is specified in General preferences, it will be used and override the colors below - + Page background color 頁面背景顏色 - + The color of the text on the main pages 主頁上文字的顏色 - + Background image 背景圖片 - + Page text color 頁面文字顏色 - + The color of the links 鏈結的顏色 - + The background color of the boxes inside the pages 頁面內部框的背景色 - + Box background color 框背景色 - + The background color behind the panels 面板後面的背景色 - + The down gradient for the background color (currently unsupported) The down gradient for the background color (currently unsupported) - + Open links 開啟鏈結 - + Background text color 背景文字顏色 - + Use FreeCAD style sheet 使用FreeCAD樣式表 - + Font family 字型家族 - + The font family to use on the start page. Can be a font name or a comma-separated series of fallback fonts 在開始頁上使用的字體系列, 可以是字體名稱或逗號分隔的備用字型 - + Arial,Helvetica,sans Arial,Helvetica,sans - + The base font size to use for all texts of the Start page 開始頁的所有文字要使用的基本字體大小 - + px px diff --git a/src/Mod/Start/Gui/Workbench.cpp b/src/Mod/Start/Gui/Workbench.cpp index 667e6bde7f..8443a266ce 100644 --- a/src/Mod/Start/Gui/Workbench.cpp +++ b/src/Mod/Start/Gui/Workbench.cpp @@ -161,5 +161,6 @@ Gui::DockWindowItems* StartGui::Workbench::setupDockWindows() const Gui::DockWindowItems* root = Gui::StdWorkbench::setupDockWindows(); root->setVisibility(false); // hide all dock windows by default root->setVisibility("Std_ComboView", true); // except of the combo view + root->setVisibility("Std_TaskView", true); // and the task view return root; } diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt index 0fb3e53a95..1e4dd865ee 100644 --- a/src/Mod/Surface/App/CMakeLists.txt +++ b/src/Mod/Surface/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt index 977c839d6b..2029c157ce 100644 --- a/src/Mod/Surface/Gui/CMakeLists.txt +++ b/src/Mod/Surface/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index 5a25753435..fd3d66475e 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppTechDraw -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src diff --git a/src/Mod/TechDraw/App/CenterLine.cpp b/src/Mod/TechDraw/App/CenterLine.cpp index 66f59d5725..bb68b56319 100644 --- a/src/Mod/TechDraw/App/CenterLine.cpp +++ b/src/Mod/TechDraw/App/CenterLine.cpp @@ -31,16 +31,16 @@ #include #endif +#include #include -#include #include "CenterLine.h" #include "DrawUtil.h" #include "DrawViewPart.h" #include "Geometry.h" -#include "GeometryObject.h" #include "CenterLinePy.h" +#include "ShapeUtils.h" using namespace TechDraw; using DU = DrawUtil; @@ -274,6 +274,84 @@ TechDraw::BaseGeomPtr CenterLine::scaledGeometry(const TechDraw::DrawViewPart* p return newGeom; } +TechDraw::BaseGeomPtr CenterLine::scaledAndRotatedGeometry(TechDraw::DrawViewPart* partFeat) +{ +// Base::Console().Message("CL::scaledGeometry() - m_type: %d\n", m_type); + double scale = partFeat->getScale(); + double viewAngleDeg = partFeat->Rotation.getValue(); + std::pair ends; + try { + if (m_faces.empty() && + m_edges.empty() && + m_verts.empty() ) { +// Base::Console().Message("CL::scaledGeometry - no geometry to scale!\n"); + //CenterLine was created by points without a geometry reference, + ends = calcEndPointsNoRef(m_start, m_end, scale, m_extendBy, + m_hShift, m_vShift, m_rotate, viewAngleDeg); + } else if (m_type == CLTYPE::FACE) { + ends = calcEndPoints(partFeat, + m_faces, + m_mode, m_extendBy, + m_hShift, m_vShift, m_rotate); + } else if (m_type == CLTYPE::EDGE) { + ends = calcEndPoints2Lines(partFeat, + m_edges, + m_mode, + m_extendBy, + m_hShift, m_vShift, m_rotate, m_flip2Line); + } else if (m_type == CLTYPE::VERTEX) { + ends = calcEndPoints2Points(partFeat, + m_verts, + m_mode, + m_extendBy, + m_hShift, m_vShift, m_rotate, m_flip2Line); + } + } + + catch (...) { + Base::Console().Error("CL::scaledGeometry - failed to calculate endpoints!\n"); + return nullptr; + } + + // inversion here breaks face cl. + Base::Vector3d p1 = ends.first; + Base::Vector3d p2 = ends.second; + if (p1.IsEqual(p2, 0.00001)) { + Base::Console().Warning("Centerline endpoints are equal. Could not draw.\n"); + //what to do here? //return current geom? + return m_geometry; + } + + TopoDS_Edge newEdge; + if (getType() == CLTYPE::FACE ) { + gp_Pnt gp1(DU::togp_Pnt(p1)); + gp_Pnt gp2(DU::togp_Pnt(p2)); + TopoDS_Edge e = BRepBuilderAPI_MakeEdge(gp1, gp2); + // Mirror shape in Y and scale + TopoDS_Shape s = ShapeUtils::mirrorShape(e, gp_Pnt(0.0, 0.0, 0.0), scale); + // rotate using OXYZ as the coordinate system + s = ShapeUtils::rotateShape(s, gp_Ax2(), - partFeat->Rotation.getValue()); + newEdge = TopoDS::Edge(s); + } else if (getType() == CLTYPE::EDGE || + getType() == CLTYPE::VERTEX) { + gp_Pnt gp1(DU::togp_Pnt(DU::invertY(p1 * scale))); + gp_Pnt gp2(DU::togp_Pnt(DU::invertY(p2 * scale))); + newEdge = BRepBuilderAPI_MakeEdge(gp1, gp2); + } + + TechDraw::BaseGeomPtr newGeom = TechDraw::BaseGeom::baseFactory(newEdge); + if (!newGeom) { + throw Base::RuntimeError("Failed to create center line"); + } + newGeom->setClassOfEdge(ecHARD); + newGeom->setHlrVisible( true); + newGeom->setCosmetic(true); + newGeom->source(CENTERLINE); + newGeom->setCosmeticTag(getTagAsString()); + + return newGeom; +} + std::string CenterLine::toString() const { std::stringstream ss; @@ -417,12 +495,20 @@ std::pair CenterLine::calcEndPoints(const DrawVi } } TopoDS_Shape faceEdgeCompound = DU::vectorToCompound(faceEdgesAll); - if (partFeat->Rotation.getValue() != 0.0) { - // align a copy of the input shape with the cardinal axes so we can use bbox to - // get size measurements - faceEdgeCompound = ShapeUtils::rotateShape(faceEdgeCompound, partFeat->getProjectionCS(), partFeat->Rotation.getValue() * -1.0); - } + if (partFeat->Rotation.getValue() != 0.0) { + // unrotate the input shape to align with the cardinal axes so we can use bbox to + // get size measurements + faceEdgeCompound = ShapeUtils::rotateShape(faceEdgeCompound, + partFeat->getProjectionCS(), + partFeat->Rotation.getValue() * -1.0); + } + // get the center of the unrotated, scaled face + Base::Vector3d faceCenter = ShapeUtils::findCentroidVec(faceEdgeCompound, partFeat->getProjectionCS()); + // we need to move the edges to the origin here to get the right limits from the bounding box + faceEdgeCompound = ShapeUtils::moveShape(faceEdgeCompound, faceCenter * -1.0); + + // get the bounding box of the centered and unrotated face BRepBndLib::AddOptimal(faceEdgeCompound, faceBox); if (faceBox.IsVoid()) { @@ -435,11 +521,14 @@ std::pair CenterLine::calcEndPoints(const DrawVi double Xspan = fabs(Xmax - Xmin); Xspan = (Xspan / 2.0); - double Xmid = Xmin + Xspan; - + double Xmid = 0.0; + Xmax = Xmid + Xspan; + Xmin = Xmid - Xspan; double Yspan = fabs(Ymax - Ymin); Yspan = (Yspan / 2.0); - double Ymid = Ymin + Yspan; + double Ymid = 0.0; + Ymax = Ymid + Yspan; + Ymin = Ymid - Yspan; Base::Vector3d p1, p2; if (mode == CenterLine::VERTICAL) { //vertical @@ -454,6 +543,12 @@ std::pair CenterLine::calcEndPoints(const DrawVi p2 = Base::Vector3d(Xmid, Ymin, 0.0); } + // now move the extents back to the face center. this should give us the scaled, + // unrotated ends of the cl (but in 3d coordinates, which will be handled at the time + // the cl is added to the view) + p1 += faceCenter; + p2 += faceCenter; + Base::Vector3d mid = (p1 + p2) / 2.0; //extend @@ -480,14 +575,9 @@ std::pair CenterLine::calcEndPoints(const DrawVi p2.y = p2.y + vss; } - // rotate the endpoints so that when the View's Rotation is applied, the - // centerline is aligned correctly std::pair result; result.first = p1 / scale; result.second = p2 / scale; - Base::Vector3d midpoint = (result.first + result.second) / 2.0; - result = rotatePointsAroundMid(result.first, result.second, midpoint, partFeat->Rotation.getValue() * -1.0); - return result; } @@ -511,7 +601,6 @@ std::pair CenterLine::calcEndPoints2Lines(const } double scale = partFeat->getScale(); - const std::vector dbEdges = partFeat->getEdgeGeometry(); std::vector edges; for (auto& en: edgeNames) { @@ -528,14 +617,15 @@ std::pair CenterLine::calcEndPoints2Lines(const } if (edges.size() != 2) { Base::Console().Message("CL::calcEndPoints2Lines - wrong number of edges: %d!\n", edges.size()); -// return result; throw Base::IndexError("CenterLine wrong number of edges."); } - Base::Vector3d l1p1 = edges.front()->getStartPoint(); - Base::Vector3d l1p2 = edges.front()->getEndPoint(); - Base::Vector3d l2p1 = edges.back()->getStartPoint(); - Base::Vector3d l2p2 = edges.back()->getEndPoint(); + // these points are centered, rotated, scaled and inverted. + // invert the points so the math works correctly + Base::Vector3d l1p1 = DU::invertY(edges.front()->getStartPoint()); + Base::Vector3d l1p2 = DU::invertY(edges.front()->getEndPoint()); + Base::Vector3d l2p1 = DU::invertY(edges.back()->getStartPoint()); + Base::Vector3d l2p2 = DU::invertY(edges.back()->getEndPoint()); // The centerline is drawn using the midpoints of the two lines that connect l1p1-l2p1 and l1p2-l2p2. // However, we don't know which point should be l1p1 to get a geometrically correct result, see @@ -568,14 +658,17 @@ std::pair CenterLine::calcEndPoints2Lines(const } //orientation - if (mode == CenterLine::VERTICAL && !inhibitVertical) { //Vertical - p1.x = mid.x; - p2.x = mid.x; - } else if (mode == CenterLine::HORIZONTAL && !inhibitHorizontal) { //Horizontal - p1.y = mid.y; - p2.y = mid.y; - } else if (mode == CenterLine::ALIGNED) { //Aligned - // no op + if (partFeat->Rotation.getValue() == 0.0) { + // if the view is rotated, then horizontal and vertical lose their meaning + if (mode == 0 && !inhibitVertical) { //Vertical + p1.x = mid.x; + p2.x = mid.x; + } else if (mode == 1 && !inhibitHorizontal) { //Horizontal + p1.y = mid.y; + p2.y = mid.y; + } else if (mode == 2) { //Aligned + // no op + } } //extend @@ -587,9 +680,7 @@ std::pair CenterLine::calcEndPoints2Lines(const //rotate if (!DrawUtil::fpCompare(rotate, 0.0)) { //rotate p1, p2 about mid - std::pair ends = rotatePointsAroundMid(p1, p2, mid, rotate); - p1 = ends.first; - p2 = ends.second; + std::tie(p1, p2) = rotatePointsAroundMid(p1, p2, mid, rotate); } //shift @@ -604,13 +695,9 @@ std::pair CenterLine::calcEndPoints2Lines(const p2.y = p2.y + vss; } - // rotate the endpoints so that when the View's Rotation is applied, the - // centerline is aligned correctly + // the cl will be scaled when drawn, so unscale now. result.first = p1 / scale; result.second = p2 / scale; - Base::Vector3d midpoint = (result.first + result.second) / 2.0; - result = rotatePointsAroundMid(result.first, result.second, midpoint, partFeat->Rotation.getValue() * -1.0); - return result; } @@ -647,8 +734,8 @@ std::pair CenterLine::calcEndPoints2Points(const throw Base::IndexError("CenterLine wrong number of points."); } - Base::Vector3d v1 = points.front()->point(); - Base::Vector3d v2 = points.back()->point(); + Base::Vector3d v1 = DU::invertY(points.front()->point()); + Base::Vector3d v2 = DU::invertY(points.back()->point()); Base::Vector3d mid = (v1 + v2) / 2.0; Base::Vector3d dir = v2 - v1; @@ -667,16 +754,20 @@ std::pair CenterLine::calcEndPoints2Points(const inhibitVertical = true; } - if (mode == CenterLine::VERTICAL && !inhibitVertical) { + //orientation + if (partFeat->Rotation.getValue() == 0.0) { + // if the view is rotated, then horizontal and vertical lose their meaning + if (mode == CenterLine::VERTICAL && !inhibitVertical) { //Vertical v1.x = mid.x; v2.x = mid.x; - } else if (mode == CenterLine::HORIZONTAL && !inhibitHorizontal) { + } else if (mode == CenterLine::HORIZONTAL && !inhibitHorizontal) { //Horizontal v1.y = mid.y; v2.y = mid.y; - } else if (mode == CenterLine::ALIGNED) { //Aligned - // no op + } else if (mode == CenterLine::ALIGNED) { //Aligned + // no op + } } double length = dir.Length(); @@ -714,8 +805,6 @@ std::pair CenterLine::calcEndPoints2Points(const p2.y = p2.y + vss; } - // in the case of points, we do not need to apply a rotation, since the points will - // rotated already std::pair result; result.first = p1 / scale; result.second = p2 / scale; diff --git a/src/Mod/TechDraw/App/CenterLine.h b/src/Mod/TechDraw/App/CenterLine.h index 5086cb324d..98c0b4a3e0 100644 --- a/src/Mod/TechDraw/App/CenterLine.h +++ b/src/Mod/TechDraw/App/CenterLine.h @@ -88,6 +88,7 @@ public: const int mode = 0, const bool flip = false); TechDraw::BaseGeomPtr scaledGeometry(const TechDraw::DrawViewPart* partFeat); + TechDraw::BaseGeomPtr scaledAndRotatedGeometry(TechDraw::DrawViewPart* partFeat); static std::pair rotatePointsAroundMid( const Base::Vector3d& p1, @@ -139,6 +140,8 @@ public: double getExtend() const; void setFlip(const bool f); bool getFlip() const; + void setType(const int type) { m_type = type; }; + int getType() const { return m_type; } Base::Vector3d m_start; Base::Vector3d m_end; diff --git a/src/Mod/TechDraw/App/CosmeticExtension.cpp b/src/Mod/TechDraw/App/CosmeticExtension.cpp index 7245d3f09e..f2174423a4 100644 --- a/src/Mod/TechDraw/App/CosmeticExtension.cpp +++ b/src/Mod/TechDraw/App/CosmeticExtension.cpp @@ -341,7 +341,7 @@ TechDraw::CosmeticEdge* CosmeticExtension::getCosmeticEdge(const std::string& ta } // None found - Base::Console().Message("CEx::getCosmeticEdge - CE for tag: %s not found.\n", tagString.c_str()); +// Base::Console().Message("CEx::getCosmeticEdge - CE for tag: %s not found.\n", tagString.c_str()); return nullptr; } @@ -416,10 +416,11 @@ int CosmeticExtension::add1CLToGE(const std::string& tag) // Base::Console().Message("CEx::add1CLToGE(%s) 2\n", tag.c_str()); TechDraw::CenterLine* cl = getCenterLine(tag); if (!cl) { - Base::Console().Message("CEx::add1CLToGE 2 - cl %s not found\n", tag.c_str()); +// Base::Console().Message("CEx::add1CLToGE 2 - cl %s not found\n", tag.c_str()); return -1; } - TechDraw::BaseGeomPtr scaledGeom = cl->scaledGeometry(getOwner()); + TechDraw::BaseGeomPtr scaledGeom = cl->scaledAndRotatedGeometry(getOwner()); +// TechDraw::BaseGeomPtr scaledGeom = cl->scaledGeometry(getOwner()); int iGE = getOwner()->getGeometryObject()->addCenterLine(scaledGeom, tag); return iGE; @@ -446,7 +447,8 @@ void CosmeticExtension::addCenterLinesToGeom() // Base::Console().Message("CE::addCenterLinesToGeom()\n"); const std::vector lines = CenterLines.getValues(); for (auto& cl : lines) { - TechDraw::BaseGeomPtr scaledGeom = cl->scaledGeometry(getOwner()); +// TechDraw::BaseGeomPtr scaledGeom = cl->scaledGeometry(getOwner()); + TechDraw::BaseGeomPtr scaledGeom = cl->scaledAndRotatedGeometry(getOwner()); if (!scaledGeom) { Base::Console().Error("CE::addCenterLinesToGeom - scaledGeometry is null\n"); continue; @@ -491,7 +493,6 @@ std::string CosmeticExtension::addCenterLine(TechDraw::BaseGeomPtr bg) return cl->getTagAsString(); } - //get CL by unique id TechDraw::CenterLine* CosmeticExtension::getCenterLine(const std::string& tagString) const { diff --git a/src/Mod/TechDraw/App/DimensionGeometry.cpp b/src/Mod/TechDraw/App/DimensionGeometry.cpp index 9ae4e44008..2355ed622f 100644 --- a/src/Mod/TechDraw/App/DimensionGeometry.cpp +++ b/src/Mod/TechDraw/App/DimensionGeometry.cpp @@ -41,6 +41,14 @@ pointPair::pointPair(const pointPair& pp) { first(pp.first()); second(pp.second()); + overrideFirst(pp.extensionLineFirst()); + overrideSecond(pp.extensionLineSecond()); +} + +// set extension line points from argument base points +void pointPair::setExtensionLine(const pointPair& pp){ + overrideFirst(pp.first()); + overrideSecond(pp.second()); } //move the points by offset @@ -48,6 +56,8 @@ void pointPair::move(const Base::Vector3d& offset) { m_first = m_first - offset; m_second = m_second - offset; + m_overrideFirst = m_overrideFirst - offset; + m_overrideSecond = m_overrideSecond - offset; } // project the points onto the dvp's paper plane. @@ -55,6 +65,8 @@ void pointPair::project(const DrawViewPart* dvp) { m_first = dvp->projectPoint(m_first) * dvp->getScale(); m_second = dvp->projectPoint(m_second) * dvp->getScale(); + m_overrideFirst = dvp->projectPoint(m_overrideFirst) * dvp->getScale(); + m_overrideSecond = dvp->projectPoint(m_overrideSecond) * dvp->getScale(); } // map the points onto the dvp's XY coordinate system diff --git a/src/Mod/TechDraw/App/DimensionGeometry.h b/src/Mod/TechDraw/App/DimensionGeometry.h index 1052235786..5fab391df7 100644 --- a/src/Mod/TechDraw/App/DimensionGeometry.h +++ b/src/Mod/TechDraw/App/DimensionGeometry.h @@ -38,12 +38,26 @@ class TechDrawExport pointPair { public: pointPair() = default; - pointPair(const Base::Vector3d& point0, const Base::Vector3d& point1) { m_first = point0; m_second = point1; } + pointPair(const Base::Vector3d& point0, const Base::Vector3d& point1) + : m_first(point0) + , m_second(point1){}; + + pointPair(const Base::Vector3d& point0, const Base::Vector3d& point1, + const Base::Vector3d& extensionPoint0, const Base::Vector3d& extensionPoint1) + : m_first(point0) + , m_second(point1) + , m_useOverrideFirst(true) + , m_overrideFirst(extensionPoint0) + , m_useOverrideSecond(true) + , m_overrideSecond(extensionPoint1){}; + pointPair(const pointPair& pp); pointPair& operator=(const pointPair& pp) { m_first = pp.first(); m_second = pp.second(); + overrideFirst(pp.extensionLineFirst()); + overrideSecond(pp.extensionLineSecond()); return *this; } @@ -51,6 +65,12 @@ public: void first(Base::Vector3d newFirst) { m_first = newFirst; } Base::Vector3d second() const { return m_second; } void second(Base::Vector3d newSecond) { m_second = newSecond; } + // extension line specific points + Base::Vector3d extensionLineFirst() const { return m_useOverrideFirst ? m_overrideFirst : m_first; } + void overrideFirst(Base::Vector3d newFirst) { m_useOverrideFirst = true; m_overrideFirst = newFirst; } + Base::Vector3d extensionLineSecond() const { return m_useOverrideSecond ? m_overrideSecond : m_second; } + void overrideSecond(Base::Vector3d newSecond) { m_useOverrideSecond = true; m_overrideSecond = newSecond; } + void setExtensionLine(const pointPair& pp); void move(const Base::Vector3d& offset); void project(const DrawViewPart* dvp); @@ -61,6 +81,11 @@ public: private: Base::Vector3d m_first; Base::Vector3d m_second; + // extension line specific points + bool m_useOverrideFirst = false; + Base::Vector3d m_overrideFirst; + bool m_useOverrideSecond = false; + Base::Vector3d m_overrideSecond; }; //a convenient container for angular dimension points diff --git a/src/Mod/TechDraw/App/DimensionReferences.cpp b/src/Mod/TechDraw/App/DimensionReferences.cpp index a886a9391f..6ff8cb462e 100644 --- a/src/Mod/TechDraw/App/DimensionReferences.cpp +++ b/src/Mod/TechDraw/App/DimensionReferences.cpp @@ -39,32 +39,37 @@ #include "DimensionReferences.h" #include "DrawUtil.h" #include "DrawViewPart.h" -#include "GeometryObject.h" - +#include "ShapeUtils.h" using namespace TechDraw; using DU = DrawUtil; TopoDS_Shape ReferenceEntry::getGeometry() const { -// Base::Console().Message("RE::getGeometry()\n"); +// Base::Console().Message("RE::getGeometry() - obj: %s sub: %s\n", +// getObject()->getNameInDocument(), getSubName()); if ( getObject()->isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId()) ) { - auto dvp = static_cast(getObject()); - std::string gType = geomType(); - if (gType == "Vertex") { - auto vgeom = dvp->getVertex(getSubName()); - return vgeom->getOCCVertex(); + std::string gType; + try { + auto dvp = static_cast(getObject()); + gType = geomType(); + if (gType == "Vertex") { + auto vgeom = dvp->getVertex(getSubName()); + return vgeom->getOCCVertex(); + } + if (gType == "Edge") { + auto egeom = dvp->getEdge(getSubName()); + return egeom->getOCCEdge(); + } + if (gType == "Face") { + auto fgeom = dvp->getFace(getSubName()); + return fgeom->toOccFace(); + } } - if (gType == "Edge") { - auto egeom = dvp->getEdge(getSubName()); - return egeom->getOCCEdge(); + catch (...) { +// Base::Console().Message("RE::getGeometry - no shape for dimension reference - gType: %s\n", gType.c_str()); + return {}; } - if (gType == "Face") { - auto fgeom = dvp->getFace(getSubName()); - return fgeom->toOccFace(); - } - //Base::Console().Message("RE::getGeometry - returns null shape! - gType: %s\n", gType.c_str()); - return {}; } Part::TopoShape shape = Part::Feature::getTopoShape(getObject()); @@ -108,7 +113,9 @@ Part::TopoShape ReferenceEntry::asTopoShape() const { // Base::Console().Message("RE::asTopoShape()\n"); TopoDS_Shape geom = getGeometry(); - + if (geom.IsNull()) { + throw Base::RuntimeError("Dimension Reference has null geometry"); + } if (geom.ShapeType() == TopAbs_VERTEX) { TopoDS_Vertex vert = TopoDS::Vertex(geom); return asTopoShapeVertex(vert); @@ -159,3 +166,12 @@ bool ReferenceEntry::is3d() const return !getObject()->isDerivedFrom(TechDraw::DrawViewPart::getClassTypeId()); } +//! check if this reference has valid geometry +bool ReferenceEntry::isValid() const +{ + TopoDS_Shape geom = getGeometry(); + if (geom.IsNull()) { + return false; + } + return true; +} diff --git a/src/Mod/TechDraw/App/DimensionReferences.h b/src/Mod/TechDraw/App/DimensionReferences.h index 2f997a3faa..28c239cd7d 100644 --- a/src/Mod/TechDraw/App/DimensionReferences.h +++ b/src/Mod/TechDraw/App/DimensionReferences.h @@ -74,6 +74,7 @@ public: Part::TopoShape asTopoShapeEdge(TopoDS_Edge& edge) const; bool is3d() const; + bool isValid() const; private: App::DocumentObject* m_object; diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp index cc6a4c225a..a93fef46a5 100644 --- a/src/Mod/TechDraw/App/DrawUtil.cpp +++ b/src/Mod/TechDraw/App/DrawUtil.cpp @@ -1642,8 +1642,19 @@ bool DrawUtil::isCosmeticEdge(App::DocumentObject* owner, std::string element) { auto ownerView = static_cast(owner); auto edge = ownerView->getEdge(element); - if (edge) { - return edge->getCosmetic(); + if (edge && edge->source() == 1 && edge->getCosmetic()) { + return true; + } + return false; +} + +// true if owner->element is a center line +bool DrawUtil::isCenterLine(App::DocumentObject* owner, std::string element) +{ + auto ownerView = static_cast(owner); + auto edge = ownerView->getEdge(element); + if (edge && edge->source() == 2 && edge->getCosmetic()) { + return true; } return false; } diff --git a/src/Mod/TechDraw/App/DrawUtil.h b/src/Mod/TechDraw/App/DrawUtil.h index bbb7a64120..6bbfae570c 100644 --- a/src/Mod/TechDraw/App/DrawUtil.h +++ b/src/Mod/TechDraw/App/DrawUtil.h @@ -257,6 +257,7 @@ public: static bool isCosmeticVertex(App::DocumentObject* owner, std::string element); static bool isCosmeticEdge(App::DocumentObject* owner, std::string element); + static bool isCenterLine(App::DocumentObject* owner, std::string element); //debugging routines static void dumpVertexes(const char* text, const TopoDS_Shape& s); diff --git a/src/Mod/TechDraw/App/DrawViewArch.cpp b/src/Mod/TechDraw/App/DrawViewArch.cpp index a0d4fc9688..2600db07ac 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.cpp +++ b/src/Mod/TechDraw/App/DrawViewArch.cpp @@ -63,6 +63,7 @@ DrawViewArch::DrawViewArch() ADD_PROPERTY_TYPE(FontSize, (12.0), group, App::Prop_None, "Text size for this view"); ADD_PROPERTY_TYPE(CutLineWidth, (0.50), group, App::Prop_None, "Width of cut lines of this view"); ADD_PROPERTY_TYPE(JoinArch ,(false), group, App::Prop_None, "If True, walls and structure will be fused by material"); + ADD_PROPERTY_TYPE(LineSpacing, (1.0f), group, App::Prop_None, "The spacing between lines to use for multiline texts"); ScaleType.setValue("Custom"); } @@ -79,6 +80,7 @@ short DrawViewArch::mustExecute() const LineWidth.isTouched() || FontSize.isTouched() || CutLineWidth.isTouched() || + LineSpacing.isTouched() || JoinArch.isTouched() ) { return 1; @@ -123,6 +125,7 @@ App::DocumentObjectExecReturn *DrawViewArch::execute() << ", rotation=" << Rotation.getValue() << ", fillSpaces=" << (FillSpaces.getValue() ? "True" : "False") << ", cutlinewidth=" << CutLineWidth.getValue() + << ", linespacing=" << LineSpacing.getValue() << ", joinArch=" << (JoinArch.getValue() ? "True" : "False"); Base::Interpreter().runString("import ArchSectionPlane"); diff --git a/src/Mod/TechDraw/App/DrawViewArch.h b/src/Mod/TechDraw/App/DrawViewArch.h index ef3b55d280..ba0899ac98 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.h +++ b/src/Mod/TechDraw/App/DrawViewArch.h @@ -53,6 +53,8 @@ public: App::PropertyFloat FontSize; App::PropertyFloat CutLineWidth; App::PropertyBool JoinArch; + App::PropertyFloat LineSpacing; + /** @name methods override Feature */ //@{ diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index aa61e99ff6..9dc17555b7 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -42,6 +42,10 @@ # include # include # include +# include +# include +# include +# include # include # include # include @@ -403,6 +407,12 @@ App::DocumentObjectExecReturn* DrawViewDimension::execute() } } + if (References3D.getValues().empty() && !checkReferences2D()) { + Base::Console().Warning("%s has invalid 2D References\n", + getNameInDocument()); + return new App::DocumentObjectExecReturn("Dimension object has invalid 2d references"); + } + //we have either or both valid References3D and References2D ReferenceVector references = getEffectiveReferences(); @@ -468,16 +478,9 @@ bool DrawViewDimension::okToProceed() return false; } - if (References3D.getValues().empty() && !checkReferences2D()) { - Base::Console().Warning("DVD::execute - %s has invalid 2D References\n", - getNameInDocument()); - return false; - } - return true; } -////TODO: schema not report their multiValue status bool DrawViewDimension::isMultiValueSchema() const { return m_formatter->isMultiValueSchema(); } std::string DrawViewDimension::formatValue(qreal value, QString qFormatSpec, int partial, @@ -746,7 +749,31 @@ pointPair DrawViewDimension::getPointsEdgeVert(ReferenceVector references) if (!vertex || !edge) { throw Base::RuntimeError("Missing geometry for dimension (4)"); } - return closestPoints(edge->getOCCEdge(), vertex->getOCCVertex()); + + //get curve from edge + double start, end; // curve parameters + const Handle(Geom_Surface) hplane = new Geom_Plane(gp_Ax3()); + auto const occCurve = BRep_Tool::CurveOnPlane(edge->getOCCEdge() + , hplane + , TopLoc_Location() + , start + , end); + auto const occPoint = gp_Pnt2d(vertex->x(), vertex->y()); + //project point on curve + auto projector = Geom2dAPI_ProjectPointOnCurve(occPoint, occCurve); + if (projector.NbPoints() > 0) { + auto p1 = Base::Vector3d(vertex->x(), vertex->y(), 0.0); + auto p2 = Base::Vector3d(projector.NearestPoint().X() + , projector.NearestPoint().Y() + , 0.0); + pointPair result = pointPair(p1, p2); + result.setExtensionLine(closestPoints(edge->getOCCEdge(), vertex->getOCCVertex())); + return result; + } + else { + // unable to project + return closestPoints(edge->getOCCEdge(), vertex->getOCCVertex()); + } } //this is a 3d object @@ -1176,6 +1203,7 @@ DrawViewPart* DrawViewDimension::getViewPart() const //otherwise 2d references are returned. no checking is performed. Result is pairs of (object, subName) ReferenceVector DrawViewDimension::getEffectiveReferences() const { +// Base::Console().Message("DVD::getEffectiveReferences()\n"); const std::vector& objects3d = References3D.getValues(); const std::vector& subElements3d = References3D.getSubValues(); const std::vector& objects = References2D.getValues(); @@ -1355,22 +1383,34 @@ void DrawViewDimension::updateSavedGeometry() // Base::Console().Message("DVD::updateSavedGeometry() - %s - savedGeometry: %d\n", // getNameInDocument(), SavedGeometry.getValues().size()); ReferenceVector references = getEffectiveReferences(); + if (references.empty()) { + // no references to save + return; + } std::vector newGeometry; const std::vector oldGeometry = SavedGeometry.getValues(); //need to clean up old geometry objects here? + size_t iOldGeom(0); for (auto& entry : references) { if (entry.getSubName().empty()) { // view only reference has no geometry. continue; } - newGeometry.push_back(entry.asTopoShape()); -// Base::Console().Message("DVD::updateSavedGeometry - entry.isNull: %d\n", entry.asTopoShape().isNull()); + if (entry.isValid()) { + newGeometry.push_back(entry.asTopoShape()); + } else { + // use old geometry entry? null shape? have to put something in the vector + // so SavedGeometry and references stay in sync. + if (iOldGeom < oldGeometry.size()) { + newGeometry.push_back(oldGeometry.at(iOldGeom)); + } else { + newGeometry.push_back(Part::TopoShape()); + } + } + iOldGeom++; } - if (newGeometry.empty()) { - //clear out the old SavedGeometry - SavedGeometry.clear(); - } else { + if (!newGeometry.empty()) { SavedGeometry.setValues(newGeometry); } } @@ -1385,7 +1425,9 @@ bool DrawViewDimension::compareSavedGeometry() const std::vector savedGeometry = SavedGeometry.getValues(); if (savedGeometry.empty()) { // no saved geometry, so we have nothing to compare, so we don't know if there has been a change - return true; + // this should return false, since something != nothing +// Base::Console().Warning("%s has no saved reference geometry!\n", getNameInDocument()); + return false; } ReferenceVector references = getEffectiveReferences(); @@ -1427,14 +1469,27 @@ bool DrawViewDimension::fixExactMatch() return false; } ReferenceVector references = getEffectiveReferences(); + if (references.empty()) { + // could not get refs, something is wrong! + return false; + } + + if (SavedGeometry.getValues().empty()) { + // there is no saved geometry, so we can't repair anything. + return false; + } std::vector< std::pair > refsToFix2d; std::vector< std::pair > refsToFix3d; bool success(true); - int referenceCount = references.size(); - int iRef = 0; + size_t referenceCount = references.size(); + size_t iRef = 0; for ( ; iRef < referenceCount; iRef++) { std::string newReference(""); TopoDS_Shape geomShape = references.at(iRef).getGeometry(); + if (geomShape.IsNull()) { +// Base::Console().Message("DVD::fixExactMatch - no geometry found for reference: %d\n", iRef); + return false; + } if (references.at(iRef).is3d()) { if (geomShape.ShapeType() == TopAbs_VERTEX) { newReference = recoverChangedVertex3d(iRef); @@ -1482,7 +1537,8 @@ void DrawViewDimension::handleNoExactMatch() // Base::Console().Message("%s - trying to match changed geometry - stage 2\n", getNameInDocument()); // this is where we insert the clever logic to determine that the changed geometry // actually still represents the "front top left" edge. - updateSavedGeometry(); + // after figuring out the new reference, save the geometry + // updateSavedGeometry(); m_referencesCorrect = true; } @@ -1516,6 +1572,11 @@ std::string DrawViewDimension::recoverChangedVertex2d(int iReference) { // Base::Console().Message("DVD::recoverChangedVertex2d(%d)\n", iReference); double scale = getViewPart()->getScale(); + std::vector savedAll = SavedGeometry.getValues(); + if (savedAll.empty() || + iReference >= savedAll.size()) { + return std::string(); + } Part::TopoShape savedGeometryItem = SavedGeometry.getValues().at(iReference); std::vector gVertexAll = getViewPart()->getVertexGeometry(); int iVertex = 0; diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index e6f39aef75..2a9dcb1922 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -168,7 +168,7 @@ DrawViewPart::~DrawViewPart() //! XSource property lists TopoDS_Shape DrawViewPart::getSourceShape(bool fuse) const { - // Base::Console().Message("DVP::getSourceShape()\n"); +// Base::Console().Message("DVP::getSourceShape()\n"); const std::vector& links = getAllSources(); if (links.empty()) { return TopoDS_Shape(); @@ -203,11 +203,15 @@ std::vector DrawViewPart::getAllSources() const //! pick supported 2d shapes out of the Source properties and //! add them directly to the geometry without going through HLR +//! NOTE: this is for loose 2d shapes such as Part line or circle and is +//! not meant to include complex 2d shapes such as Sketches. void DrawViewPart::addShapes2d(void) { +// Base::Console().Message("DVP::addShapes2d()\n"); + // get all the 2d shapes in the sources, then pick through them for loose edges + // or vertices. std::vector shapes = ShapeExtractor::getShapes2d(getAllSources()); for (auto& s : shapes) { - //just vertices for now if (s.ShapeType() == TopAbs_VERTEX) { gp_Pnt gp = BRep_Tool::Pnt(TopoDS::Vertex(s)); Base::Vector3d vp(gp.X(), gp.Y(), gp.Z()); @@ -218,8 +222,7 @@ void DrawViewPart::addShapes2d(void) geometryObject->addVertex(v1); } else if (s.ShapeType() == TopAbs_EDGE) { - //not supporting edges yet. Why? - //Base::Console().Message("DVP::add2dShapes - found loose edge - isNull: %d\n", s.IsNull()); + Base::Console().Message("DVP::add2dShapes - found loose edge - isNull: %d\n", s.IsNull()); TopoDS_Shape sTrans = ShapeUtils::moveShape(s, m_saveCentroid * -1.0); TopoDS_Shape sScale = ShapeUtils::scaleShape(sTrans, @@ -229,7 +232,10 @@ void DrawViewPart::addShapes2d(void) BaseGeomPtr bg = projectEdge(edge); geometryObject->addEdge(bg); - //save connection between source feat and this edge + + } else { + // message for developers. + //Base::Console().Message("DEVEL: DVP::addShapes2d - shape is not a vertex or edge\n"); } } } diff --git a/src/Mod/TechDraw/App/ShapeExtractor.cpp b/src/Mod/TechDraw/App/ShapeExtractor.cpp index c31af9e1ab..51595262eb 100644 --- a/src/Mod/TechDraw/App/ShapeExtractor.cpp +++ b/src/Mod/TechDraw/App/ShapeExtractor.cpp @@ -41,15 +41,18 @@ #include #include #include +#include //#include #include "ShapeExtractor.h" #include "DrawUtil.h" #include "Preferences.h" +#include "ShapeUtils.h" using namespace TechDraw; using DU = DrawUtil; +using SU = ShapeUtils; std::vector ShapeExtractor::getShapes2d(const std::vector links, bool overridePref) { @@ -66,30 +69,23 @@ std::vector ShapeExtractor::getShapes2d(const std::vectorgetTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) { - //need to apply global placement here. ??? because 2d shapes (Points so far) - //don't get gp from Part::feature::getShape() ???? - const Part::Feature* pf = static_cast(d); - Part::TopoShape ts = pf->Shape.getShape(); - ts.setPlacement(pf->globalPlacement()); - shapes2d.push_back(ts.getShape()); + shapes2d.push_back(getLocatedShape(d)); } } } } else { if (is2dObject(l)) { if (l->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) { - //need to apply placement here - const Part::Feature* pf = static_cast(l); - Part::TopoShape ts = pf->Shape.getShape(); - ts.setPlacement(pf->globalPlacement()); - shapes2d.push_back(ts.getShape()); - } + shapes2d.push_back(getLocatedShape(l)); + } // other 2d objects would go here - Draft objects? } } } return shapes2d; } +//! get the located and oriented shapes corresponding to the the links. If the shapes are to be +//! fused, include2d should be false as 2d & 3d shapes may not fuse. TopoDS_Shape ShapeExtractor::getShapes(const std::vector links, bool include2d) { // Base::Console().Message("SE::getShapes() - links in: %d\n", links.size()); @@ -108,8 +104,8 @@ TopoDS_Shape ShapeExtractor::getShapes(const std::vector l } } else { auto shape = Part::Feature::getShape(l); - if(!shape.IsNull()) { - sourceShapes.push_back(shape); + if(!SU::isShapeReallyNull((shape))) { + sourceShapes.push_back(getLocatedShape(l)); } else { std::vector shapeList = getShapesFromObject(l); sourceShapes.insert(sourceShapes.end(), shapeList.begin(), shapeList.end()); @@ -120,33 +116,29 @@ TopoDS_Shape ShapeExtractor::getShapes(const std::vector l BRep_Builder builder; TopoDS_Compound comp; builder.MakeCompound(comp); - bool found = false; for (auto& s:sourceShapes) { - if (s.IsNull()) { + if (SU::isShapeReallyNull(s)) { continue; } else if (s.ShapeType() < TopAbs_SOLID) { //clean up composite shapes TopoDS_Shape cleanShape = stripInfiniteShapes(s); if (!cleanShape.IsNull()) { builder.Add(comp, cleanShape); - found = true; } } else if (Part::TopoShape(s).isInfinite()) { continue; //simple shape is infinite } else { //a simple shape - add to compound builder.Add(comp, s); - found = true; } } //it appears that an empty compound is !IsNull(), so we need to check a different way - //if we added anything to the compound. - if (found) { + if (!SU::isShapeReallyNull(comp)) { // BRepTools::Write(comp, "SEResult.brep"); //debug return comp; } - Base::Console().Error("ShapeExtractor failed to get shape.\n"); +// Base::Console().Error("DEVEL: ShapeExtractor failed to get any shape.\n"); return TopoDS_Shape(); } @@ -263,25 +255,7 @@ std::vector ShapeExtractor::getShapesFromObject(const App::Documen App::Property* gProp = docObj->getPropertyByName("Group"); App::Property* sProp = docObj->getPropertyByName("Shape"); if (docObj->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) { - const Part::Feature* pf = static_cast(docObj); - Part::TopoShape ts(pf->Shape.getShape()); - - //ts might be garbage, better check - try { - if (!ts.isNull()) { - ts.setPlacement(pf->globalPlacement()); - result.push_back(ts.getShape()); - } - } - catch (Standard_Failure& e) { - Base::Console().Error("ShapeExtractor - %s encountered OCC error: %s \n", docObj->getNameInDocument(), e.GetMessageString()); - return result; - } - catch (...) { - Base::Console().Error("ShapeExtractor failed to retrieve shape from %s\n", docObj->getNameInDocument()); - return result; - } - + result.push_back(getLocatedShape(docObj)); } else if (gex) { //is a group extension std::vector objs = gex->Group.getValues(); std::vector shapes; @@ -307,8 +281,7 @@ std::vector ShapeExtractor::getShapesFromObject(const App::Documen } else if (sProp) { //has a Shape property Part::PropertyPartShape* shape = dynamic_cast(sProp); if (shape) { - TopoDS_Shape occShape = shape->getValue(); - result.push_back(occShape); + result.push_back(getLocatedShape(docObj)); } } return result; @@ -392,21 +365,20 @@ bool ShapeExtractor::is2dObject(App::DocumentObject* obj) return false; } -//skip edges for now. +// just these for now bool ShapeExtractor::isEdgeType(App::DocumentObject* obj) { - (void) obj; bool result = false; -// Base::Type t = obj->getTypeId(); -// if (t.isDerivedFrom(Part::Line::getClassTypeId()) ) { -// result = true; -// } else if (t.isDerivedFrom(Part::Circle::getClassTypeId())) { -// result = true; -// } else if (t.isDerivedFrom(Part::Ellipse::getClassTypeId())) { -// result = true; -// } else if (t.isDerivedFrom(Part::RegularPolygon::getClassTypeId())) { -// result = true; -// } + Base::Type t = obj->getTypeId(); + if (t.isDerivedFrom(Part::Line::getClassTypeId()) ) { + result = true; + } else if (t.isDerivedFrom(Part::Circle::getClassTypeId())) { + result = true; + } else if (t.isDerivedFrom(Part::Ellipse::getClassTypeId())) { + result = true; + } else if (t.isDerivedFrom(Part::RegularPolygon::getClassTypeId())) { + result = true; + } return result; } @@ -439,9 +411,11 @@ bool ShapeExtractor::isDraftPoint(App::DocumentObject* obj) return false; } + +//! get the location of a point object Base::Vector3d ShapeExtractor::getLocation3dFromFeat(App::DocumentObject* obj) { -// Base::Console().Message("SE::getLocation3dFromFeat()\n"); + Base::Console().Message("SE::getLocation3dFromFeat()\n"); if (!isPointType(obj)) { return Base::Vector3d(0.0, 0.0, 0.0); } @@ -465,6 +439,18 @@ Base::Vector3d ShapeExtractor::getLocation3dFromFeat(App::DocumentObject* obj) return Base::Vector3d(0.0, 0.0, 0.0); } +//! get the located and oriented version of docObj shape +TopoDS_Shape ShapeExtractor::getLocatedShape(const App::DocumentObject* docObj) +{ + Part::TopoShape shape = Part::Feature::getShape(docObj); + const Part::Feature* pf = dynamic_cast(docObj); + if (pf) { + shape.setPlacement(pf->globalPlacement()); + } + return shape.getShape(); +} + +//! true if we should include loose 2d geometry bool ShapeExtractor::prefAdd2d() { return Preferences::getPreferenceGroup("General")->GetBool("ShowLoose2d", false); diff --git a/src/Mod/TechDraw/App/ShapeExtractor.h b/src/Mod/TechDraw/App/ShapeExtractor.h index 30aad1a5d8..0575cda726 100644 --- a/src/Mod/TechDraw/App/ShapeExtractor.h +++ b/src/Mod/TechDraw/App/ShapeExtractor.h @@ -50,11 +50,13 @@ public: static bool isEdgeType(App::DocumentObject* obj); static bool isPointType(App::DocumentObject* obj); static bool isDraftPoint(App::DocumentObject* obj); - static Base::Vector3d getLocation3dFromFeat(App::DocumentObject* obj); + static Base::Vector3d getLocation3dFromFeat(App::DocumentObject *obj); static bool prefAdd2d(); static TopoDS_Shape stripInfiniteShapes(TopoDS_Shape inShape); + static TopoDS_Shape getLocatedShape(const App::DocumentObject* docObj); + protected: private: diff --git a/src/Mod/TechDraw/App/ShapeUtils.cpp b/src/Mod/TechDraw/App/ShapeUtils.cpp index a9e0d9d71f..cd1c4d8907 100644 --- a/src/Mod/TechDraw/App/ShapeUtils.cpp +++ b/src/Mod/TechDraw/App/ShapeUtils.cpp @@ -353,3 +353,26 @@ TopoDS_Shape ShapeUtils::centerShapeXY(const TopoDS_Shape& inShape, const gp_Ax2 Base::Vector3d centroid = DrawUtil::toVector3d(inputCenter); return ShapeUtils::moveShape(inShape, centroid * -1.0); } + +std::pair ShapeUtils::getEdgeEnds(TopoDS_Edge edge) +{ + std::pair result; + TopoDS_Vertex tvFirst, tvLast; + TopExp::Vertices(edge, tvFirst, tvLast); + gp_Pnt gpFirst = BRep_Tool::Pnt(tvFirst); + gp_Pnt gpLast = BRep_Tool::Pnt(tvLast); + + result.first = DU::toVector3d(gpFirst); + result.second = DU::toVector3d(gpLast); + return result; +} + +//! check for shape is null or shape has no subshapes(vertex/edge/face/etc) +//! this handles the case of an empty compound which is not IsNull, but has no +//! content. +bool ShapeUtils::isShapeReallyNull(TopoDS_Shape shape) +{ + // if the shape is null or it has no subshapes, then it is really null + return shape.IsNull() || !TopoDS_Iterator(shape).More(); +} + diff --git a/src/Mod/TechDraw/App/ShapeUtils.h b/src/Mod/TechDraw/App/ShapeUtils.h index e831a8c8b7..5d0225f6bb 100644 --- a/src/Mod/TechDraw/App/ShapeUtils.h +++ b/src/Mod/TechDraw/App/ShapeUtils.h @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -104,6 +105,10 @@ public: static TopoDS_Shape projectSimpleShape(const TopoDS_Shape& shape, const gp_Ax2& CS); static TopoDS_Shape simpleProjection(const TopoDS_Shape& shape, const gp_Ax2& projCS); static TopoDS_Shape projectFace(const TopoDS_Shape& face, const gp_Ax2& CS); + + static std::pair getEdgeEnds(TopoDS_Edge edge); + + static bool isShapeReallyNull(TopoDS_Shape shape); }; } diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index 8329fa4690..2028ad43e3 100644 --- a/src/Mod/TechDraw/Gui/CMakeLists.txt +++ b/src/Mod/TechDraw/Gui/CMakeLists.txt @@ -1,8 +1,5 @@ if(MSVC) - add_definitions(-DHAVE_ATANH -DHAVE_ASINH -DHAVE_ACOSH) add_compile_options(/utf-8) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) endif(MSVC) # In previous versions this target copied mtextedit.h to the binary directory that causes diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index 7d3137d9f2..48cc8d5470 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -2112,7 +2112,7 @@ void QGIViewDimension::drawDistance(TechDraw::DrawViewDimension* dimension, dimension->ExtensionAngle.getValue() * M_PI / 180.0); } else { - drawDistanceExecutive(fromQtApp(linePoints.first()), fromQtApp(linePoints.second()), + drawDistanceExecutive(fromQtApp(linePoints.extensionLineFirst()), fromQtApp(linePoints.extensionLineSecond()), lineAngle, labelRectangle, standardStyle, renderExtent, flipArrows); } } diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw.ts index 704c86144c..341ed0343e 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw - + Add Centerline between 2 Lines @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw - + Add Centerline between 2 Points @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw - + Add Cosmetic Line Through 2 Points @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw - + Insert Annotation @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw - + Insert Center Line - + Add Centerline to Faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw - + Remove Cosmetic Object @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw - + Add Cosmetic Vertex @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw - + Insert Cosmetic Vertex - + Add Cosmetic Vertex @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw - + Change Appearance of Lines - + Change Appearance of selected Lines @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw - + Add Centerline to Faces @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw - + Add Leaderline to View @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw - + Add Midpoint Vertices @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw - + Add Quadrant Vertices @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw - + Insert Rich Text Annotation @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw - + Show/Hide Invisible Edges @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw - + Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw - + Add Welding Information to Leaderline @@ -2020,17 +2020,17 @@ - + Add Midpoint Vertices - + Add Quadrant Vertices - + Create Annotation @@ -2091,10 +2091,16 @@ + Create Cosmetic Line + + + Update CosmeticCircle + + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection - + Can not attach leader. No base View selected. - - - - + + + + You must select a base View for the line. - - + + No DrawViewPart objects in this selection - - + + No base View in Selection. - + You must select Faces or an existing CenterLine. - + No CenterLine in selection. - - - + + + Selection is not a CenterLine. - + Selection not understood. - + You must select 2 Vertexes or an existing CenterLine. - + Need 2 Vertices or 1 CenterLine. - + + Selection is empty. - + Not enough points in selection. - + Selection is not a Cosmetic Line. - + You must select 2 Vertexes. - - + + You must select a base View for the circle. + + + + + Selection is not a Cosmetic edge. + + + + + Please select a center for the circle. + + + + + Nothing selected - + At least 1 object in selection is not a part view - + Unknown object type in selection - + No View in Selection. - + You must select a View and/or lines. - + No Part Views in this selection - + Select exactly one Leader line or one Weld symbol. - - + + SurfaceFinishSymbols - + No Part View in Selection - + No %1 in Selection @@ -3538,11 +3566,13 @@ + Create Cosmetic Line + Edit Cosmetic Line @@ -3678,7 +3708,7 @@ - + @@ -3686,7 +3716,7 @@ - + No object selected @@ -3826,7 +3856,7 @@ it has a weld symbol that would become broken. - + You cannot delete this view because it has one or more dependent views that would become broken. @@ -3840,7 +3870,7 @@ it has a weld symbol that would become broken. - + Object dependencies @@ -8143,7 +8173,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines @@ -8151,7 +8181,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points @@ -8167,7 +8197,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View @@ -8188,7 +8218,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces @@ -8204,7 +8234,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8212,7 +8242,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8890,4 +8920,100 @@ there is an open task dialog. + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + + + + + View + + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + + 2d Point + + + + + Treat the center point as a 3d point and project it onto the parent View. + + + + + 3d Point + + + + + Circle Center + + + + + X: + + + + + Y: + + + + + Z: + + + + + Radius: + + + + + Start Angle: + + + + + End angle (conventional) of arc in degrees. + + + + + End Angle: + + + + + Start angle (conventional) of arc in degrees. + + + + + Arc of Circle + + + + + CmdTechDrawCosmeticCircle + + + TechDraw + + + + + Add Cosmetic Circle + + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_be.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_be.ts index cea300e9a3..a93c79f399 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_be.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_be.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Дадаць цэнтральную лінію паміж дзвюма лініямі @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Дадаць цэнтральную лінію паміж дзвюма кропкамі @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Дадаць вяршыні па сярэдзіне @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Дадаць вяршыні па чатырох крайніх кропках @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw Тэхнічны чарцёж - + Add Centerline between 2 Lines Дадаць цэнтральную лінію паміж дзвюма лініямі @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw Тэхнічны чарцёж - + Add Centerline between 2 Points Дадаць цэнтральную лінію паміж дзвюма кропкамі @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw Тэхнічны чарцёж - + Add Cosmetic Line Through 2 Points Дадаць касметычную лінію праз дзве кропкі @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw Тэхнічны чарцёж - + Insert Annotation Уставіць заметку @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw Тэхнічны чарцёж - + Insert Center Line Уставіць цэнтральную лінію - + Add Centerline to Faces Дадаць цэнтральную лінію на грані @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw Тэхнічны чарцёж - + Remove Cosmetic Object Выдаліць касметычны аб'ект @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw Тэхнічны чарцёж - + Add Cosmetic Vertex Дадаць касметычную вяршыню @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw Тэхнічны чарцёж - + Insert Cosmetic Vertex Уставіць касметычную вяршыню - + Add Cosmetic Vertex Дадаць касметычную вяршыню @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw Тэхнічны чарцёж - + Change Appearance of Lines Змяніць знешні выгляд ліній - + Change Appearance of selected Lines Змяніць знешні выгляд абраных ліній @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw Тэхнічны чарцёж - + Add Centerline to Faces Дадаць цэнтральную лінію на грані @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw Тэхнічны чарцёж - + Add Leaderline to View Дадаць зноску на выгляд @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw Тэхнічны чарцёж - + Add Midpoint Vertices Дадаць вяршыні па сярэдзіне @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw Тэхнічны чарцёж - + Add Quadrant Vertices Дадаць вяршыні па чатырох крайніх кропках @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw Тэхнічны чарцёж - + Insert Rich Text Annotation Уставіць заметку з адфарматаваным тэкстам @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw Тэхнічны чарцёж - + Show/Hide Invisible Edges Паказаць/схаваць нябачныя рэбры @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw Тэхнічны чарцёж - + Create a Surface Finish Symbol Стварыце знак аздаблення паверхні - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Абярыце выгляд<br> - націсніце кнопку<br> - абярыце атрыбуты знака аздаблення паверхні ў панэлі, якая адчынілася @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw Тэхнічны чарцёж - + Add Welding Information to Leaderline Дадаць інфармацыю аб зварным злучэнні ў зноску @@ -2020,17 +2020,17 @@ Захаваць старонку ў файл dxf - + Add Midpoint Vertices Дадаць вяршыні па сярэдзіне - + Add Quadrant Vertices Дадаць вяршыні па чатырох крайніх кропках - + Create Annotation Стварыць заметку @@ -2091,10 +2091,16 @@ Стварыць цэнтральную лінію + Create Cosmetic Line Стварыць касметычную лінію + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Зачыніце дыялогавае акно бягучай задачы і паўтарыце спробу. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Няправільны выбар - + Can not attach leader. No base View selected. Не атрымалася прымацаваць зноску. Асноўны выгляд не абраны. - - - - + + + + You must select a base View for the line. Неабходна абраць асноўны выгляд для лініі. - - + + No DrawViewPart objects in this selection Без аб'ектаў DrawViewPart у абраным - - + + No base View in Selection. Без асноўнага выгляду ў абраным. - + You must select Faces or an existing CenterLine. Неабходна абраць грані ці існуючую цэнтральную лінію. - + No CenterLine in selection. Без цэнтральнай лініі ў абраным. - - - + + + Selection is not a CenterLine. Абрана не цэнтральная лінія. - + Selection not understood. Выбар не зразумелы. - + You must select 2 Vertexes or an existing CenterLine. Неабходна абраць дзве вяршыні ці існуючую цэнтральную лінію. - + Need 2 Vertices or 1 CenterLine. Патрэбныя дзве вяршыні ці адна цэнтральная лінія. - + + Selection is empty. Выбар пусты. - + Not enough points in selection. Абрана недастаткова кропак. - + Selection is not a Cosmetic Line. Абрана не касметычная лінія. - + You must select 2 Vertexes. Неабходна абраць дзве вяршыні. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Нічога не абрана - + At least 1 object in selection is not a part view Прынамсі, адзін абраны аб'ект не з'яўляецца выглядам дэталі - + Unknown object type in selection Невядомы тып аб'екту ў абраным - + No View in Selection. Без выгляду ў абраным. - + You must select a View and/or lines. Неабходна абраць выгляд і/ці лініі. - + No Part Views in this selection Без выглядаў Дэталі ў абраным - + Select exactly one Leader line or one Weld symbol. Абярыце толькі адну лінію зноскі, альбо адзін сімвал зварнога шва. - - + + SurfaceFinishSymbols Знакі аздаблення паверхні - + No Part View in Selection Без выгляду Дэталі ў абраным - + No %1 in Selection Без %1 у абраным @@ -3538,11 +3566,13 @@ Змяніць знак зварнога злучэння + Create Cosmetic Line Стварыць касметычную лінію + Edit Cosmetic Line Змяніць касметычную лінію @@ -3678,7 +3708,7 @@ Без абраных укладзеных элементаў - + @@ -3686,7 +3716,7 @@ Выбар пусты - + No object selected @@ -3829,7 +3859,7 @@ it has a weld symbol that would become broken. Вы не можаце выдаліць лінію зноскі, бо на ёй ёсць знак зварнога шва, які можа стаць пашкоджаным. - + You cannot delete this view because it has one or more dependent views that would become broken. Вы не можаце выдаліць выгляд, бо ў ім ёсць адзін ці некалькі залежных выглядаў, якія могуць стаць пашкоджанымі. @@ -3843,7 +3873,7 @@ it has a weld symbol that would become broken. - + Object dependencies Залежнасці аб'екта @@ -8189,7 +8219,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Дадае цэнтральную лінію паміж дзвюма лініямі @@ -8197,7 +8227,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Дадае цэнтральную лінію паміж двума кропкамі @@ -8213,7 +8243,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Устаўляе касметычную вяршыню ў выгляд @@ -8234,7 +8264,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Дадае цэнтральную лінію на грані @@ -8250,7 +8280,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Устаўляе касметычныя вяршыні ў сярэдняй кропцы абраных рэбраў @@ -8258,7 +8288,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Устаўляе касметычныя вяршыні ў чатырох крайніх кропках абранай акружнасці @@ -8943,4 +8973,100 @@ there is an open task dialog. Геаметрычная штрыхоўка + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Касметычная акружнасць + + + + View + Від + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Дзвюхмерная кропка + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Трохмерная кропка + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Радыус: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + Тэхнічны чарцёж + + + + Add Cosmetic Circle + Дадаць касметычную акружнасць + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ca.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ca.ts index 311e81edd7..91a8ccc838 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ca.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ca.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Afegeix una línia central entre 2 línies @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Afegeix una línia central entre 2 punts @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Afegeix vèrtex de punt central @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Afegeix vèrtexs de quadrant @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Afegeix una línia central entre 2 línies @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Afegeix una línia central entre 2 punts @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Afegeix una línia cosmètica amb 2 punts @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Insereix una anotació @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Insereix Línia Central - + Add Centerline to Faces Afegeix una línia central a les cares @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Lleva un objecte cosmètic @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Afegeix un vèrtex cosmètic @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Insereix un vèrtex cosmètic - + Add Cosmetic Vertex Afegeix un vèrtex cosmètic @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Canvia l'aparença de les línies - + Change Appearance of selected Lines Canvia l'aparença de les línies seleccionades @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Afegeix una línia central a les cares @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Afegeix un línia guia a la vista @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Afegeix vèrtex de punt central @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Afegeix vèrtexs de quadrant @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Insereix una anotació de text enriquit @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Mostra/amaga les arestes invisibles @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Afegeix la informació de soldadura a la línia guia @@ -2020,17 +2020,17 @@ Guardar pàgina com dxf - + Add Midpoint Vertices Afegeix vèrtex de punt central - + Add Quadrant Vertices Afegeix vèrtexs de quadrant - + Create Annotation Crear Anotació @@ -2091,10 +2091,16 @@ Crea una línia central + Create Cosmetic Line Crea una línia cosmètica + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Tanca el quadre de diàleg de tasques actiu i intenta-ho altra vegada. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Selecció incorrecta - + Can not attach leader. No base View selected. No es pot adjuntar la guia. No s'ha seleccionat cap vista de base. - - - - + + + + You must select a base View for the line. Heu de seleccionar una vista de base per a la línia. - - + + No DrawViewPart objects in this selection No hi ha cap objecte DrawViewPart en aquesta selecció - - + + No base View in Selection. No hi ha cap Vista de base en la selecció. - + You must select Faces or an existing CenterLine. Heu de seleccionar cares o una línia central existent. - + No CenterLine in selection. No hi ha cap línia central en la selecció. - - - + + + Selection is not a CenterLine. La selecció no és una línia central. - + Selection not understood. No s'ha entès la selecció. - + You must select 2 Vertexes or an existing CenterLine. Heu de seleccionar 2 vèrtex o una línia central existent. - + Need 2 Vertices or 1 CenterLine. Es necessiten 2 vèrtexs o 1 línia central. - + + Selection is empty. La selecció és buida. - + Not enough points in selection. No hi ha prou punts a la selecció. - + Selection is not a Cosmetic Line. La selecció no és una línia cosmètica. - + You must select 2 Vertexes. S'han de triar 2 vèrtexs. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected No s'ha seleccionat res - + At least 1 object in selection is not a part view Com a mínim 1 objecte de la selecció no és una vista de peça - + Unknown object type in selection Tipus d'objecte desconegut en la selecció - + No View in Selection. No hi ha cap vista en la selecció. - + You must select a View and/or lines. Heu de seleccionar una vista i/o línies. - + No Part Views in this selection No hi ha cap vista de peça en la selecció - + Select exactly one Leader line or one Weld symbol. Seleccioneu exactament una única línia guia o un únic símbol de soldadura. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edita un símbol de soldadura + Create Cosmetic Line Crea una línia cosmètica + Edit Cosmetic Line Edita la línia cosmètica @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3829,7 +3859,7 @@ it has a weld symbol that would become broken. No podeu suprimir aquesta línia guia perquè conté un símbol de soldadura que es trencaria. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3843,7 +3873,7 @@ it has a weld symbol that would become broken. - + Object dependencies Dependències de l'objecte @@ -8184,7 +8214,7 @@ usant l'espaiat X/Y donat TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Afegeix una línia central entre 2 línies @@ -8192,7 +8222,7 @@ usant l'espaiat X/Y donat TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Afegeix una línia central entre 2 punts @@ -8208,7 +8238,7 @@ usant l'espaiat X/Y donat TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Insereix un vèrtex cosmètic en una vista @@ -8229,7 +8259,7 @@ usant l'espaiat X/Y donat TechDraw_FaceCenterLine - + Adds a Centerline to Faces Afegeix una línia central a una cara @@ -8245,7 +8275,7 @@ usant l'espaiat X/Y donat TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Insereix un vèrtex cosmètic en el punt central de les arestes seleccionades @@ -8253,7 +8283,7 @@ usant l'espaiat X/Y donat TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Insereix un vèrtex cosmètic en els punts quadrants dels cercles seleccionats @@ -8940,4 +8970,100 @@ there is an open task dialog. TramaGeom + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Vista + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Punt 2D + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Punt 3D + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Radi: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_cs.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_cs.ts index 5bc2570d09..2c3e757bb0 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_cs.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_cs.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Přidat osu mezi 2 přímky @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Přidat osu mezi 2 body @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Přidat středy hran @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Přidat pravoúhlé vrcholy @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Přidat osu mezi 2 přímky @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Přidat osu mezi 2 body @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Přidat pomocnou čáru mezi dvěma body @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Vložit poznámku @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Vložit středovou osu - + Add Centerline to Faces Přidat osu na plochu/y @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Odebrat pomocný objekt @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Přidat pomocný vrchol @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Vložit pomocný vrchol - + Add Cosmetic Vertex Přidat pomocný vrchol @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Změnit vzhled čar - + Change Appearance of selected Lines Změnit vzhled vybraných čar @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Přidat osu na plochu/y @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Přidat odkazovou čáru do pohledu @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Přidat středy hran @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Přidat pravoúhlé vrcholy @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Vložit poznámku řádkovým textem @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Zobrazit/skrýt neviditelné hrany @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Přidat svarovou informaci na odkazovou čáru @@ -2020,17 +2020,17 @@ Uložit stránku do dxf - + Add Midpoint Vertices Přidat středy hran - + Add Quadrant Vertices Přidat pravoúhlé vrcholy - + Create Annotation Vytvořit poznámku @@ -2091,10 +2091,16 @@ Vytvořit osu + Create Cosmetic Line Vytvořit pomocnou čáru + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Zavřete aktivní dialog úkolů a zkuste to znovu. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Chybný výběr - + Can not attach leader. No base View selected. Nelze připojit vedoucí objekt. Není vybrán základní pohled. - - - - + + + + You must select a base View for the line. Pro čáru je nutno vybrat základní pohled. - - + + No DrawViewPart objects in this selection Ve výběru nejsou objekty DrawViewPart - - + + No base View in Selection. Ve výběru není základní pohled. - + You must select Faces or an existing CenterLine. Musíte vybrat plochy nebo existující osu. - + No CenterLine in selection. Žádná osa ve výběru. - - - + + + Selection is not a CenterLine. Výběr není osa. - + Selection not understood. Výběru nelze rozumět. - + You must select 2 Vertexes or an existing CenterLine. Musíte vybrat 2 vrcholy nebo existující osu. - + Need 2 Vertices or 1 CenterLine. Potřebuje 2 vrcholy nebo 1 osu. - + + Selection is empty. Výběr je prázdný. - + Not enough points in selection. Nedostatek bodů ve výběru. - + Selection is not a Cosmetic Line. Výběr není pomocná čára. - + You must select 2 Vertexes. Musíte vybrat 2 vrcholy. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Není nic vybráno - + At least 1 object in selection is not a part view Minimálně 1 objekt ve výběru není součástí zobrazení dílu - + Unknown object type in selection Ve výběru je neznámý typ objektu - + No View in Selection. Ve výběru není žádný pohled. - + You must select a View and/or lines. Musíte vybrat pohled a/nebo čáry. - + No Part Views in this selection Žádné pohledy součásti ve výběru - + Select exactly one Leader line or one Weld symbol. Vybrat přesně jednu odkazovou čáru, nebo jeden symbol svaru. - - + + SurfaceFinishSymbols SurfaceFinishSymboly - + No Part View in Selection Ve výběru není zobrazena žádná část - + No %1 in Selection Žádný %1 ve výběru @@ -3538,11 +3566,13 @@ Upravit symbol svařování + Create Cosmetic Line Vytvořit pomocnou čáru + Edit Cosmetic Line Upravit pomocnou čáru @@ -3678,7 +3708,7 @@ Nejsou vybrány žádné dílčí položky - + @@ -3686,7 +3716,7 @@ Výběr je prázdný - + No object selected @@ -3829,7 +3859,7 @@ it has a weld symbol that would become broken. Nemůžete smazat tento odkaz, protože obsahuje symbol svaru, který by se rozbil. - + You cannot delete this view because it has one or more dependent views that would become broken. Nemůžete smazat tento názor, protože má jeden nebo více závislých názorů, které by byly porušeny. @@ -3843,7 +3873,7 @@ it has a weld symbol that would become broken. - + Object dependencies Závislosti objektu @@ -8193,7 +8223,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Přidat osu mezi dvě čáry @@ -8201,7 +8231,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Přidat osu mezi dva body @@ -8217,7 +8247,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8238,7 +8268,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8254,7 +8284,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8262,7 +8292,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8949,4 +8979,100 @@ je zde otevřený dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Kosmetický kruh + + + + View + Pohled + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Bod + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Bod + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Poloměr: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Přidat Kosmetický kruh + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_de.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_de.ts index 0f407f8483..b867b64d3f 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_de.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_de.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Mittelline zwischen 2 Linien hinzufügen @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Mittelline zwischen 2 Punkten hinzufügen @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Kantenmittelpunkte hinzufügen @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Quadrantengrenzpunkte hinzufügen @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Mittelline zwischen 2 Linien hinzufügen @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Mittelline zwischen 2 Punkten hinzufügen @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Hilfslinie durch 2 Punkte hinzufügen @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Anmerkung einfügen @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Mittellinie einfügen - + Add Centerline to Faces Mittellinie zu Fläche(n) hinzufügen @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Hilfsobjekt entfernen @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Hilfspunkt hinzufügen @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Hilfspunkt einfügen - + Add Cosmetic Vertex Hilfspunkt hinzufügen @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Liniendarstellung ändern - + Change Appearance of selected Lines Liniendarstellung ausgewählter Linien ändern @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Mittellinie zu Fläche(n) hinzufügen @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Hinweislinie zur Ansicht hinzufügen @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Kantenmittelpunkte hinzufügen @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Quadrantengrenzpunkte hinzufügen @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Rich-Text-Anmerkung einfügen @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Ausgeblendete Kanten ein-/ausblenden @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Oberflächensymbol erstellen - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Eine Ansicht auswählen<br> - Auf diese Schaltfläche klicken<br> - Attribute für die Oberflächensymbole im geöffneten Dialogfenster auswählen @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Hinzufügen von Schweißinformationen zur Hinweislinie @@ -2020,17 +2020,17 @@ Seite als dxf speichern - + Add Midpoint Vertices Kantenmittelpunkte hinzufügen - + Add Quadrant Vertices Quadrantengrenzpunkte hinzufügen - + Create Annotation Anmerkung erstellen @@ -2091,10 +2091,16 @@ Mittellinie erstellen + Create Cosmetic Line Hilfslinie erstellen + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Den aktiven Aufgaben-Dialog schliessen und erneut versuchen. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Falsche Auswahl - + Can not attach leader. No base View selected. Kann die Hinweislinie nicht hinzufügen. Es wurde keine Basisansicht ausgewählt. - - - - + + + + You must select a base View for the line. Sie müssen eine Basisansicht für die Linie auswählen. - - + + No DrawViewPart objects in this selection Keine DrawViewPart-Objekte in dieser Auswahl - - + + No base View in Selection. Keine Basisansicht ausgewählt. - + You must select Faces or an existing CenterLine. Sie müssen Flächen oder eine vorhandene Mittellinie auswählen. - + No CenterLine in selection. Keine Mittellinie ausgewählt. - - - + + + Selection is not a CenterLine. Auswahl ist keine Mittellinie. - + Selection not understood. Auswahl nicht verstanden. - + You must select 2 Vertexes or an existing CenterLine. Sie müssen 2 Punkte oder eine vorhandene Mittellinie auswählen. - + Need 2 Vertices or 1 CenterLine. Es werden 2 Punkte oder 1 Mittellinie benötigt. - + + Selection is empty. Auswahl ist leer. - + Not enough points in selection. Nicht genügend Punkte ausgewählt. - + Selection is not a Cosmetic Line. Auswahl ist keine Hilfslinie. - + You must select 2 Vertexes. Es müssen 2 Knotenpunkte ausgewählt werden. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nichts ausgewählt - + At least 1 object in selection is not a part view Mindestens 1 Objekt in der Auswahl ist keine Bauteilansicht - + Unknown object type in selection Unbekannter Objekttyp in der Auswahl - + No View in Selection. Keine Ansicht in der Auswahl. - + You must select a View and/or lines. Sie müssen eine Ansicht und / oder Linien auswählen. - + No Part Views in this selection Keine Fläche in dieser Auswahl - + Select exactly one Leader line or one Weld symbol. Auswahl genau einer Hinweislinie oder eines Schweißsymbols. - - + + SurfaceFinishSymbols Oberflächensymbole - + No Part View in Selection Keine Bauteilansicht ausgewählt - + No %1 in Selection Kein %1 in der Auswahl @@ -3538,11 +3566,13 @@ Schweißsymbol bearbeiten + Create Cosmetic Line Hilfslinie erstellen + Edit Cosmetic Line Hilfslinie bearbeiten @@ -3678,7 +3708,7 @@ Keine Unterelemente ausgewählt - + @@ -3686,7 +3716,7 @@ Nichts ausgewählt - + No object selected @@ -3829,7 +3859,7 @@ it has a weld symbol that would become broken. Diese Hinweislinie kann nicht gelöscht werden, weil ihr ein Schweißsymbol zugeordnet ist, das dadurch unbrauchbar werden würde. - + You cannot delete this view because it has one or more dependent views that would become broken. Diese Ansicht kann nicht gelöscht werden, da von ihr eine oder mehrere Ansichten abhängen, die beschädigt werden könnten. @@ -3843,7 +3873,7 @@ it has a weld symbol that would become broken. - + Object dependencies Objektabhängigkeiten @@ -5921,7 +5951,7 @@ Do you want to continue? Dot - Punkt + Punktlinie @@ -7125,7 +7155,7 @@ Du kannst weitere Punkte auswählen, um Liniensegmente zu erhalten. Dot - Punkt + Punktlinie @@ -7228,7 +7258,7 @@ Du kannst weitere Punkte auswählen, um Liniensegmente zu erhalten. Dot - Punkt + Punktlinie @@ -7701,7 +7731,7 @@ mit dem vorgegebenen X/Y-Abstand Dot - Punkt + Punktlinie @@ -8183,7 +8213,7 @@ mit dem vorgegebenen X/Y-Abstand TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Fügt eine Mittelline zwischen 2 Linien hinzu @@ -8191,7 +8221,7 @@ mit dem vorgegebenen X/Y-Abstand TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Fügt eine Mittelline zwischen 2 Punkten hinzu @@ -8207,7 +8237,7 @@ mit dem vorgegebenen X/Y-Abstand TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Fügt einen Hilfspunkt in eine Ansicht ein @@ -8228,7 +8258,7 @@ mit dem vorgegebenen X/Y-Abstand TechDraw_FaceCenterLine - + Adds a Centerline to Faces Fügt Flächen eine Mittellinie hinzu @@ -8244,7 +8274,7 @@ mit dem vorgegebenen X/Y-Abstand TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Fügt Hilfspunkte mittig auf den ausgewählten Kanten ein @@ -8252,7 +8282,7 @@ mit dem vorgegebenen X/Y-Abstand TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Fügt Hilfspunkte auf den Quadrantengrenzen ausgewählter Kreise ein @@ -8939,4 +8969,100 @@ noch ein Aufgaben-Dialog geöffnet ist. Geometrische Schraffur + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Hilfskreis + + + + View + Ansicht + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2D-Punkt + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3D-Punkt + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Radius: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Hilfskreis hinzufügen + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_el.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_el.ts index 27cbd917fe..441915b702 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_el.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_el.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Προσθήκη Κέντρου μεταξύ 2 Γραμμών @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Προσθήκη Κέντρου μεταξύ 2 Σημείων @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Add Midpoint Vertices @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Προσθήκη Κατακόρυφων Τεταρτημορίων @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw Τεχνική Σχεδίαση - + Add Centerline between 2 Lines Προσθήκη Κέντρου μεταξύ 2 Γραμμών @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw Τεχνική Σχεδίαση - + Add Centerline between 2 Points Προσθήκη Κέντρου μεταξύ 2 Σημείων @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw Τεχνική Σχεδίαση - + Add Cosmetic Line Through 2 Points Add Cosmetic Line Through 2 Points @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw Τεχνική Σχεδίαση - + Insert Annotation Εισαγωγή Περιγραφής @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw Τεχνική Σχεδίαση - + Insert Center Line Insert Center Line - + Add Centerline to Faces Add Centerline to Faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw Τεχνική Σχεδίαση - + Remove Cosmetic Object Remove Cosmetic Object @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw Τεχνική Σχεδίαση - + Add Cosmetic Vertex Add Cosmetic Vertex @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw Τεχνική Σχεδίαση - + Insert Cosmetic Vertex Insert Cosmetic Vertex - + Add Cosmetic Vertex Add Cosmetic Vertex @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw Τεχνική Σχεδίαση - + Change Appearance of Lines Change Appearance of Lines - + Change Appearance of selected Lines Change Appearance of selected Lines @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw Τεχνική Σχεδίαση - + Add Centerline to Faces Add Centerline to Faces @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw Τεχνική Σχεδίαση - + Add Leaderline to View Add Leaderline to View @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw Τεχνική Σχεδίαση - + Add Midpoint Vertices Add Midpoint Vertices @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw Τεχνική Σχεδίαση - + Add Quadrant Vertices Προσθήκη Κατακόρυφων Τεταρτημορίων @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw Τεχνική Σχεδίαση - + Insert Rich Text Annotation Εισαγάγετε σχολιασμό εμπλουτισμένου κειμένου @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw Τεχνική Σχεδίαση - + Show/Hide Invisible Edges Show/Hide Invisible Edges @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw Τεχνική Σχεδίαση - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw Τεχνική Σχεδίαση - + Add Welding Information to Leaderline Add Welding Information to Leaderline @@ -2020,17 +2020,17 @@ Save page to dxf - + Add Midpoint Vertices Add Midpoint Vertices - + Add Quadrant Vertices Προσθήκη Κατακόρυφων Τεταρτημορίων - + Create Annotation Δημιουργία Σημείωσης @@ -2091,10 +2091,16 @@ Create CenterLine + Create Cosmetic Line Create Cosmetic Line + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Close active task dialog and try again. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Wrong Selection - + Can not attach leader. No base View selected. Can not attach leader. No base View selected. - - - - + + + + You must select a base View for the line. You must select a base View for the line. - - + + No DrawViewPart objects in this selection No DrawViewPart objects in this selection - - + + No base View in Selection. No base View in Selection. - + You must select Faces or an existing CenterLine. You must select Faces or an existing CenterLine. - + No CenterLine in selection. No CenterLine in selection. - - - + + + Selection is not a CenterLine. Selection is not a CenterLine. - + Selection not understood. Selection not understood. - + You must select 2 Vertexes or an existing CenterLine. You must select 2 Vertexes or an existing CenterLine. - + Need 2 Vertices or 1 CenterLine. Need 2 Vertices or 1 CenterLine. - + + Selection is empty. Selection is empty. - + Not enough points in selection. Not enough points in selection. - + Selection is not a Cosmetic Line. Selection is not a Cosmetic Line. - + You must select 2 Vertexes. You must select 2 Vertexes. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nothing selected - + At least 1 object in selection is not a part view At least 1 object in selection is not a part view - + Unknown object type in selection Unknown object type in selection - + No View in Selection. No View in Selection. - + You must select a View and/or lines. You must select a View and/or lines. - + No Part Views in this selection No Part Views in this selection - + Select exactly one Leader line or one Weld symbol. Select exactly one Leader line or one Weld symbol. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edit Welding Symbol + Create Cosmetic Line Create Cosmetic Line + Edit Cosmetic Line Edit Cosmetic Line @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. it has a weld symbol that would become broken. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies Εξαρτήσεις αντικειμένου @@ -8197,7 +8227,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Adds a Centerline between 2 Lines @@ -8205,7 +8235,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Adds a Centerline between 2 Points @@ -8221,7 +8251,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8242,7 +8272,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8258,7 +8288,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8266,7 +8296,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8953,4 +8983,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Προβολή + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Point + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Point + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Ακτίνα: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + Τεχνική Σχεδίαση + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_es-AR.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_es-AR.ts index 5c999b5011..a4333e75ba 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_es-AR.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_es-AR.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Agregar línea de centro entre 2 líneas @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Agregar línea de centro entre 2 puntos @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Agregar punto medio @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Agregar vértices de cuadrantes @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw DibujoTécnico - + Add Centerline between 2 Lines Agregar línea de centro entre 2 líneas @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw DibujoTécnico - + Add Centerline between 2 Points Agregar línea de centro entre 2 puntos @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw DibujoTécnico - + Add Cosmetic Line Through 2 Points Agregar línea adicional a través de 2 puntos @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw DibujoTécnico - + Insert Annotation Insertar anotación @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw DibujoTécnico - + Insert Center Line Insertar línea de centro - + Add Centerline to Faces Agregar línea de centro a caras @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw DibujoTécnico - + Remove Cosmetic Object Eliminar objeto adicional @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw DibujoTécnico - + Add Cosmetic Vertex Agregar vértice adicional @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw DibujoTécnico - + Insert Cosmetic Vertex Insertar vértice adicional - + Add Cosmetic Vertex Agregar vértice adicional @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw DibujoTécnico - + Change Appearance of Lines Cambiar apariencia de líneas - + Change Appearance of selected Lines Cambia la apariencia de las líneas seleccionadas @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw DibujoTécnico - + Add Centerline to Faces Agregar línea de centro a caras @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw DibujoTécnico - + Add Leaderline to View Agregar línea de referencia a la Vista @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw DibujoTécnico - + Add Midpoint Vertices Agregar punto medio @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw DibujoTécnico - + Add Quadrant Vertices Agregar vértices de cuadrantes @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw DibujoTécnico - + Insert Rich Text Annotation Insertar anotación de texto enriquecido @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw DibujoTécnico - + Show/Hide Invisible Edges Mostrar/ocultar aristas invisibles @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw DibujoTécnico - + Create a Surface Finish Symbol Crear un símbolo de acabado superficial - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Seleccione una vista<br> - haga clic en este botón<br> - seleccione los atributos del símbolo de acabado de superficie en el panel abierto @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw DibujoTécnico - + Add Welding Information to Leaderline Agregar información de soldadura a la Línea de referencia @@ -2020,17 +2020,17 @@ Guardar página como dxf - + Add Midpoint Vertices Agregar punto medio - + Add Quadrant Vertices Agregar vértices de cuadrantes - + Create Annotation Crear anotación @@ -2091,10 +2091,16 @@ Crear línea central + Create Cosmetic Line Crear Línea Adicional + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2294,7 +2300,7 @@ TechDraw Thread Bolt Side - TechDraw Thread Bolt Side + Rosca de perno lateral de TechDraw @@ -2304,7 +2310,7 @@ TechDraw Thread Hole Bottom - TechDraw Thread Hole Bottom + Agujero de rosca inferior de TechDraw @@ -2314,7 +2320,7 @@ TechDraw Thread Bolt Bottom - TechDraw Thread Bolt Bottom + Rosca de perno lateral de TechDraw @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Cerrar diálogo de tareas activo e inténtelo de nuevo. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Selección Incorrecta - + Can not attach leader. No base View selected. No se puede adjuntar directriz. No se ha seleccionado la Vista base. - - - - + + + + You must select a base View for the line. Debe seleccionar una Vista base para la línea. - - + + No DrawViewPart objects in this selection No hay objetos DibujoVistaPieza en esta selección - - + + No base View in Selection. No hay Vista base en la Selección. - + You must select Faces or an existing CenterLine. Debe seleccionar Caras o una Línea de Centro existente. - + No CenterLine in selection. No hay Línea de Centro en la selección. - - - + + + Selection is not a CenterLine. La selección no es una Línea de Centro. - + Selection not understood. Selección no entendida. - + You must select 2 Vertexes or an existing CenterLine. Debe seleccionar 2 Vértices o una Línea de Centro existente. - + Need 2 Vertices or 1 CenterLine. Necesita 2 vértices o una Línea de Centro. - + + Selection is empty. La selección está vacía. - + Not enough points in selection. No hay suficientes puntos en la selección. - + Selection is not a Cosmetic Line. La selección no es una Línea Adicional. - + You must select 2 Vertexes. Debe seleccionar 2 Vértices. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nada seleccionado - + At least 1 object in selection is not a part view Al menos 1 objeto en la selección no es una vista de pieza - + Unknown object type in selection Tipo de objeto desconocido en la selección - + No View in Selection. No hay Vista en la Selección. - + You must select a View and/or lines. Debe seleccionar una Vista y/o líneas. - + No Part Views in this selection No hay Vistas de Piezas en esta selección - + Select exactly one Leader line or one Weld symbol. Seleccione exactamente una línea de referencia o un símbolo de Soldadura. - - + + SurfaceFinishSymbols SímbolosdeAcabadoSuperficial - + No Part View in Selection Ninguna vista de partes en la selección - + No %1 in Selection No hay %1 en la selección @@ -3538,11 +3566,13 @@ Editar Símbolo de Soldadura + Create Cosmetic Line Crear Línea Adicional + Edit Cosmetic Line Editar Línea Adicional @@ -3678,7 +3708,7 @@ No hay sub-elementos seleccionados - + @@ -3686,7 +3716,7 @@ La selección está vacía - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. tiene un símbolo de soldadura que se rompería. - + You cannot delete this view because it has one or more dependent views that would become broken. No puede eliminar esta vista porque tiene una o más vistas dependientes que se romperían. @@ -3844,7 +3874,7 @@ tiene un símbolo de soldadura que se rompería. - + Object dependencies Dependencias del objeto @@ -8195,7 +8225,7 @@ usando el espacio X/Y dado TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Agrega una línea de centro entre 2 líneas @@ -8203,7 +8233,7 @@ usando el espacio X/Y dado TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Agrega una línea de centro entre 2 puntos @@ -8219,7 +8249,7 @@ usando el espacio X/Y dado TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserta un vértice adicional en una Vista @@ -8240,7 +8270,7 @@ usando el espacio X/Y dado TechDraw_FaceCenterLine - + Adds a Centerline to Faces Agrega una línea de centro a las caras @@ -8256,7 +8286,7 @@ usando el espacio X/Y dado TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserta vértices adicionales en el punto medio de las aristas seleccionadas @@ -8264,7 +8294,7 @@ usando el espacio X/Y dado TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserta vértices adicionales en los cuadrantes de los círculos seleccionados @@ -8951,4 +8981,100 @@ hay un diálogo de tareas abiertas. RayadoGeométrico + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Círculo cosmético + + + + View + Ver + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Punto 2d + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Punto 3d + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Radio: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + DibujoTécnico + + + + Add Cosmetic Circle + Agregar círculo adicional + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_es-ES.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_es-ES.ts index 1dd7ec343a..519bbcd477 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_es-ES.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_es-ES.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Añadir Línea Central entre 2 Líneas @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Añadir Línea Central entre 2 Puntos @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Añadir Vértices de Punto Medio @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Añadir Vértices de Cuadrante @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw Dibujo técnico - + Add Centerline between 2 Lines Añadir Línea Central entre 2 Líneas @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw Dibujo técnico - + Add Centerline between 2 Points Añadir Línea Central entre 2 Puntos @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw Dibujo técnico - + Add Cosmetic Line Through 2 Points Añadir Línea Cosmética a través 2 puntos @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw Dibujo técnico - + Insert Annotation Insertar anotación @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw Dibujo técnico - + Insert Center Line Insertar Línea Central - + Add Centerline to Faces Añadir línea central a las caras @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw Dibujo técnico - + Remove Cosmetic Object Eliminar Objeto Cosmético @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw Dibujo técnico - + Add Cosmetic Vertex Añadir vértice cosmético @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw Dibujo técnico - + Insert Cosmetic Vertex Insertar vértice cosmético - + Add Cosmetic Vertex Añadir vértice cosmético @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw Dibujo técnico - + Change Appearance of Lines Cambiar el aspecto de las líneas - + Change Appearance of selected Lines Cambiar apariencia de las líneas seleccionadas @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw Dibujo técnico - + Add Centerline to Faces Añadir línea central a las caras @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw Dibujo técnico - + Add Leaderline to View Agregar Línea de Referencia a la Vista @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw Dibujo técnico - + Add Midpoint Vertices Añadir Vértices de Punto Medio @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw Dibujo técnico - + Add Quadrant Vertices Añadir Vértices de Cuadrante @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw Dibujo técnico - + Insert Rich Text Annotation Insertar Anotación de Texto Enriquecido @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw Dibujo técnico - + Show/Hide Invisible Edges Mostrar/Ocultar Bordes Invisibles @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw Dibujo técnico - + Create a Surface Finish Symbol Crear un símbolo de acabado superficial - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Seleccione una vista<br> - haga clic en este botón<br> - seleccione los atributos del símbolo de acabado de superficie en el panel abierto @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw Dibujo técnico - + Add Welding Information to Leaderline Agregar Información de Soldadura a la Línea de Referencia @@ -2020,17 +2020,17 @@ Guardar página como dxf - + Add Midpoint Vertices Añadir Vértices de Punto Medio - + Add Quadrant Vertices Añadir Vértices de Cuadrante - + Create Annotation Crear Anotación @@ -2091,10 +2091,16 @@ Crear Línea Central + Create Cosmetic Line Crear Línea Cosmética + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2164,7 +2170,7 @@ TechDraw Insert Prefix - TechDraw Insert Prefix + Insertar prefijo de TechDraw @@ -2174,7 +2180,7 @@ TechDraw Remove Prefix - TechDraw Remove Prefix + Eliminar prefijo de TechDraw @@ -2294,7 +2300,7 @@ TechDraw Thread Bolt Side - TechDraw Thread Bolt Side + Rosca de perno lateral de TechDraw @@ -2304,7 +2310,7 @@ TechDraw Thread Hole Bottom - TechDraw Thread Hole Bottom + Agujero de rosca inferior de TechDraw @@ -2314,7 +2320,7 @@ TechDraw Thread Bolt Bottom - TechDraw Thread Bolt Bottom + Rosca de perno lateral de TechDraw @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Cerrar diálogo de tareas activo e inténtelo de nuevo. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Selección Incorrecta - + Can not attach leader. No base View selected. No se puede adjuntar directriz. No se ha seleccionado la vista base. - - - - + + + + You must select a base View for the line. Debe seleccionar una vista base para la línea. - - + + No DrawViewPart objects in this selection No hay objetos DrawViewPart en esta selección - - + + No base View in Selection. No hay Vista base en la selección. - + You must select Faces or an existing CenterLine. Debe seleccionar una(s) cara(s) o una línea central existente. - + No CenterLine in selection. No hay Línea Central en la selección. - - - + + + Selection is not a CenterLine. La selección no es una línea central. - + Selection not understood. Selección no entendida. - + You must select 2 Vertexes or an existing CenterLine. Debe seleccionar 2 Vértices o una Línea Central existente. - + Need 2 Vertices or 1 CenterLine. Necesita 2 vértices o una línea central. - + + Selection is empty. La selección está vacía. - + Not enough points in selection. No hay suficientes puntos en la selección. - + Selection is not a Cosmetic Line. La selección no es una Línea Cosmética. - + You must select 2 Vertexes. Debe seleccionar 2 Vértices. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nada seleccionado - + At least 1 object in selection is not a part view Al menos 1 objeto en la selección no es una vista de pieza - + Unknown object type in selection Tipo de objeto desconocido en la selección - + No View in Selection. No hay Vista en la Selección. - + You must select a View and/or lines. Debe seleccionar una vista y/o líneas. - + No Part Views in this selection No hay Vistas de Piezas en esta selección - + Select exactly one Leader line or one Weld symbol. Seleccione exactamente una Línea de referencia o un símbolo de Soldadura. - - + + SurfaceFinishSymbols SímbolosdeAcabadoSuperficial - + No Part View in Selection No hay Vista de parte en la selección - + No %1 in Selection No hay %1 en la selección @@ -3538,11 +3566,13 @@ Editar Símbolo de Soldadura + Create Cosmetic Line Crear Línea Cosmética + Edit Cosmetic Line Editar línea Cosmética @@ -3678,7 +3708,7 @@ No hay subelementos seleccionados - + @@ -3686,7 +3716,7 @@ No ha seleccionado nada - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. tiene un símbolo de soldadura que se rompería. - + You cannot delete this view because it has one or more dependent views that would become broken. No se puede borrar esta vista porque tiene una o más vistas dependientes que se romperían. @@ -3844,7 +3874,7 @@ tiene un símbolo de soldadura que se rompería. - + Object dependencies Dependencias del objeto @@ -8195,7 +8225,7 @@ usando el Espaciado X/Y dado TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Añade una Línea Central entre 2 Líneas @@ -8203,7 +8233,7 @@ usando el Espaciado X/Y dado TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Añade una Línea Central entre 2 puntos @@ -8219,7 +8249,7 @@ usando el Espaciado X/Y dado TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserta un Vértice Cosmético en una Vista @@ -8240,7 +8270,7 @@ usando el Espaciado X/Y dado TechDraw_FaceCenterLine - + Adds a Centerline to Faces Añade una Línea Central a las Caras @@ -8256,7 +8286,7 @@ usando el Espaciado X/Y dado TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserta Vértices Cosméticos en el Punto Medio de las aristas seleccionadas @@ -8264,7 +8294,7 @@ usando el Espaciado X/Y dado TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserta Vértices Cosméticos en los Puntos Cuadrantes de los círculos seleccionados @@ -8661,11 +8691,11 @@ usando el Espaciado X/Y dado - click the tool button, a panel opens<br> - select shaft fit / hole fit<br> - select the desired ISO 286 fit field using the combo box - Add a hole or shaft fit to a dimension<br> - - select one length dimension or diameter dimension<br> - - click the tool button, a panel opens<br> - - select shaft fit / hole fit<br> - - select the desired ISO 286 fit field using the combo box + Añade un agujero o ajuste a una dimensión<br> + - selecciona una dimensión de longitud o diámetro<br> + - haz clic en el botón de herramienta, un panel se abre<br> + - seleccione ajuste de eje / ajuste de agujero<br> + - seleccione el campo de ajuste ISO 286 deseado usando la caja de combo @@ -8950,4 +8980,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Círculo cosmético + + + + View + Vista + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Punto 2d + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Punto 3d + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Radio: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + Dibujo técnico + + + + Add Cosmetic Circle + Añadir círculo cosmético + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_eu.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_eu.ts index 00eaaebf4e..cdb9a4c4e8 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_eu.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_eu.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Gehitu 2 lerroren arteko erdiko lerroa @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Gehitu 2 punturen arteko erdiko lerroa @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Gehitu erdiko puntuko erpinak @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Gehitu koadrante-erpinak @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Gehitu 2 lerroren arteko erdiko lerroa @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Gehitu 2 punturen arteko erdiko lerroa @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Gehitu lerro kosmetikoa 2 puntu zeharkatuta @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Txertatu oharpena @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Txertatu erdiko lerroa - + Add Centerline to Faces Gehitu erdiko lerroa aurpegiei @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Kendu objektu kosmetikoa @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Gehitu erpin kosmetikoa @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Txertatu erpin kosmetikoa - + Add Cosmetic Vertex Gehitu erpin kosmetikoa @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Aldatu lerroen itxura - + Change Appearance of selected Lines Aldatu hautatutako lerroen itxura @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Gehitu erdiko lerroa aurpegiei @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Gehitu gida-marra bistari @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Gehitu erdiko puntuko erpinak @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Gehitu koadrante-erpinak @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Txertatu testu aberatseko oharpena @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Erakutsi/ezkutatu ertz ikusezinak @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Sortu gainazalaren amaierarako ikurra - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Hautatu bista bat<br> - egin klik botoi honetan<br> - irekitako panelean, hautatu gainazalaren amaierarako ikurraren atributuak @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Gehitu soldadura-informazioa gida-marrari @@ -2020,17 +2020,17 @@ Gorde orria DXF fitxategi batean - + Add Midpoint Vertices Gehitu erdiko puntuko erpinak - + Add Quadrant Vertices Gehitu koadrante-erpinak - + Create Annotation Sortu oharpena @@ -2091,10 +2091,16 @@ Sortu erdiko lerroa + Create Cosmetic Line Sortu lerro kosmetikoa + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Itxi ataza aktiboaren elkarrizketa-koadroa eta saiatu berriro. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Hautapen okerra - + Can not attach leader. No base View selected. Ezin da gida-marra erantsi. Ez da oinarrizko bistarik hautatu. - - - - + + + + You must select a base View for the line. Oinarrizko bista bat hautatu behar duzu lerrorako. - - + + No DrawViewPart objects in this selection Ez dago marrazki-piezaren bistarik hautapen honetan - - + + No base View in Selection. Ez dago oinarri-bistarik hautapenean. - + You must select Faces or an existing CenterLine. Aurpegiak edo lehendik dagoen erdiko lerro bat hautatu behar duzu. - + No CenterLine in selection. Ez dago erdiko lerrorik hautapenean. - - - + + + Selection is not a CenterLine. Hautapena ez da erdiko lerroa. - + Selection not understood. Hautapena ez da ulertzen. - + You must select 2 Vertexes or an existing CenterLine. 2 erpin edo lehendik dagoen erdiko lerro bat hautatu behar duzu. - + Need 2 Vertices or 1 CenterLine. 2 erpin edo erdiko lerro 1 behar da. - + + Selection is empty. Hautapena hutsik dago. - + Not enough points in selection. Ez dago nahiko punturik hautapenean. - + Selection is not a Cosmetic Line. Hautapena ez da lerro kosmetikoa. - + You must select 2 Vertexes. Bi erpin hautatu behar dituzu. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Ez da ezer hautatu - + At least 1 object in selection is not a part view Hautapeneko objektu bat gutxienez ez da pieza-bista bat - + Unknown object type in selection Objektu-forma ezezaguna hautapenean - + No View in Selection. Ez dago bistarik hautapenean. - + You must select a View and/or lines. Bista bat eta/edo lerroak hautatu behar dituzu. - + No Part Views in this selection Ez dago pieza-bistarik hautapen honetan - + Select exactly one Leader line or one Weld symbol. Hautatu gida-marra bakar bat edo soldadura-ikur bakar bat. - - + + SurfaceFinishSymbols Gainazalen amaierarako ikurrak - + No Part View in Selection Ez dago pieza-bistarik hautapenean - + No %1 in Selection Ez dago %1 hautapenean @@ -3538,11 +3566,13 @@ Editatu soldadura-ikurra + Create Cosmetic Line Sortu lerro kosmetikoa + Edit Cosmetic Line Editatu lerro kosmetikoa @@ -3678,7 +3708,7 @@ Ez da azpielementurik hautatu - + @@ -3686,7 +3716,7 @@ Hautapena hutsik dago - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. hautsi daitekeen soldadura-ikur bat duelako. - + You cannot delete this view because it has one or more dependent views that would become broken. Ezin da bista hau ezabatu, hautsita geratuko liratekeen mendeko bista bat edo gehiago dituelako. @@ -3844,7 +3874,7 @@ hautsi daitekeen soldadura-ikur bat duelako. - + Object dependencies Objektuaren mendekotasunak @@ -8198,7 +8228,7 @@ emandako X/Y espazioa erabilita TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Erdiko lerro bat gehitzen du 2 lerroren artean @@ -8206,7 +8236,7 @@ emandako X/Y espazioa erabilita TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Erdiko lerro bat gehitzen du 2 punturen artean @@ -8222,7 +8252,7 @@ emandako X/Y espazioa erabilita TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Erpin kosmetikoa txertatzen du bista batean @@ -8243,7 +8273,7 @@ emandako X/Y espazioa erabilita TechDraw_FaceCenterLine - + Adds a Centerline to Faces Erdiko lerro bat gehitzen die aurpegiei @@ -8259,7 +8289,7 @@ emandako X/Y espazioa erabilita TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Erpin kosmetikoak txertatzen ditu hautatutako ertzen erdiko puntuan @@ -8267,7 +8297,7 @@ emandako X/Y espazioa erabilita TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Erpin kosmetikoak txertatzen ditu hautatutako zirkuluen koadrante-puntuetan @@ -8954,4 +8984,100 @@ elkarrizketa-koadroa irekita dagoelako. Itzaleztadura geometrikoa + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Zirkulu kosmetikoa + + + + View + Bista + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d puntua + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d puntua + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Erradioa: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Gehitu zirkulu kosmetikoa + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_fi.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_fi.ts index 69f3bbe890..5270638786 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_fi.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_fi.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Lisää keskilinja 2:n viivan väliin @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Lisää keskilinja 2:n pisteen väliin @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Lisää reunoihin keskipisteet @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Lisää kvadranttien pisteet @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Lisää keskilinja 2:n viivan väliin @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Lisää keskilinja 2:n pisteen väliin @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Lisää kosmeettinen viiva 2 pisteen kautta @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Lisää huomautus @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Lisää keskilinja - + Add Centerline to Faces Lisää keskiviiva pintaan @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Poista kosmeettinen objekti @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Lisää kosmeettinen apupiste @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Sijoita kosmeettinen apupiste - + Add Cosmetic Vertex Lisää kosmeettinen apupiste @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Muokkaa viivojen tyyliä - + Change Appearance of selected Lines Muuta valittujen viivojen tyyliä @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Lisää keskiviiva pintaan @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Lisää Reittiviiva näkymään @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Lisää reunoihin keskipisteet @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Lisää kvadranttien pisteet @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Lisää rich text -tekstimerkintä @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Näytä/piilota näkymättömät reunat @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Valitse näkymä <br> klikkaa tätä painiketta <br> valitse pinnanlaatu symboli valikosta @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Lisää hitsaustiedot Reittiviivaan @@ -2020,17 +2020,17 @@ Tallenna sivu dxf-muotoon - + Add Midpoint Vertices Lisää reunoihin keskipisteet - + Add Quadrant Vertices Lisää kvadranttien pisteet - + Create Annotation Lisää huomautus @@ -2091,10 +2091,16 @@ Luo Keskilinja + Create Cosmetic Line Luo kosmeettinen viiva + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Sulje aktiivisen toiminnon syöttöikkuna ja yritä uudelleen. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Väärä valinta - + Can not attach leader. No base View selected. Reittiviivaa ei voida kiinnittää mihinkään, koska Näkymää ei ole valittuna. - - - - + + + + You must select a base View for the line. Jokin Perusnäkymä pitää valita viivan kiinnitystä varten. - - + + No DrawViewPart objects in this selection Valinnassa ei ole DrawViewPart-tyyppistä objektia - - + + No base View in Selection. Valintaan ei kuulu pohjanäkymää. - + You must select Faces or an existing CenterLine. On valittava joko alue tai olemassaoleva keskilinja. - + No CenterLine in selection. Valintaan ei kuulu Keskilinjaa. - - - + + + Selection is not a CenterLine. Valinta ei ole Keskilinja. - + Selection not understood. Valintajoukko on käsittämätön. - + You must select 2 Vertexes or an existing CenterLine. On valittava joko 2 pistettä tai olemassaoleva keskilinja. - + Need 2 Vertices or 1 CenterLine. Tarvitaan 2 pistettä tai 1 keskilinja. - + + Selection is empty. Mitään ei ole valittu. - + Not enough points in selection. Ei tarpeeksi pisteitä valinnassa. - + Selection is not a Cosmetic Line. Valinta ei ole kosmeettinen viiva. - + You must select 2 Vertexes. Ensin pitää valita 2 pistettä. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Mitään ei ole valittu - + At least 1 object in selection is not a part view Vähintään yksi valituista objekteista ei ole näkymä osista - + Unknown object type in selection Valittuna on tyypiltään tuntematon objekti - + No View in Selection. Valinnassa ei ole näkymää. - + You must select a View and/or lines. Ensin pitää valita Näkymä ja/tai viivoja. - + No Part Views in this selection Valinnassa ei ole Näkymää osista - + Select exactly one Leader line or one Weld symbol. Valitse tämälleen yksi Reittiviiva tai yksi Hitsaussymboli. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Muokkaa Hitsaussymbolia + Create Cosmetic Line Luo kosmeettinen viiva + Edit Cosmetic Line Muokkaa kosmeettista viivaa @@ -3678,7 +3708,7 @@ Alielementtejä ei ole valittu - + @@ -3686,7 +3716,7 @@ Valinta on tyhjä - + No object selected @@ -3829,7 +3859,7 @@ it has a weld symbol that would become broken. Tätä Reittiviivaa ei voi poistaa, koska siihen on liitetty hitsaussymboli, joka rikkoutuisi. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3843,7 +3873,7 @@ it has a weld symbol that would become broken. - + Object dependencies Objektin riippuvuudet @@ -8187,7 +8217,7 @@ käyttäen annettuja X/Y-välimatkoja TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Lisää keskilinjan kahden viivan väliin @@ -8195,7 +8225,7 @@ käyttäen annettuja X/Y-välimatkoja TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Lisää keskilinjan 2:n pisteen väliin @@ -8211,7 +8241,7 @@ käyttäen annettuja X/Y-välimatkoja TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Sijoittaa kosmeettisen apupisteen näkymään @@ -8232,7 +8262,7 @@ käyttäen annettuja X/Y-välimatkoja TechDraw_FaceCenterLine - + Adds a Centerline to Faces Lisää keskilinjan alueisiin @@ -8248,7 +8278,7 @@ käyttäen annettuja X/Y-välimatkoja TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Lisää kosmeettiset apupisteet valittujen reunojen keskipisteisiin @@ -8256,7 +8286,7 @@ käyttäen annettuja X/Y-välimatkoja TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Lisää kosmeettiset apupisteet valittujen ympyröiden kvadranttipisteisiin @@ -8942,4 +8972,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Apugeometria ympyrä + + + + View + Näytä + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d-piste + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d-piste + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Säde: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Lisää apugeometria ympyrä + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_fr.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_fr.ts index 7a1601d8e0..db0c9a6535 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_fr.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_fr.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Ligne centrale entre 2 lignes @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Ajouter une ligne de centre entre 2 points @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Ajouter des sommets intermédiaires @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Ajouter des sommets de quadrants @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Ligne centrale entre 2 lignes @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Ajouter une ligne de centre entre 2 points @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Ajouter une ligne cosmétique par 2 points @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Insérer une annotation @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Insérer une ligne centrale - + Add Centerline to Faces Ajouter une ligne centrale à des faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Supprimer l'objet cosmétique @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Ajouter un sommet cosmétique @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Ajouter un sommet cosmétique - + Add Cosmetic Vertex Ajouter un sommet cosmétique @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Changer l'apparence des lignes - + Change Appearance of selected Lines Changer l'apparence des lignes sélectionnées @@ -1564,12 +1564,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Ajouter une ligne centrale à des faces @@ -1671,12 +1671,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Insérer une ligne de référence à la vue @@ -1710,12 +1710,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Ajouter des sommets intermédiaires @@ -1803,12 +1803,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Ajouter des sommets de quadrants @@ -1842,12 +1842,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Insérer une annotation de texte enrichi @@ -1891,12 +1891,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Afficher/masquer les arrêtes invisibles @@ -2007,17 +2007,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Créer un symbole de finition de surface - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Sélectionnez une vue - Cliquez sur ce bouton @@ -2103,12 +2103,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Ajouter les informations de soudage à la ligne de référence @@ -2173,17 +2173,17 @@ Enregistrer la page en dxf - + Add Midpoint Vertices Ajouter des sommets intermédiaires - + Add Quadrant Vertices Ajouter des sommets de quadrants - + Create Annotation Créer une annotation @@ -2244,10 +2244,16 @@ Créer une trait d'axe + Create Cosmetic Line Créer une ligne cosmétique + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2858,14 +2864,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3216,21 +3222,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3265,21 +3272,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3311,158 +3319,178 @@ Fermer la boîte de dialogue des tâches actives et réessayer. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Sélection incorrecte - + Can not attach leader. No base View selected. Impossible d'attacher la référence. Aucune vue de base sélectionnée. - - - - + + + + You must select a base View for the line. Vous devez sélectionner une vue de base pour la ligne. - - + + No DrawViewPart objects in this selection Aucun objet DrawViewPart dans cette sélection - - + + No base View in Selection. Aucune Vue de base dans la sélection. - + You must select Faces or an existing CenterLine. Vous devez sélectionner des faces ou une ligne centrale existante. - + No CenterLine in selection. Pas de ligne centrale dans la sélection. - - - + + + Selection is not a CenterLine. La sélection n'est pas une ligne centrale. - + Selection not understood. Sélection non comprise. - + You must select 2 Vertexes or an existing CenterLine. Vous devez sélectionner 2 sommets ou une ligne centrale existante. - + Need 2 Vertices or 1 CenterLine. Exige 2 sommets ou 1 ligne centrale. - + + Selection is empty. La sélection est vide. - + Not enough points in selection. Pas assez de points dans la sélection. - + Selection is not a Cosmetic Line. La sélection n'est pas une ligne cosmétique. - + You must select 2 Vertexes. Vous devez sélectionner 2 sommets. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Aucune sélection - + At least 1 object in selection is not a part view Au moins 1 objet dans la sélection n'est pas une vue de pièce - + Unknown object type in selection Type d'objet inconnu dans la sélection - + No View in Selection. Aucune vue dans la sélection. - + You must select a View and/or lines. Vous devez sélectionner une vue et/ou des lignes. - + No Part Views in this selection Pas de vue dans la sélection - + Select exactly one Leader line or one Weld symbol. Sélectionnez exactement une ligne de repère ou un symbole de soudure. - - + + SurfaceFinishSymbols Symboles d'état de surface - + No Part View in Selection Pas de vue de la pièce dans la sélection - + No %1 in Selection %1 n'est pas dans la sélection @@ -3692,11 +3720,13 @@ Modifier un symbole de soudure + Create Cosmetic Line Créer une ligne cosmétique + Edit Cosmetic Line Modifier la ligne cosmétique @@ -3832,7 +3862,7 @@ Aucun sous-élément sélectionné - + @@ -3840,7 +3870,7 @@ La sélection est vide - + No object selected @@ -3984,7 +4014,7 @@ it has a weld symbol that would become broken. elle comporte un symbole de soudure qui se casserait. - + You cannot delete this view because it has one or more dependent views that would become broken. Vous ne pouvez pas supprimer cette vue car elle possède une ou plusieurs vues dépendantes qui deviendraient orphelines. @@ -3998,7 +4028,7 @@ elle comporte un symbole de soudure qui se casserait. - + Object dependencies Dépendances des objets @@ -7245,7 +7275,7 @@ Vous pouvez sélectionner d'autres points pour obtenir des segments de ligne. Line color - Couleur de ligne + Couleur des lignes @@ -7821,7 +7851,7 @@ en utilisant l'espacement X/Y donné Line color - Couleur de ligne + Couleur des lignes @@ -8344,7 +8374,7 @@ Peut être lent pour les modèles complexes. TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Ajoute une ligne centrale entre 2 lignes @@ -8352,7 +8382,7 @@ Peut être lent pour les modèles complexes. TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Ajoute une ligne centrale entre 2 points @@ -8368,7 +8398,7 @@ Peut être lent pour les modèles complexes. TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Insère un sommet cosmétique dans une vue @@ -8391,7 +8421,7 @@ Peut être lent pour les modèles complexes. TechDraw_FaceCenterLine - + Adds a Centerline to Faces Ajoute une Ligne Centrale aux faces @@ -8407,7 +8437,7 @@ Peut être lent pour les modèles complexes. TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Insère des sommets cosmétiques au milieu des arêtes sélectionnées @@ -8415,7 +8445,7 @@ Peut être lent pour les modèles complexes. TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Insère des sommets cosmétiques aux points de quadrant des cercles sélectionnés @@ -9101,4 +9131,100 @@ il y a une tâche en cours. Hachure de géométrie + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cercle + + + + View + Vue + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Point 2d + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Point 3d + + + + Circle Center + Circle Center + + + + X: + X : + + + + Y: + Y : + + + + Z: + Z : + + + + Radius: + Rayon : + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Cercle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_gl.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_gl.ts index bf0bdbd363..41fe50c9ba 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_gl.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_gl.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Engade unha liña central entre 2 liñas @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Engade a liña central entre 2 puntos @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Engadir vértices de medio punto @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Engadir vértices de cuadrante @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Engade unha liña central entre 2 liñas @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Engade a liña central entre 2 puntos @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Add Cosmetic Line Through 2 Points @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Insire apuntamento @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Insert Center Line - + Add Centerline to Faces Add Centerline to Faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Remove Cosmetic Object @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Add Cosmetic Vertex @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Insert Cosmetic Vertex - + Add Cosmetic Vertex Add Cosmetic Vertex @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Change Appearance of Lines - + Change Appearance of selected Lines Change Appearance of selected Lines @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Add Centerline to Faces @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Add Leaderline to View @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Engadir vértices de medio punto @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Engadir vértices de cuadrante @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Insert Rich Text Annotation @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Show/Hide Invisible Edges @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Add Welding Information to Leaderline @@ -2020,17 +2020,17 @@ Save page to dxf - + Add Midpoint Vertices Engadir vértices de medio punto - + Add Quadrant Vertices Engadir vértices de cuadrante - + Create Annotation Create Annotation @@ -2091,10 +2091,16 @@ Create CenterLine + Create Cosmetic Line Create Cosmetic Line + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Pechar o cadro de diálogo e tentalo outra vez. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Wrong Selection - + Can not attach leader. No base View selected. Imposible adxuntar lider. Na vista escolmada. - - - - + + + + You must select a base View for the line. Debes escolmar unha Vista base para a liña. - - + + No DrawViewPart objects in this selection Sen obxectos DrawViewPart na escolma - - + + No base View in Selection. Sen Vista base na Selección. - + You must select Faces or an existing CenterLine. You must select Faces or an existing CenterLine. - + No CenterLine in selection. No CenterLine in selection. - - - + + + Selection is not a CenterLine. Selection is not a CenterLine. - + Selection not understood. Selection not understood. - + You must select 2 Vertexes or an existing CenterLine. You must select 2 Vertexes or an existing CenterLine. - + Need 2 Vertices or 1 CenterLine. Need 2 Vertices or 1 CenterLine. - + + Selection is empty. Selection is empty. - + Not enough points in selection. Not enough points in selection. - + Selection is not a Cosmetic Line. Selection is not a Cosmetic Line. - + You must select 2 Vertexes. You must select 2 Vertexes. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nada escolmado - + At least 1 object in selection is not a part view Ao menos 1 obxecto da escolma non é unha vista parcial - + Unknown object type in selection Tipo de obxecto descoñecido na escolma - + No View in Selection. No View in Selection. - + You must select a View and/or lines. You must select a View and/or lines. - + No Part Views in this selection No Part Views in this selection - + Select exactly one Leader line or one Weld symbol. Select exactly one Leader line or one Weld symbol. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edit Welding Symbol + Create Cosmetic Line Create Cosmetic Line + Edit Cosmetic Line Edit Cosmetic Line @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. it has a weld symbol that would become broken. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies Dependencias do obxecto @@ -8197,7 +8227,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Adds a Centerline between 2 Lines @@ -8205,7 +8235,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Adds a Centerline between 2 Points @@ -8221,7 +8251,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8242,7 +8272,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8258,7 +8288,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8266,7 +8296,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8953,4 +8983,100 @@ there is an open task dialog. TramaXeométrica + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Vista + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Punto 2d + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Punto 3d + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Radio: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_hr.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_hr.ts index b6a99de89a..053098f972 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_hr.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_hr.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Dodajte središnju liniju između dvije linije @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Dodajte središnju liniju između dvije točke @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Dodajte pomoćne točke na sredinu ruba @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Dodajte kvadrantne pomoćne točke na rubove @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw Tehničko Crtanje - + Add Centerline between 2 Lines Dodajte središnju liniju između dvije linije @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw Tehničko Crtanje - + Add Centerline between 2 Points Dodajte središnju liniju između dvije točke @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw Tehničko Crtanje - + Add Cosmetic Line Through 2 Points Dodaj dekoracijsku liniju kroz 2 točke @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw Tehničko Crtanje - + Insert Annotation Umetanje napomene @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw Tehničko Crtanje - + Insert Center Line Umetnite središnju liniju - + Add Centerline to Faces Dodaj simetralu na lice(a) @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw Tehničko Crtanje - + Remove Cosmetic Object Ukloni pomoćni objekt @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw Tehničko Crtanje - + Add Cosmetic Vertex Dodaj pomoćnu tjemenu točku @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw Tehničko Crtanje - + Insert Cosmetic Vertex Umetni pomoćnu tjemenu točku - + Add Cosmetic Vertex Dodaj pomoćnu tjemenu točku @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw Tehničko Crtanje - + Change Appearance of Lines Promijenite izgled linija - + Change Appearance of selected Lines Promjena izgleda odabranih linija @@ -1427,12 +1427,12 @@ CmdTechDrawFaceCenterLine - + TechDraw Tehničko Crtanje - + Add Centerline to Faces Dodaj simetralu na lice(a) @@ -1534,12 +1534,12 @@ CmdTechDrawLeaderLine - + TechDraw Tehničko Crtanje - + Add Leaderline to View Dodaj liniju oznake u Pogled @@ -1573,12 +1573,12 @@ CmdTechDrawMidpoints - + TechDraw Tehničko Crtanje - + Add Midpoint Vertices Dodajte pomoćne točke na sredinu ruba @@ -1666,12 +1666,12 @@ CmdTechDrawQuadrants - + TechDraw Tehničko Crtanje - + Add Quadrant Vertices Dodajte kvadrantne pomoćne točke na rubove @@ -1705,12 +1705,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw Tehničko Crtanje - + Insert Rich Text Annotation Umetni raskošni tekst napomenu @@ -1754,12 +1754,12 @@ CmdTechDrawShowAll - + TechDraw Tehničko Crtanje - + Show/Hide Invisible Edges Prikaži / sakrij nevidljive rubove @@ -1870,17 +1870,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw Tehničko Crtanje - + Create a Surface Finish Symbol Napravi simbol površinske završne obrade - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Odaberite prikaz<br> - kliknite ovaj gumb<br> - odaberite atribute simbola površinske završne obrade u otvorenom panelu @@ -1966,12 +1966,12 @@ CmdTechDrawWeldSymbol - + TechDraw Tehničko Crtanje - + Add Welding Information to Leaderline Dodaj informaciju spajanja na liniju oznake @@ -2036,17 +2036,17 @@ Spremi stranicu u dxf formatu - + Add Midpoint Vertices Dodajte pomoćne točke na sredinu ruba - + Add Quadrant Vertices Dodajte kvadrantne pomoćne točke na rubove - + Create Annotation Stvori Napomenu @@ -2107,10 +2107,16 @@ Stvori središnju Liniju + Create Cosmetic Line Stvori Dekoracijsku liniju + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2725,14 +2731,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3083,21 +3089,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3132,21 +3139,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3178,159 +3186,179 @@ Zatvori aktivni dijalog rješavača i pokušaj ponovo. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Pogrešan odabir - + Can not attach leader. No base View selected. Ne može se priložiti prednjak. Nije odabran nijedan osnovni prikaz. - - - - + + + + You must select a base View for the line. Morate odabrati osnovni prikaz za redak. - - + + No DrawViewPart objects in this selection Nema DrawViewPart objekata u ovom odabiru - - + + No base View in Selection. Nema osnovnog pogleda u odabiru. - + You must select Faces or an existing CenterLine. Morate odabrati Lica ili postojeću Srednju liniju. - + No CenterLine in selection. Nema Srednje linije u odabiru. - - - + + + Selection is not a CenterLine. Odabir nije Srednja linija. - + Selection not understood. Odabir nije razumljiv. - + You must select 2 Vertexes or an existing CenterLine. Morate odabrati 2 tjemene točke ili postojeću Srednju liniju. - + Need 2 Vertices or 1 CenterLine. Potrebna su 2 Vrha ili 1 Srednja linija - + + Selection is empty. Odabir je prazan. - + Not enough points in selection. Nema dovoljno točaka u odabiru. - + Selection is not a Cosmetic Line. Odabir nije Dekoracijska linija - + You must select 2 Vertexes. Morate odabrati 2 tjemene točke. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Ništa nije odabrano - + At least 1 object in selection is not a part view Najmanje 1 predmet u odabiru nije Prikaz dijelova - + Unknown object type in selection Nepoznata vrsta objekta u izboru - + No View in Selection. Nema pogleda u odabiru. - + You must select a View and/or lines. Morate odabrati jedan Pogled i / ili linije. - + No Part Views in this selection Nema Pogleda djelova u ovom odabiru - + Select exactly one Leader line or one Weld symbol. Odaberite samo jednu liniju oznake ili simbol spajanja. - - + + SurfaceFinishSymbols Simboli za završnu obradu površine - + No Part View in Selection Nema pogleda na Dio u doabiru - + No %1 in Selection Nema %1 u odabiru @@ -3560,11 +3588,13 @@ Uredite simbol spajanja + Create Cosmetic Line Stvori Dekoracijsku liniju + Edit Cosmetic Line Uredi Dekoracijsku liniju @@ -3702,7 +3732,7 @@ Nema izabranih podelemenata - + @@ -3710,7 +3740,7 @@ Odabir je prazan - + No object selected @@ -3856,7 +3886,7 @@ ima simbol spajanja koji bi se pokidao. - + You cannot delete this view because it has one or more dependent views that would become broken. Ne možete izbrisati ovaj pogled jer ima jedan ili više ovisnih prikaza koji bi se slomili. @@ -3870,7 +3900,7 @@ ima simbol spajanja koji bi se pokidao. - + Object dependencies Zavisnosti objekta @@ -8290,7 +8320,7 @@ koristeći zadani X/Y razmak TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Dodajte središnju liniju između dvije linije @@ -8298,7 +8328,7 @@ koristeći zadani X/Y razmak TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Dodajte središnju liniju između dvije točke @@ -8314,7 +8344,7 @@ koristeći zadani X/Y razmak TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Umetnite dekorativne tjemene točke u pogled @@ -8335,7 +8365,7 @@ koristeći zadani X/Y razmak TechDraw_FaceCenterLine - + Adds a Centerline to Faces Dodaj simetralu na lice(a) @@ -8351,7 +8381,7 @@ koristeći zadani X/Y razmak TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Umetanje dekoracija vrhova u sredinu odabranih rubova @@ -8359,7 +8389,7 @@ koristeći zadani X/Y razmak TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Umetanje dekoracija vrhova u kvadratne točke odabranih krugova @@ -9050,4 +9080,100 @@ jer je otvoren dijalog zadataka. Geometrijska šrafura + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Dekorativni krug + + + + View + Pregled + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2D točka + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3D točka + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Polumjer: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + Tehničko Crtanje + + + + Add Cosmetic Circle + Dodaj dekorativni krug + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_hu.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_hu.ts index 2883e82279..4830c8943f 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_hu.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_hu.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Középvonal hozzáadása 2 egyenes között @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Középvonal hozzáadása 2 pont között @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Középponti csúcspontok hozzáadása @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Negyedelő csúcspontok hozzáadása @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw MűszakiRajz - + Add Centerline between 2 Lines Középvonal hozzáadása 2 egyenes között @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw MűszakiRajz - + Add Centerline between 2 Points Középvonal hozzáadása 2 pont között @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw MűszakiRajz - + Add Cosmetic Line Through 2 Points Két pont általi segéd vonal beszúrása @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw MűszakiRajz - + Insert Annotation Széljegyzet beszúrása @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw MűszakiRajz - + Insert Center Line Középvonal beszúrása - + Add Centerline to Faces Középvonal hozzáadása a felületekhez @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw MűszakiRajz - + Remove Cosmetic Object Segéd tárgy eltávolítása @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw MűszakiRajz - + Add Cosmetic Vertex Segéd csúcspont hozzáadása @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw MűszakiRajz - + Insert Cosmetic Vertex Segéd csúcspont beillesztése - + Add Cosmetic Vertex Segéd csúcspont hozzáadása @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw MűszakiRajz - + Change Appearance of Lines Egyenesek megjelenésének módosítása - + Change Appearance of selected Lines Kiválasztott egyenesek megjelenésének módosítása @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw MűszakiRajz - + Add Centerline to Faces Középvonal hozzáadása a felületekhez @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw MűszakiRajz - + Add Leaderline to View Referenciavonal hozzáadása a nézethez @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw MűszakiRajz - + Add Midpoint Vertices Középponti csúcspontok hozzáadása @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw MűszakiRajz - + Add Quadrant Vertices Negyedelő csúcspontok hozzáadása @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw MűszakiRajz - + Insert Rich Text Annotation Szöveges jegyzet beszúrása @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw MűszakiRajz - + Show/Hide Invisible Edges Láthatatlan élek megjelenítése/elrejtése @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw MűszakiRajz - + Create a Surface Finish Symbol Felületkezelési szimbólum létrehozása - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Válasszon ki egy nézetet<br> - kattintson erre a gombra<br> - válassza ki a felületkezelési szimbólum attribútumait a megnyitott panelen @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw MűszakiRajz - + Add Welding Information to Leaderline Hegesztési információk hozzáadása a referenciavonalhoz @@ -2020,17 +2020,17 @@ Oldal mentése dxf-be - + Add Midpoint Vertices Középponti csúcspontok hozzáadása - + Add Quadrant Vertices Negyedelő csúcspontok hozzáadása - + Create Annotation Széljegyzet létrehozása @@ -2091,10 +2091,16 @@ Középvonal létrehozása + Create Cosmetic Line Segédvonal létrehozása + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Zárja be az aktív feladatot és próbálja később. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Hibás kijelölés - + Can not attach leader. No base View selected. A vezér egyenest nem tudja csatolni. Nem lett kiválasztva alapértelmezett nézet. - - - - + + + + You must select a base View for the line. Alapértelmezett nézetet kell kiválasztania az egyeneshez. - - + + No DrawViewPart objects in this selection A kijelölt részen nem található DrawViewPart objektum - - + + No base View in Selection. Nincs alapnézet a kijelölésben. - + You must select Faces or an existing CenterLine. Ki kell választania a felületeket vagy egy meglévő Középvonalat. - + No CenterLine in selection. Középvonal nincs a kiválasztásban. - - - + + + Selection is not a CenterLine. A kijelölés nem középvonal. - + Selection not understood. A kiválasztás nem érthető. - + You must select 2 Vertexes or an existing CenterLine. Ki kell jelölnie a 2 csúcspontot vagy egy meglévő Középvonalat. - + Need 2 Vertices or 1 CenterLine. Szüksége van 2 csúcsora vagy 1 Középvonalra. - + + Selection is empty. Nincs kiválasztva semmi. - + Not enough points in selection. Nincs elég pont a kiválasztásban. - + Selection is not a Cosmetic Line. A kiválasztás nem segéd vonal. - + You must select 2 Vertexes. Két csúcspontot kell kijelölnie. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Semmi sincs kiválasztva - + At least 1 object in selection is not a part view Legalább 1 objektum a kijelölt részen nem egy résznézet - + Unknown object type in selection Ismeretlen típusú tárgy a kiválasztásban - + No View in Selection. Nincs alapnézet a kijelölésben. - + You must select a View and/or lines. Ki kell jelölnie egy nézetet és/vagy vonalakat. - + No Part Views in this selection Nincs résznézet ebben a kijelölésben - + Select exactly one Leader line or one Weld symbol. Jelöljön ki pontosan egy referenciavonalat vagy egy Hegesztés szimbólumot. - - + + SurfaceFinishSymbols Felületi szimbólumok - + No Part View in Selection Nincs alkatrész nézet a kijelölésben - + No %1 in Selection A %1 nincs a kiválasztásban @@ -3538,11 +3566,13 @@ Hegesztési szimbólum szerkesztése + Create Cosmetic Line Segédvonal létrehozása + Edit Cosmetic Line Segédvonal szerkesztése @@ -3678,7 +3708,7 @@ Nincsenek részelemek kiválasztva - + @@ -3686,7 +3716,7 @@ A kijelölési terület nem tartalmaz objektumokat - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. olyan hegesztési szimbólummal rendelkezik, amely megtörne. - + You cannot delete this view because it has one or more dependent views that would become broken. Nem törölheti ezt a nézetet, mert egy vagy több nézetnek függősége van, amely megszakadna. @@ -3844,7 +3874,7 @@ olyan hegesztési szimbólummal rendelkezik, amely megtörne. - + Object dependencies Objektumfüggőségek @@ -8190,7 +8220,7 @@ a megadott X/Y távolság használatával TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Egy középvonal hozzáadása 2 egyenes között @@ -8198,7 +8228,7 @@ a megadott X/Y távolság használatával TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Egy középvonal hozzáadása 2 pont között @@ -8214,7 +8244,7 @@ a megadott X/Y távolság használatával TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Segéd csúcs beszúrása egy nézetbe @@ -8235,7 +8265,7 @@ a megadott X/Y távolság használatával TechDraw_FaceCenterLine - + Adds a Centerline to Faces Egy középvonal hozzáadása a felületekhez @@ -8251,7 +8281,7 @@ a megadott X/Y távolság használatával TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Segédpontokat illeszt be a kiválasztott élek középpontjába @@ -8259,7 +8289,7 @@ a megadott X/Y távolság használatával TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Segédpontok beillesztése a kijelölt körök kvadránshatáraira @@ -8946,4 +8976,100 @@ a feladat párbeszédpanel nyitva van. GeomKitölt + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Segéd kör + + + + View + Nézet + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2. pont + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3. pont + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Sugár: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + MűszakiRajz + + + + Add Cosmetic Circle + Segéd kör hozzáadása + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_id.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_id.ts index 896e41b137..ca9143e021 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_id.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_id.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Tambah Garis tengah antara 2 Garis @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Tambah Garis tengah antara 2 Titik @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Tambahkan Vertis Titik-tengah @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Tambahkan Vertis Kuadran @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Tambah Garis tengah antara 2 Garis @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Tambah Garis tengah antara 2 Titik @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Tambahkan Garis Kosmetik Melalui 2 Titik @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Masukkan Anotasi @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Masukkan Garis Tengah - + Add Centerline to Faces Add Centerline to Faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Hapus Obyek Kosmetik @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Tambahkan Vertex Kosmetik @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Masukkan Vertex Kosmetik - + Add Cosmetic Vertex Tambahkan Vertex Kosmetik @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Ubah Tampilan Garis - + Change Appearance of selected Lines Change Appearance of selected Lines @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Add Centerline to Faces @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Add Leaderline to View @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Tambahkan Vertis Titik-tengah @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Tambahkan Vertis Kuadran @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Masukkan Anotasi Rich Text @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Tampilkan/Sembuyikan Tepi Tak Terlihat @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Add Welding Information to Leaderline @@ -2020,17 +2020,17 @@ Save page to dxf - + Add Midpoint Vertices Tambahkan Vertis Titik-tengah - + Add Quadrant Vertices Tambahkan Vertis Kuadran - + Create Annotation Create Annotation @@ -2091,10 +2091,16 @@ Create CenterLine + Create Cosmetic Line Create Cosmetic Line + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Close active task dialog and try again. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Wrong Selection - + Can not attach leader. No base View selected. Can not attach leader. No base View selected. - - - - + + + + You must select a base View for the line. You must select a base View for the line. - - + + No DrawViewPart objects in this selection No DrawViewPart objects in this selection - - + + No base View in Selection. No base View in Selection. - + You must select Faces or an existing CenterLine. You must select Faces or an existing CenterLine. - + No CenterLine in selection. No CenterLine in selection. - - - + + + Selection is not a CenterLine. Selection is not a CenterLine. - + Selection not understood. Selection not understood. - + You must select 2 Vertexes or an existing CenterLine. You must select 2 Vertexes or an existing CenterLine. - + Need 2 Vertices or 1 CenterLine. Need 2 Vertices or 1 CenterLine. - + + Selection is empty. Selection is empty. - + Not enough points in selection. Not enough points in selection. - + Selection is not a Cosmetic Line. Selection is not a Cosmetic Line. - + You must select 2 Vertexes. You must select 2 Vertexes. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Tak ada yang dipilih - + At least 1 object in selection is not a part view At least 1 object in selection is not a part view - + Unknown object type in selection Unknown object type in selection - + No View in Selection. No View in Selection. - + You must select a View and/or lines. You must select a View and/or lines. - + No Part Views in this selection No Part Views in this selection - + Select exactly one Leader line or one Weld symbol. Select exactly one Leader line or one Weld symbol. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edit Welding Symbol + Create Cosmetic Line Create Cosmetic Line + Edit Cosmetic Line Edit Cosmetic Line @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. it has a weld symbol that would become broken. - + You cannot delete this view because it has one or more dependent views that would become broken. View ini tidak dapat dihapus karena beberapa view yang terhubung akan rusak. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies Objek dependensi @@ -8195,7 +8225,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Adds a Centerline between 2 Lines @@ -8203,7 +8233,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Adds a Centerline between 2 Points @@ -8219,7 +8249,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8240,7 +8270,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8256,7 +8286,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8264,7 +8294,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8951,4 +8981,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Tampilan + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Point + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Point + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Radius: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_it.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_it.ts index a852851a14..64289b79dc 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_it.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_it.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Linea centrale a 2 linee @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Linea centrale a 2 punti @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Vertice nel punto mediano @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Vertici quadrante @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Linea centrale a 2 linee @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Linea centrale a 2 punti @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Linea attraverso 2 punti @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Annotazione @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Inserisci linea centrale - + Add Centerline to Faces Linea a centro faccia @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Rimuovi oggetto cosmetico @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Vertice cosmetico @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Inserisce un Vertice Cosmetico - + Add Cosmetic Vertex Vertice cosmetico @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Aspetto delle linee - + Change Appearance of selected Lines Cambia l'aspetto delle linee selezionate @@ -1415,12 +1415,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Linea a centro faccia @@ -1522,12 +1522,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Linea guida @@ -1561,12 +1561,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Vertice nel punto mediano @@ -1654,12 +1654,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Vertici quadrante @@ -1693,12 +1693,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Blocco di testo @@ -1742,12 +1742,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Mostra/nascondi i bordi invisibili @@ -1858,17 +1858,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Crea un simbolo di finitura superficiale - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Seleziona una vista<br> - clicca questo pulsante<br> - seleziona gli attributi del simbolo di finitura superficiale nel pannello aperto @@ -1952,12 +1952,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Informazioni di saldatura @@ -2022,17 +2022,17 @@ Salva pagina su dxf - + Add Midpoint Vertices Vertice nel punto mediano - + Add Quadrant Vertices Vertici quadrante - + Create Annotation Crea annotazione @@ -2093,10 +2093,16 @@ Crea linea di mezzeria + Create Cosmetic Line Crea linea cosmetica + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2707,14 +2713,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3064,21 +3070,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3113,21 +3120,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3159,158 +3167,178 @@ Chiudere la finestra di dialogo attiva e riprovare. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Selezione sbagliata - + Can not attach leader. No base View selected. Impossibile agganciare la guida. Nessuna vista di base selezionata. - - - - + + + + You must select a base View for the line. Selezionare una vista base per la linea. - - + + No DrawViewPart objects in this selection Nessun oggetto DrawViewPart in questa selezione - - + + No base View in Selection. Nessuna Vista di base nella selezione. - + You must select Faces or an existing CenterLine. Selezionare le facce o una linea centrale esistente. - + No CenterLine in selection. Nessuna linea centrale nella selezione. - - - + + + Selection is not a CenterLine. La selezione non è una linea centrale. - + Selection not understood. Selezione non compresa. - + You must select 2 Vertexes or an existing CenterLine. Selezionare 2 vertici o una linea centrale esistente. - + Need 2 Vertices or 1 CenterLine. Servono 2 vertici o 1 linea centrale. - + + Selection is empty. La selezione è vuota. - + Not enough points in selection. Non ci sono abbastanza punti nella selezione. - + Selection is not a Cosmetic Line. La selezione non è una linea cosmetica. - + You must select 2 Vertexes. È necessario selezionare 2 vertici. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nessuna selezione - + At least 1 object in selection is not a part view Almeno 1 oggetto nella selezione non è una vista parte - + Unknown object type in selection Tipo di oggetto sconosciuto nella selezione - + No View in Selection. Nessuna vista nella selezione. - + You must select a View and/or lines. Selezionare una vista e/o delle linee. - + No Part Views in this selection Nessuna vista parte in questa selezione - + Select exactly one Leader line or one Weld symbol. Seleziona solo una linea guida o un simbolo di saldatura. - - + + SurfaceFinishSymbols SimboliFinituraSuperficiale - + No Part View in Selection Nessuna vista parziale nella selezione - + No %1 in Selection Nessun %1 nella selezione @@ -3540,11 +3568,13 @@ Modifica simbolo di saldatura + Create Cosmetic Line Crea linea cosmetica + Edit Cosmetic Line Modifica linea cosmetica @@ -3680,7 +3710,7 @@ Nessun sottoelemento selezionato - + @@ -3688,7 +3718,7 @@ La selezione è vuota - + No object selected @@ -3832,7 +3862,7 @@ it has a weld symbol that would become broken. essa ha un simbolo di saldatura che si romperebbe. - + You cannot delete this view because it has one or more dependent views that would become broken. Non puoi eliminare questa vista perché ha una o più viste dipendenti che diventerebbero orfani. @@ -3846,7 +3876,7 @@ it has a weld symbol that would become broken. - + Object dependencies Dipendenze dell'oggetto @@ -8195,7 +8225,7 @@ usando la spaziatura X/Y specificata TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Aggiunge una linea centrale tra 2 linee @@ -8203,7 +8233,7 @@ usando la spaziatura X/Y specificata TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Aggiunge una linea centrale tra 2 punti @@ -8219,7 +8249,7 @@ usando la spaziatura X/Y specificata TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserisce un vertice cosmetico in una vista @@ -8240,7 +8270,7 @@ usando la spaziatura X/Y specificata TechDraw_FaceCenterLine - + Adds a Centerline to Faces Linea a centro faccia @@ -8256,7 +8286,7 @@ usando la spaziatura X/Y specificata TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserisce vertici cosmetici al centro dei bordi selezionati @@ -8264,7 +8294,7 @@ usando la spaziatura X/Y specificata TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserisce vertici cosmetici nei punti quadranti dei cerchi selezionati @@ -8951,4 +8981,100 @@ c'è una finestra di dialogo per le attività aperte. Trama geometrica + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cerchio Cosmetico + + + + View + Vista + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Punto 2d + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Punto 3d + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Raggio: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Aggiungi Cerchio Cosmetico + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ja.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ja.ts index 35b37f6800..392892440d 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ja.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ja.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines 2直線間に中心線を追加 @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points 2点間に中心線を追加 @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices 中点を追加 @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices 四分点を追加 @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines 2直線間に中心線を追加 @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points 2点間に中心線を追加 @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points 2点を通過する表示用の線を追加 @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation 注釈を挿入 @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line 中心線を挿入 - + Add Centerline to Faces 面に中心線を追加 @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object 表示用オブジェクトを削除 @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex 表示用の頂点を追加 @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex 表示用の頂点を挿入 - + Add Cosmetic Vertex 表示用の頂点を追加 @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines 線の表示を変更 - + Change Appearance of selected Lines 選択した線の表示を変更 @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces 面に中心線を追加 @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View ビューに引き出し線を追加 @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices 中点を追加 @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices 四分点を追加 @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation リッチテキスト注釈を挿入 @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges 見えないエッジの表示/非表示 @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol 表面仕上げ記号を作成 - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel ビューを選択<br> - このボタンをクリック<br> - 開いたパネルで表面仕上げ記号を選択 @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline 溶接情報を引き出し線に追加 @@ -2020,17 +2020,17 @@ ページをDXFに保存 - + Add Midpoint Vertices 中点を追加 - + Add Quadrant Vertices 四分点を追加 - + Create Annotation 注釈を作成 @@ -2091,10 +2091,16 @@ 中心線を作成 + Create Cosmetic Line 表示用の線を作成 + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ アクテイブなタスクタイアログを閉じて再度実行してください。 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection 間違った選択 - + Can not attach leader. No base View selected. 引き出し線をアタッチできません。ベースビューが選択されていません。 - - - - + + + + You must select a base View for the line. 線のためのベースビューを選択する必要があります。 - - + + No DrawViewPart objects in this selection DrawViewPartオブジェクトが選択されていません。 - - + + No base View in Selection. ベースビューが選択されていません。 - + You must select Faces or an existing CenterLine. 面または既存の中心線を選択する必要があります。 - + No CenterLine in selection. 中心線が選択されていません。 - - - + + + Selection is not a CenterLine. 選択されているのは中心線ではありません。 - + Selection not understood. 選択範囲が理解できません - + You must select 2 Vertexes or an existing CenterLine. 2頂点または既存の中心線を選択する必要があります。 - + Need 2 Vertices or 1 CenterLine. 2頂点または1本の中心線が必要です。 - + + Selection is empty. 選択がされていません。 - + Not enough points in selection. 選択点が足りません。 - + Selection is not a Cosmetic Line. 選択されているのは表示用の線ではありません。 - + You must select 2 Vertexes. 2頂点を選択してください。 - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected 何も選択されていません - + At least 1 object in selection is not a part view 選択されているオブジェクトの少なくとも1つがパートビューではありません - + Unknown object type in selection 選択されているのは不明なオブジェクトタイプです - + No View in Selection. 選択範囲にビューがありません。 - + You must select a View and/or lines. ビューおよび/または行を選択する必要があります。 - + No Part Views in this selection パートビューが選択されていません - + Select exactly one Leader line or one Weld symbol. 引き出し線または溶接シンボルを一つだけ選択して下さい。 - - + + SurfaceFinishSymbols 表面仕上げ記号 - + No Part View in Selection パートビューが選択されていません - + No %1 in Selection %1 が選択されていません。 @@ -3538,11 +3566,13 @@ 溶接記号の編集 + Create Cosmetic Line 表示用の線を作成 + Edit Cosmetic Line 表示用の線を編集 @@ -3678,7 +3708,7 @@ サブ要素が選択されていません。 - + @@ -3686,7 +3716,7 @@ 選択されていません - + No object selected @@ -3829,7 +3859,7 @@ it has a weld symbol that would become broken. 壊れてしまう溶接記号があるため、この引き出し線を削除することはできません。 - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3843,7 +3873,7 @@ it has a weld symbol that would become broken. - + Object dependencies オブジェクトの依存関係 @@ -8182,7 +8212,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines 2直線間に中心線を追加 @@ -8190,7 +8220,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points 2点間に中心線を追加 @@ -8206,7 +8236,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View ビューに表示用の頂点を挿入 @@ -8227,7 +8257,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces 面に中心線を追加 @@ -8243,7 +8273,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges エッジの中点位置に表示用の頂点を挿入 @@ -8251,7 +8281,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles 選択されている円の四分点位置に、表示用の頂点を挿入 @@ -8937,4 +8967,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + 表示用の円 + + + + View + ビュー + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2D点 + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3D点 + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + 半径: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + 表示用の円を追加 + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ka.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ka.ts index 142cf5d387..6a8b592f93 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ka.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ka.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines ორ ხაზს შუა ცენტრის ხაზის გავლება @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points ორ წერტილს შორის ცენტრის ხაზის დამატება @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices შუაწერტილის წვეროების დამატება @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices კუთხეევში წვეროების დამატება @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw ტექნიკური ნახაზი - + Add Centerline between 2 Lines ორ ხაზს შუა ცენტრის ხაზის გავლება @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw ტექნიკური ნახაზი - + Add Centerline between 2 Points ორ წერტილს შორის ცენტრის ხაზის დამატება @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw ტექნიკური ნახაზი - + Add Cosmetic Line Through 2 Points კოსმეტიკური ხაზის ორ წერტილს შუა გავლება @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw ტექნიკური ნახაზი - + Insert Annotation შენიშვნის დამატება @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw ტექნიკური ნახაზი - + Insert Center Line ღერძის ხაზის გავლება - + Add Centerline to Faces ზედაპირებისთვის ღერძული ხაზის დამატება @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw ტექნიკური ნახაზი - + Remove Cosmetic Object დამხმარე ობიექტის წაშლა @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw ტექნიკური ნახაზი - + Add Cosmetic Vertex დამხმარე წვეროს დამატება @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw ტექნიკური ნახაზი - + Insert Cosmetic Vertex დამხმარე წვეროს ჩასმა - + Add Cosmetic Vertex დამხმარე წვეროს დამატება @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw ტექნიკური ნახაზი - + Change Appearance of Lines ხაზების გარეგნული სახის შეცვლა - + Change Appearance of selected Lines მონიშნული ხაზების გარეგნული სახის შეცვლა @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw ტექნიკური ნახაზი - + Add Centerline to Faces ზედაპირებისთვის ღერძული ხაზის დამატება @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw ტექნიკური ნახაზი - + Add Leaderline to View ხედზე გატანადი ხაზის დამატება @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw ტექნიკური ნახაზი - + Add Midpoint Vertices შუაწერტილის წვეროების დამატება @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw ტექნიკური ნახაზი - + Add Quadrant Vertices კუთხეებში წვეროების დამატება @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw ტექნიკური ნახაზი - + Insert Rich Text Annotation ფორმატირებული ანოტაციის დამატება @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw ტექნიკური ნახაზი - + Show/Hide Invisible Edges უხილავი წიბოების ჩვენების ჩართ/გამორთ @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw ტექნიკური ნახაზი - + Create a Surface Finish Symbol ზედაპირის ფინიშის სიმბოლოს შექმნა - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel აირჩიეტ ხედი<br> -დააწკაპუნეთ ამ ღილაკზე<br> -გახსნილ პანელში ზედაპირის დასრულების სიმბოლოს ატრიბუტები აირჩიეთ @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw ტექნიკური ნახაზი - + Add Welding Information to Leaderline გატანად ხაზისთვის შედუღების ინფორმაციის დამატება @@ -2020,17 +2020,17 @@ გვერდის DXF-ში შენახვა - + Add Midpoint Vertices შუაწერტილის წვეროების დამატება - + Add Quadrant Vertices კუთხეებში წვეროების დამატება - + Create Annotation ანოტაციის შექმნა @@ -2091,10 +2091,16 @@ ცენტრალურ ხაზის შექმნა + Create Cosmetic Line დამხმარე ხაზის შექმნა + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ დახურეთ აქტიური ამოცანის ფანჯარა და თავიდან სცადეთ. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection არასწორი არჩევანი - + Can not attach leader. No base View selected. გატანის მიბმის შეცდომა. საბაზისო ხედი არაა არჩეული. - - - - + + + + You must select a base View for the line. უნდა აირჩიოთ ხაზის საბაზისო ხედი. - - + + No DrawViewPart objects in this selection ამ მონიშნულში DrawViewPart ტიპის ობიექტები არაა - - + + No base View in Selection. მონიშნული საბაზისო ხედი არაა. - + You must select Faces or an existing CenterLine. უნდა მონიშნოთ ზედაპირები ან არსებული ცენტრის ხაზები. - + No CenterLine in selection. მონიშნულში ცენტრის ხაზები არაა. - - - + + + Selection is not a CenterLine. მონიშნული ცენტრის ხაზი არაა. - + Selection not understood. გაუგებარი მონიშვნა. - + You must select 2 Vertexes or an existing CenterLine. უნდა მონიშნოთ 2 წვერო ან არსებული ცენტრის ხაზები. - + Need 2 Vertices or 1 CenterLine. საჭიროა ორი წვერო ან ერთი ცენტრი ხაზი. - + + Selection is empty. მონიშნული ცარიელია. - + Not enough points in selection. მონიშნულში არასაკმარისი წერტილებია. - + Selection is not a Cosmetic Line. მონიშნული არ წარმოადგენს კოსმეტიკურ ხაზს. - + You must select 2 Vertexes. უნდა მონიშნოთ ორი წვერო. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected არაფერია არჩეული - + At least 1 object in selection is not a part view მონიშნულში მინიმუმ 1 ობიექტი ნაწილის ხედს არ წარმოადგენს - + Unknown object type in selection მონიშნულში ობიექტის უცნობი ტიპია - + No View in Selection. მონიშნულში ხედი არ არსებობს. - + You must select a View and/or lines. უნდა აირჩიოთ ხედი და/ან ხაზები. - + No Part Views in this selection ამ მონიშნულში არ არსებობს ნაწილის ხედები - + Select exactly one Leader line or one Weld symbol. აირჩიეთ ზუსტად ერთი გატანადი ხაზი ან ერთი შედუღების ნიშანი. - - + + SurfaceFinishSymbols ზედაპირისდასრულებისსიმბოლოები - + No Part View in Selection მონიშნულში ნაწილის ხედი არ არსებობს - + No %1 in Selection მონიშნულში %1 არ არსებობს @@ -3538,11 +3566,13 @@ შედუღებითი კავშირის ხატულის შეცვლა + Create Cosmetic Line დამხმარე ხაზის შექმნა + Edit Cosmetic Line დამხმარე ხაზის ჩასწორება @@ -3678,7 +3708,7 @@ ქვეელემენტები არჩეული არაა - + @@ -3686,7 +3716,7 @@ მონიშნული ცარიელია - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. რომ მას აქვს შედუღების ნიშანი, რომელიც გაფუჭდება. - + You cannot delete this view because it has one or more dependent views that would become broken. თქვენ არ შეგიძლიათ ამ ხედის წაშლა იმიტომ, რომ მას გააჩნია ერთი ან მეტი დამოკიდებული ხედი, რომელიც გაფუჭდებოდა. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies ობიექტის დამოკიდებულებები @@ -8193,7 +8223,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines ორ ხაზს შუა ცენტრის ხაზის გავლება @@ -8201,7 +8231,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points ორ წერტილს შორის ცენტრის ხაზის დამატება @@ -8217,7 +8247,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View ხედში კოსმეტიკური წვეროს ჩასმა @@ -8238,7 +8268,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces ზედაპირებზე ცენტრის ხაზების დამატება @@ -8254,7 +8284,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges მონიშნული წიბოების შუა წერტილებში კოსმეტიკური წვეროების ჩასმა @@ -8262,7 +8292,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles მონიშნული წრეწირების მაქსიმალურად დაშორებულ წერტილებში დამხმარე წვეროების ჩასმა @@ -8949,4 +8979,100 @@ there is an open task dialog. გეომეტრიული დაშტრიხვა + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + კოსმეტიკური წრეწირი + + + + View + ხედი + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2D წერტილი + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3D წერტილი + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + რადიუსი: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + ტექნიკური ნახაზი + + + + Add Cosmetic Circle + კოსმეტიკური წრეწირის დამატება + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ko.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ko.ts index 0b31bd6064..40c1110922 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ko.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ko.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines 두 선 사이에 중심선 추가 @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points 두 점 사이에 중심선 추가 @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices 중간점 정점 추가 @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices 사분원 정점 추가 @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines 두 선 사이에 중심선 추가 @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points 두 점 사이에 중심선 추가 @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points 두 점을 지나는 꾸밈선 추가 @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation 주석 삽입 @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line 중심 선 삽입 - + Add Centerline to Faces 면에 중심선 추가 @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object 꾸밈 객체 제거 @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex 꾸밈 꼭짓점 추가 @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex 꾸밈 꼭짓점 삽입 - + Add Cosmetic Vertex 꾸밈 꼭짓점 추가 @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines 선 외형 변경 - + Change Appearance of selected Lines 선택한 선의 외형 변경 @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces 면에 중심선 추가 @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Add Leaderline to View @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices 중간점 정점 추가 @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices 사분원 정점 추가 @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Insert Rich Text Annotation @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Show/Hide Invisible Edges @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Add Welding Information to Leaderline @@ -2020,17 +2020,17 @@ Save page to dxf - + Add Midpoint Vertices 중간점 정점 추가 - + Add Quadrant Vertices 사분원 정점 추가 - + Create Annotation Create Annotation @@ -2091,10 +2091,16 @@ Create CenterLine + Create Cosmetic Line Create Cosmetic Line + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Close active task dialog and try again. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Wrong Selection - + Can not attach leader. No base View selected. Can not attach leader. No base View selected. - - - - + + + + You must select a base View for the line. You must select a base View for the line. - - + + No DrawViewPart objects in this selection No DrawViewPart objects in this selection - - + + No base View in Selection. No base View in Selection. - + You must select Faces or an existing CenterLine. You must select Faces or an existing CenterLine. - + No CenterLine in selection. No CenterLine in selection. - - - + + + Selection is not a CenterLine. Selection is not a CenterLine. - + Selection not understood. Selection not understood. - + You must select 2 Vertexes or an existing CenterLine. You must select 2 Vertexes or an existing CenterLine. - + Need 2 Vertices or 1 CenterLine. Need 2 Vertices or 1 CenterLine. - + + Selection is empty. Selection is empty. - + Not enough points in selection. Not enough points in selection. - + Selection is not a Cosmetic Line. Selection is not a Cosmetic Line. - + You must select 2 Vertexes. You must select 2 Vertexes. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nothing selected - + At least 1 object in selection is not a part view At least 1 object in selection is not a part view - + Unknown object type in selection Unknown object type in selection - + No View in Selection. No View in Selection. - + You must select a View and/or lines. You must select a View and/or lines. - + No Part Views in this selection No Part Views in this selection - + Select exactly one Leader line or one Weld symbol. Select exactly one Leader line or one Weld symbol. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edit Welding Symbol + Create Cosmetic Line Create Cosmetic Line + Edit Cosmetic Line Edit Cosmetic Line @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. it has a weld symbol that would become broken. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies 객체 종속성 @@ -8196,7 +8226,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Adds a Centerline between 2 Lines @@ -8204,7 +8234,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Adds a Centerline between 2 Points @@ -8220,7 +8250,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8241,7 +8271,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8257,7 +8287,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8265,7 +8295,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8952,4 +8982,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + 보기 + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Point + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Point + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + 반경: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_nl.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_nl.ts index 4e7a551d90..e29486f6bf 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_nl.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_nl.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Voeg een middenlijn tussen 2 lijnen toe @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Voeg een middenlijn tussen 2 punten toe @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Voeg middelpunten toe @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Voeg kwadrantpunten toe @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Voeg een middenlijn tussen 2 lijnen toe @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Voeg een middenlijn tussen 2 punten toe @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Voeg symbolische Lijn Door 2 Punten @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Voeg een annotatie in @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Voeg een middenlijn in - + Add Centerline to Faces Voeg een middenlijn toe aan vlakken @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Verwijder cosmetisch object @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Voeg een cosmetisch eindpunt toe @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Voeg een cosmetisch eindpunt in - + Add Cosmetic Vertex Voeg een cosmetisch eindpunt toe @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Verander uiterlijk van de lijnen - + Change Appearance of selected Lines Wijzig uiterlijk van geselecteerde lijnen @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Voeg een middenlijn toe aan vlakken @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Voeg een leiderslijn aan de weergave toe @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Voeg middelpunten toe @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Voeg kwadrantpunten toe @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Voeg een opgemaakte tekstannotatie @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Onzichtbare randen weergeven/verbergen @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Voeg lasinformatie toe aan leiderslijn @@ -2020,17 +2020,17 @@ Pagina in dxf opslaan - + Add Midpoint Vertices Voeg middelpunten toe - + Add Quadrant Vertices Voeg kwadrantpunten toe - + Create Annotation Aantekening maken @@ -2091,10 +2091,16 @@ Maak een middenlijn + Create Cosmetic Line Cosmetische lijn maken + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Sluit het actieve taakvenster en probeer opnieuw. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Verkeerde selectie - + Can not attach leader. No base View selected. Kan de leider niet bijvoegen. Geen basisweergave geselecteerd. - - - - + + + + You must select a base View for the line. U moet een basisweergave voor deze lijn selecteren. - - + + No DrawViewPart objects in this selection Geen DrawViewPart-objecten in deze selectie - - + + No base View in Selection. Geen basisweergave in de selectie. - + You must select Faces or an existing CenterLine. U moet vlakken of een bestaand middenlijn selecteren. - + No CenterLine in selection. Geen middenlijn in selectie. - - - + + + Selection is not a CenterLine. Selectie is geen middenlijn. - + Selection not understood. Selectie niet begrepen. - + You must select 2 Vertexes or an existing CenterLine. U moet 2 eindpunten of een bestaande middenlijn selecteren. - + Need 2 Vertices or 1 CenterLine. Vereist 2 eindpunten of 1 middenlijn. - + + Selection is empty. Selectie is leeg. - + Not enough points in selection. Niet genoeg punten in selectie. - + Selection is not a Cosmetic Line. Selectie is geen cosmetische lijn. - + You must select 2 Vertexes. U moet 2 hoekpunten selecteren. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Niets geselecteerd - + At least 1 object in selection is not a part view Tenminste 1 object in de selectie is geen deelweergave - + Unknown object type in selection Onbekend objecttype in de selectie - + No View in Selection. Geen weergave in de selectie. - + You must select a View and/or lines. U moet een aanzicht en/of lijnen selecteren. - + No Part Views in this selection Geen deelweergaves in deze selectie - + Select exactly one Leader line or one Weld symbol. Selecteer precies een leiderslijn of een lassymbool. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection Geen %1 in selectie @@ -3538,11 +3566,13 @@ Bewerk lassymbool + Create Cosmetic Line Cosmetische lijn maken + Edit Cosmetic Line Bewerk Cosmetische lijn @@ -3678,7 +3708,7 @@ Geen subelementen geselecteerd - + @@ -3686,7 +3716,7 @@ Selectie is leeg - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. een Lassymbool heeft dat kapot zou gaan. - + You cannot delete this view because it has one or more dependent views that would become broken. U kunt deze weergave niet verwijderen omdat deze een of meerdere afhankelijke weergave(s) heeft, die dan beschadigd raken. @@ -3844,7 +3874,7 @@ een Lassymbool heeft dat kapot zou gaan. - + Object dependencies Object afhankelijkheden @@ -8196,7 +8226,7 @@ met behulp van de gegeven X/Y afstand TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Voegt een middenlijn tussen 2 lijnen toe @@ -8204,7 +8234,7 @@ met behulp van de gegeven X/Y afstand TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Voegt een middenlijn tussen 2 punten toe @@ -8220,7 +8250,7 @@ met behulp van de gegeven X/Y afstand TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Voegt een cosmetisch eindpunt in een weergave in @@ -8241,7 +8271,7 @@ met behulp van de gegeven X/Y afstand TechDraw_FaceCenterLine - + Adds a Centerline to Faces Voegt een middenlijn toe aan vlakken @@ -8257,7 +8287,7 @@ met behulp van de gegeven X/Y afstand TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Voegt cosmetische eindpunten toe aan het midden van de geselecteerde randen @@ -8265,7 +8295,7 @@ met behulp van de gegeven X/Y afstand TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Voegt cosmetische eindpunten toe aan de kwadrantpunten van geselecteerde cirkels @@ -8952,4 +8982,100 @@ een open taak dialoogvenster is. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetische cirkel + + + + View + Aanzicht + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2D punt + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3D-punt + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Straal: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Cosmetische cirkel toevoegen + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pl.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pl.ts index 0e9f3829ca..9f03f8591b 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pl.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pl.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Dodaj oś pomiędzy dwiema liniami @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Dodaj oś pomiędzy dwoma punktami @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Dodaj wierzchołki punktu środkowego @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Dodaj wierzchołki kwadrantu @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw Rysunek Techniczny - + Add Centerline between 2 Lines Dodaj oś pomiędzy dwiema liniami @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw Rysunek Techniczny - + Add Centerline between 2 Points Dodaj oś pomiędzy dwoma punktami @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw Rysunek Techniczny - + Add Cosmetic Line Through 2 Points Dodaj linię kosmetyczną wytyczoną przez dwa punkty @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw Rysunek Techniczny - + Insert Annotation Wstaw adnotację @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw Rysunek Techniczny - + Insert Center Line Dodaj linię środkową - + Add Centerline to Faces Dodaj oś ściany @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw Rysunek Techniczny - + Remove Cosmetic Object Usuń geometrie pomocnicze @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw Rysunek Techniczny - + Add Cosmetic Vertex Dodaj wierzchołek kosmetyczny @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw Rysunek Techniczny - + Insert Cosmetic Vertex Wstaw wierzchołek kosmetyczny - + Add Cosmetic Vertex Dodaj wierzchołek kosmetyczny @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw Rysunek Techniczny - + Change Appearance of Lines Zmień wygląd linii - + Change Appearance of selected Lines Zmień wygląd wybranych linii @@ -1438,12 +1438,12 @@ CmdTechDrawFaceCenterLine - + TechDraw Rysunek Techniczny - + Add Centerline to Faces Dodaj oś ściany @@ -1545,12 +1545,12 @@ CmdTechDrawLeaderLine - + TechDraw Rysunek Techniczny - + Add Leaderline to View Dodaj linię odniesienia do widoku @@ -1584,12 +1584,12 @@ CmdTechDrawMidpoints - + TechDraw Rysunek Techniczny - + Add Midpoint Vertices Dodaj wierzchołki punktu środkowego @@ -1677,12 +1677,12 @@ CmdTechDrawQuadrants - + TechDraw Rysunek Techniczny - + Add Quadrant Vertices Dodaj wierzchołki kwadrantu @@ -1716,12 +1716,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw Rysunek Techniczny - + Insert Rich Text Annotation Wstaw adnotację w postaci tekstu sformatowanego @@ -1765,12 +1765,12 @@ CmdTechDrawShowAll - + TechDraw Rysunek Techniczny - + Show/Hide Invisible Edges Pokaż / ukryj niewidoczne krawędzie @@ -1881,17 +1881,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw Rysunek Techniczny - + Create a Surface Finish Symbol Dodaj symbol wykończenia powierzchni - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Wybierz widok<br> - kliknij ten przycisk<br> - wybierz atrybuty symbolu wykończenia powierzchni w otwartym panelu @@ -1975,12 +1975,12 @@ CmdTechDrawWeldSymbol - + TechDraw Rysunek Techniczny - + Add Welding Information to Leaderline Dodaj informacje spawalnicze do linii odniesienia @@ -2045,17 +2045,17 @@ Zapisz stronę do pliku dxf - + Add Midpoint Vertices Dodaj wierzchołki punktu środkowego - + Add Quadrant Vertices Dodaj wierzchołki kwadrantu - + Create Annotation Utwórz adnotację @@ -2116,10 +2116,16 @@ Utwórz linię środkową + Create Cosmetic Line Utwórz linię kosmetyczną + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2730,14 +2736,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3087,21 +3093,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3136,21 +3143,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3182,158 +3190,178 @@ Zamknij okno aktywnego zadania i spróbuj ponownie. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Nieprawidłowy wybór - + Can not attach leader. No base View selected. Nie można dołączyć linii odniesienia. Nie wybrano podstawowego widoku. - - - - + + + + You must select a base View for the line. Musisz wybrać widok dla odniesienia linii. - - + + No DrawViewPart objects in this selection Brak obiektów DrawViewPart w tym zaznaczeniu - - + + No base View in Selection. Brak bazowego widoku w zaznaczeniu. - + You must select Faces or an existing CenterLine. Musisz wybrać ściany lub istniejącą linię centralną. - + No CenterLine in selection. Brak linii centralnej w wyborze. - - - + + + Selection is not a CenterLine. Wybrany element nie jest linią środkową. - + Selection not understood. Zaznaczenie niezrozumiałe. - + You must select 2 Vertexes or an existing CenterLine. Musisz wybrać 2 wierzchołki lub istniejącą linię centralną. - + Need 2 Vertices or 1 CenterLine. Wymagane są dwa wierzchołki lub linia środkowa. - + + Selection is empty. Obszar zaznaczenia nie zawiera obiektów. - + Not enough points in selection. Wybrano za małą ilość punktów. - + Selection is not a Cosmetic Line. Wybrany element nie jest Linią Kosmetyczną. - + You must select 2 Vertexes. Musisz wybrać 2 wierzchołki. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nic nie wybrano - + At least 1 object in selection is not a part view Co najmniej 1 obiekt w zaznaczeniu nie jest widokiem części - + Unknown object type in selection Nie znany typ obiektu w zaznaczeniu - + No View in Selection. Brak "widoku" w zaznaczeniu. - + You must select a View and/or lines. Musisz wybrać widok i/lub linie. - + No Part Views in this selection Brak widoków części w tym zaznaczeniu - + Select exactly one Leader line or one Weld symbol. Wybierz dokładnie jedną linię odniesienia lub jeden symbol spawalniczy. - - + + SurfaceFinishSymbols Symbole wykończenia powierzchni - + No Part View in Selection Brak widoku części w wyborze - + No %1 in Selection Brak %1 w zaznaczeniu @@ -3563,11 +3591,13 @@ Edytuj symbol spawalniczy + Create Cosmetic Line Utwórz linię kosmetyczną + Edit Cosmetic Line Edytuj linię kosmetyczną @@ -3703,7 +3733,7 @@ Nie wybrano elementów podrzędnych - + @@ -3711,7 +3741,7 @@ Obszar zaznaczenia nie zawiera obiektów - + No object selected @@ -3855,7 +3885,7 @@ it has a weld symbol that would become broken. zawiera symbol spoiny który zostałby uszkodzony. - + You cannot delete this view because it has one or more dependent views that would become broken. Nie można usunąć tego widoku, ponieważ ma on co najmniej jeden obiekt zależny, który zostałby uszkodzony. @@ -3869,7 +3899,7 @@ zawiera symbol spoiny który zostałby uszkodzony. - + Object dependencies Zależności obiektu @@ -8223,7 +8253,7 @@ przy użyciu podanego odstępu X/Y TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Dodaj linię środkową pomiędzy dwoma liniami @@ -8231,7 +8261,7 @@ przy użyciu podanego odstępu X/Y TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Dodaj linię środkową pomiędzy dwoma punktami @@ -8247,7 +8277,7 @@ przy użyciu podanego odstępu X/Y TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Wstawia kosmetyczny wierzchołek do widoku @@ -8268,7 +8298,7 @@ przy użyciu podanego odstępu X/Y TechDraw_FaceCenterLine - + Adds a Centerline to Faces Dodaje linię środkową do ściany @@ -8284,7 +8314,7 @@ przy użyciu podanego odstępu X/Y TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Wstawia kosmetyczne wierzchołki w punkcie środkowym wybranych krawędzi @@ -8292,7 +8322,7 @@ przy użyciu podanego odstępu X/Y TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Wstawia wierzchołki kosmetyczne w punktach kwadrantu wybranych okręgów @@ -8864,7 +8894,7 @@ jest otwarte okno dialogowe zadania. Section - Przecięcie + Przekrój @@ -8872,7 +8902,7 @@ jest otwarte okno dialogowe zadania. Section - Przecięcie + Przekrój @@ -8979,4 +9009,100 @@ jest otwarte okno dialogowe zadania. Kreskowanie geometryczne + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Okrąg pomocniczy + + + + View + Widok + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Punkt 2D + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Punkt 3D + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Promień: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + Rysunek Techniczny + + + + Add Cosmetic Circle + Dodaj okrąg kosmetyczny + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pt-BR.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pt-BR.ts index 902968c4d5..82278768dc 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pt-BR.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pt-BR.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Adicionar linha central às duas linhas @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Adicionar linha central aos dois pontos @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Adicionar ponto central aos vértices @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Adicionar vértices de segundo grau @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - Desenhos Técnicos - + Add Centerline between 2 Lines Adicionar linha central às duas linhas @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - Desenhos Técnicos - + Add Centerline between 2 Points Adicionar linha central aos dois pontos @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - Desenhos Técnicos - + Add Cosmetic Line Through 2 Points Adicionar uma linha cosmética passando por 2 pontos @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - Desenhos Técnicos - + Insert Annotation Inserir anotação @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - Desenhos Técnicos - + Insert Center Line Inserir Linha Central - + Add Centerline to Faces Adicionar linha de centro em Faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - Desenhos Técnicos - + Remove Cosmetic Object Remover objeto cosmético @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - Desenhos Técnicos - + Add Cosmetic Vertex Adicionar Vértice Cosmético @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - Desenhos Técnicos - + Insert Cosmetic Vertex Adicionar vértice cosmético - + Add Cosmetic Vertex Adicionar Vértice Cosmético @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - Desenhos Técnicos - + Change Appearance of Lines Alterar Aparência das Linhas - + Change Appearance of selected Lines Alterar a aparência das linhas selecionadas @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - Desenhos Técnicos - + Add Centerline to Faces Adicionar linha de centro em Faces @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - Desenhos Técnicos - + Add Leaderline to View Adicionar linha de chamada a uma Vista @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - Desenhos Técnicos - + Add Midpoint Vertices Adicionar ponto central aos vértices @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - Desenhos Técnicos - + Add Quadrant Vertices Adicionar vértices de segundo grau @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - Desenhos Técnicos - + Insert Rich Text Annotation Inserir anotação de texto @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - Desenhos Técnicos - + Show/Hide Invisible Edges Mostrar/ocultar arestas invisíveis @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - Desenhos Técnicos - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - Desenhos Técnicos - + Add Welding Information to Leaderline Adicionar informações de solda na linha de anotação @@ -2020,17 +2020,17 @@ Salvar página para dxf - + Add Midpoint Vertices Adicionar ponto central aos vértices - + Add Quadrant Vertices Adicionar vértices de segundo grau - + Create Annotation Criar anotação @@ -2091,10 +2091,16 @@ Criar linha central + Create Cosmetic Line Criar Linha Cosmética + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Feche a caixa de diálogo ativa e tente novamente. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Seleção errada - + Can not attach leader. No base View selected. Não é possível anexar linha de anotações. Não há nenhuma vista de base selecionada. - - - - + + + + You must select a base View for the line. Você deve selecionar uma vista de base para a linha. - - + + No DrawViewPart objects in this selection Não há objetos DrawViewPart nesta seleção - - + + No base View in Selection. Nenhuma vista de base na seleção. - + You must select Faces or an existing CenterLine. Você deve selecionar faces ou uma linha de centro. - + No CenterLine in selection. Não há linha central na seleção. - - - + + + Selection is not a CenterLine. A seleção não é uma linha central. - + Selection not understood. Seleção não compreendida. - + You must select 2 Vertexes or an existing CenterLine. Você deve selecionar 2 vértices ou uma linha central existente. - + Need 2 Vertices or 1 CenterLine. Precisa de 2 vértices ou 1 linha central. - + + Selection is empty. A seleção está vazia. - + Not enough points in selection. Não há pontos suficientes na seleção. - + Selection is not a Cosmetic Line. A seleção não é uma linha cosmética. - + You must select 2 Vertexes. Você deve selecionar 2 vértices. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nada foi selecionado - + At least 1 object in selection is not a part view Pelo menos 1 objeto na seleção não é uma vista de peça - + Unknown object type in selection Tipo de objeto desconhecido na seleção - + No View in Selection. Nenhuma vista na seleção. - + You must select a View and/or lines. Você deve selecionar uma vista e/ou linhas. - + No Part Views in this selection Nenhuma vista de peça nesta seleção - + Select exactly one Leader line or one Weld symbol. Selecione exatamente uma linha de anotações ou um símbolo de solda. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Editar símbolo de solda + Create Cosmetic Line Criar Linha Cosmética + Edit Cosmetic Line Editar Linha Cosmética @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ A seleção está vazia - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. ela tem um símbolo de solda que quebraria. - + You cannot delete this view because it has one or more dependent views that would become broken. Você não pode excluir esta visão porque ela tem uma ou mais visualizações dependentes que se tornariam quebradas. @@ -3844,7 +3874,7 @@ ela tem um símbolo de solda que quebraria. - + Object dependencies Dependências do objeto @@ -8196,7 +8226,7 @@ usando o espaçamento X/Y fornecido TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Adicionar linha central entre duas linhas @@ -8204,7 +8234,7 @@ usando o espaçamento X/Y fornecido TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Adicionar linha central entre dois pontos @@ -8220,7 +8250,7 @@ usando o espaçamento X/Y fornecido TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Insere um vértice cosmético na vista @@ -8241,7 +8271,7 @@ usando o espaçamento X/Y fornecido TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adicionar linha central em faces @@ -8257,7 +8287,7 @@ usando o espaçamento X/Y fornecido TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Insere vértices cosméticos no ponto central das arestas selecionadas @@ -8265,7 +8295,7 @@ usando o espaçamento X/Y fornecido TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Insere vértices cosméticos nos quadrantes dos círculos selecionados @@ -8952,4 +8982,100 @@ there is an open task dialog. HachuraGeom + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Vista + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + Ponto 2D + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + Ponto 3D + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Raio: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw - Desenhos Técnicos + + + + Add Cosmetic Circle + Adicionar Círculo Cosmético + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pt-PT.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pt-PT.ts index 7f5f67c17a..16ed1188cb 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pt-PT.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_pt-PT.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Adicionar linha de eixo entre 2 linhas @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Adicionar linha de eixo entre 2 Pontos @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Adicionar vértices de ponto médio @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Adicionar vértices do Quadrante @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw (Desenhos Técnicos) - + Add Centerline between 2 Lines Adicionar linha de eixo entre 2 linhas @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw (Desenhos Técnicos) - + Add Centerline between 2 Points Adicionar linha de eixo entre 2 Pontos @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw (Desenhos Técnicos) - + Add Cosmetic Line Through 2 Points Adicionar Linha Cosmética Através de 2 Pontos @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw (Desenhos Técnicos) - + Insert Annotation Inserir anotação @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw (Desenhos Técnicos) - + Insert Center Line Inserir Linha de Eixo - + Add Centerline to Faces Adicionar linha de eixo ás Faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw (Desenhos Técnicos) - + Remove Cosmetic Object Remover objeto cosmético @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw (Desenhos Técnicos) - + Add Cosmetic Vertex Adicionar Vértice Cosmético @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw (Desenhos Técnicos) - + Insert Cosmetic Vertex Inserir Vértice Cosmético - + Add Cosmetic Vertex Adicionar Vértice Cosmético @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw (Desenhos Técnicos) - + Change Appearance of Lines Alterar Aparência das Linhas - + Change Appearance of selected Lines Alterar a aparência das linhas selecionadas @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw (Desenhos Técnicos) - + Add Centerline to Faces Adicionar linha de eixo ás Faces @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw (Desenhos Técnicos) - + Add Leaderline to View Adicionar Linha de chamada na Vista @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw (Desenhos Técnicos) - + Add Midpoint Vertices Adicionar vértices de ponto médio @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw (Desenhos Técnicos) - + Add Quadrant Vertices Adicionar vértices do Quadrante @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw (Desenhos Técnicos) - + Insert Rich Text Annotation Inserir anotação de Rich Text @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw (Desenhos Técnicos) - + Show/Hide Invisible Edges Mostrar/Ocultar arestas invisíveis @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw (Desenhos Técnicos) - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw (Desenhos Técnicos) - + Add Welding Information to Leaderline Adicionar Linha de chamada com Informações de soldadura @@ -2020,17 +2020,17 @@ Salvar folha para dxf - + Add Midpoint Vertices Adicionar vértices de ponto médio - + Add Quadrant Vertices Adicionar vértices do Quadrante - + Create Annotation Criar anotação @@ -2091,10 +2091,16 @@ Criar LinhadeEixo + Create Cosmetic Line Criar Linha Cosmética + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Fechar a caixa de diálogo ativa e tentar novamente. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Seleção errada - + Can not attach leader. No base View selected. Não é possível anexar chamada. Nenhuma vista base selecionada. - - - - + + + + You must select a base View for the line. Deve selecionar uma vista base para a linha. - - + + No DrawViewPart objects in this selection Não há objetos de desenho nesta seleção - - + + No base View in Selection. Nenhuma vista base na seleção. - + You must select Faces or an existing CenterLine. Deve selecionar Faces ou uma linha de eixo. - + No CenterLine in selection. Não há linha de eixo na seleção. - - - + + + Selection is not a CenterLine. A seleção não é uma linha de eixo. - + Selection not understood. Seleção não compreendida. - + You must select 2 Vertexes or an existing CenterLine. Deve selecionar 2 vértices ou uma linha de eixo existente. - + Need 2 Vertices or 1 CenterLine. Precisa de 2 vértices ou 1 linha de eixo. - + + Selection is empty. A seleção está vazia. - + Not enough points in selection. Não há pontos suficientes na seleção. - + Selection is not a Cosmetic Line. A seleção não é uma linha cosmética. - + You must select 2 Vertexes. Deve selecionar 2 vértices. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nada selecionado - + At least 1 object in selection is not a part view Pelo menos 1 objeto na seleção não é uma vista de peça - + Unknown object type in selection Tipo de objeto desconhecido na seleção - + No View in Selection. Nenhuma vista na seleção. - + You must select a View and/or lines. Deve selecionar uma vista e/ou linhas. - + No Part Views in this selection Não há vistas de peças nesta seleção - + Select exactly one Leader line or one Weld symbol. Selecione apenas uma linha de chamada ou um símbolo de soldadura. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Editar Símbolo de soldadura + Create Cosmetic Line Criar Linha Cosmética + Edit Cosmetic Line Editar Linha Cosmética @@ -3678,7 +3708,7 @@ Nenhum sub-elemento selecionado - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. ela tem um símbolo de soldadura que se quebrará. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3844,7 +3874,7 @@ ela tem um símbolo de soldadura que se quebrará. - + Object dependencies Dependências do objeto @@ -8195,7 +8225,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Adds a Centerline between 2 Lines @@ -8203,7 +8233,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Adds a Centerline between 2 Points @@ -8219,7 +8249,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8240,7 +8270,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8256,7 +8286,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8264,7 +8294,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8951,4 +8981,100 @@ há uma caixa de diálogo aberta. TramaGeometrica + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Ver + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Point + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Point + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Raio: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw (Desenhos Técnicos) + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ro.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ro.ts index d92d20be83..11f1442704 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ro.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ro.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Add Centerline between 2 Lines @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Add Centerline between 2 Points @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Add Midpoint Vertices @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Add Quadrant Vertices @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw Desen tehnic - + Add Centerline between 2 Lines Add Centerline between 2 Lines @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw Desen tehnic - + Add Centerline between 2 Points Add Centerline between 2 Points @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw Desen tehnic - + Add Cosmetic Line Through 2 Points Add Cosmetic Line Through 2 Points @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw Desen tehnic - + Insert Annotation Inserare adnotare @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw Desen tehnic - + Insert Center Line Insert Center Line - + Add Centerline to Faces Add Centerline to Faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw Desen tehnic - + Remove Cosmetic Object Remove Cosmetic Object @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw Desen tehnic - + Add Cosmetic Vertex Add Cosmetic Vertex @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw Desen tehnic - + Insert Cosmetic Vertex Insert Cosmetic Vertex - + Add Cosmetic Vertex Add Cosmetic Vertex @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw Desen tehnic - + Change Appearance of Lines Change Appearance of Lines - + Change Appearance of selected Lines Change Appearance of selected Lines @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw Desen tehnic - + Add Centerline to Faces Add Centerline to Faces @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw Desen tehnic - + Add Leaderline to View Add Leaderline to View @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw Desen tehnic - + Add Midpoint Vertices Add Midpoint Vertices @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw Desen tehnic - + Add Quadrant Vertices Add Quadrant Vertices @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw Desen tehnic - + Insert Rich Text Annotation Insert Rich Text Annotation @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw Desen tehnic - + Show/Hide Invisible Edges Show/Hide Invisible Edges @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw Desen tehnic - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw Desen tehnic - + Add Welding Information to Leaderline Add Welding Information to Leaderline @@ -2020,17 +2020,17 @@ Save page to dxf - + Add Midpoint Vertices Add Midpoint Vertices - + Add Quadrant Vertices Add Quadrant Vertices - + Create Annotation Create Annotation @@ -2091,10 +2091,16 @@ Create CenterLine + Create Cosmetic Line Create Cosmetic Line + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Close active task dialog and try again. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Wrong Selection - + Can not attach leader. No base View selected. Can not attach leader. No base View selected. - - - - + + + + You must select a base View for the line. You must select a base View for the line. - - + + No DrawViewPart objects in this selection No DrawViewPart objects in this selection - - + + No base View in Selection. No base View in Selection. - + You must select Faces or an existing CenterLine. You must select Faces or an existing CenterLine. - + No CenterLine in selection. No CenterLine in selection. - - - + + + Selection is not a CenterLine. Selection is not a CenterLine. - + Selection not understood. Selection not understood. - + You must select 2 Vertexes or an existing CenterLine. You must select 2 Vertexes or an existing CenterLine. - + Need 2 Vertices or 1 CenterLine. Need 2 Vertices or 1 CenterLine. - + + Selection is empty. Selection is empty. - + Not enough points in selection. Not enough points in selection. - + Selection is not a Cosmetic Line. Selection is not a Cosmetic Line. - + You must select 2 Vertexes. You must select 2 Vertexes. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nothing selected - + At least 1 object in selection is not a part view At least 1 object in selection is not a part view - + Unknown object type in selection Unknown object type in selection - + No View in Selection. No View in Selection. - + You must select a View and/or lines. You must select a View and/or lines. - + No Part Views in this selection No Part Views in this selection - + Select exactly one Leader line or one Weld symbol. Select exactly one Leader line or one Weld symbol. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edit Welding Symbol + Create Cosmetic Line Create Cosmetic Line + Edit Cosmetic Line Edit Cosmetic Line @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. it has a weld symbol that would become broken. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies Dependențe obiect @@ -8195,7 +8225,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Adds a Centerline between 2 Lines @@ -8203,7 +8233,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Adds a Centerline between 2 Points @@ -8219,7 +8249,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8240,7 +8270,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8256,7 +8286,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8264,7 +8294,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8951,4 +8981,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Vizualizare + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Point + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Point + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Raza: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + Desen tehnic + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ru.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ru.ts index adfdff8e95..ee3fed9420 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ru.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_ru.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Добавить Осевую линию между 2 Линиями @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Добавить Осевую линию между 2 Точками @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Добавить вершины по центрам граней @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Добавить 4-ре вершины по краям окружности @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw Технический чертёж - + Add Centerline between 2 Lines Добавить Осевую линию между 2 Линиями @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw Технический чертёж - + Add Centerline between 2 Points Добавить Осевую линию между 2 Точками @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw Технический чертёж - + Add Cosmetic Line Through 2 Points Добавить вспомогательную линию между 2-мя точками @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw Технический чертёж - + Insert Annotation Вставить заметку @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw Технический чертёж - + Insert Center Line Добавить осевую линию - + Add Centerline to Faces Добавить Осевую линию к Граням @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw Технический чертёж - + Remove Cosmetic Object Удалить вспомогательный объект @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw Технический чертёж - + Add Cosmetic Vertex Добавить вспомогательную вершину @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw Технический чертёж - + Insert Cosmetic Vertex Вставить вспомогательную вершину - + Add Cosmetic Vertex Добавить вспомогательную вершину @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw Технический чертёж - + Change Appearance of Lines Изменить внешний вид линий - + Change Appearance of selected Lines Изменить внешний вид выбранных линий @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw Технический чертёж - + Add Centerline to Faces Добавить Осевую линию к Граням @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw Технический чертёж - + Add Leaderline to View Добавить линию-выноску в Вид @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw Технический чертёж - + Add Midpoint Vertices Добавить вершины по центрам граней @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw Технический чертёж - + Add Quadrant Vertices Добавить 4-ре вершины по краям окружности @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw Технический чертёж - + Insert Rich Text Annotation Вставка аннотаций форматированным текстом @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw Технический чертёж - + Show/Hide Invisible Edges Показать/скрыть невидимые края @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw Технический чертёж - + Create a Surface Finish Symbol Создать символ финиширования поверхности - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Выберите представление<br> - нажмите эту кнопку<br> - выбрать атрибуты обозначения шероховатости поверхности в открывшейся панели @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw Технический чертёж - + Add Welding Information to Leaderline Добавить информацию о сварке в указательную линию @@ -2020,17 +2020,17 @@ Сохранить лист в DXF формате - + Add Midpoint Vertices Добавить вершины по центрам граней - + Add Quadrant Vertices Добавить 4-ре вершины по краям окружности - + Create Annotation Создать Аннотацию @@ -2091,10 +2091,16 @@ Создать центральную линию + Create Cosmetic Line Создать Косметическую Линию + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Закройте окно активной задачи и повторите снова. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Неправильный выбор - + Can not attach leader. No base View selected. Не могу прикрепить указательную линию. Базовый вид не выбран. - - - - + + + + You must select a base View for the line. Необходимо выбрать базовый вид для линии. - - + + No DrawViewPart objects in this selection Нет объектов DrawViewPart в выбранном - - + + No base View in Selection. Нет базового вида в выбранном. - + You must select Faces or an existing CenterLine. Вы должны выбрать Грани или существующую Осевую Линию. - + No CenterLine in selection. В выбранном нет ОсевойЛинии. - - - + + + Selection is not a CenterLine. Выделение не является центральной линией. - + Selection not understood. Выделение не понятно. - + You must select 2 Vertexes or an existing CenterLine. Вы должны выбрать 2 вершины или существующую осевую линию. - + Need 2 Vertices or 1 CenterLine. Требуется две вершины или одна центральная линия. - + + Selection is empty. Выделение пусто. - + Not enough points in selection. Выбрано недостаточно точек. - + Selection is not a Cosmetic Line. Выделенный объект не является вспомогательной линией. - + You must select 2 Vertexes. Вы должны выбрать 2 Вершины. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Ничего не выбрано - + At least 1 object in selection is not a part view Минимум 1 объект в выбранном не является местным видом - + Unknown object type in selection Неизвестный тип объекта в выбранном - + No View in Selection. Нет Вида в выделенном. - + You must select a View and/or lines. Вы должны выбрать Вид и/или линии. - + No Part Views in this selection Нет видов Детали в этом выборе - + Select exactly one Leader line or one Weld symbol. Выберите только одну линию-выноску или один знак сварки. - - + + SurfaceFinishSymbols Символы шероховатости поверхности - + No Part View in Selection Нет просмотра части(детали) в выделении - + No %1 in Selection Нет %1 в выборе @@ -3538,11 +3566,13 @@ Редактировать знак сварного соединения + Create Cosmetic Line Создать Косметическую Линию + Edit Cosmetic Line Изменить вспомогательную линию @@ -3678,7 +3708,7 @@ Подэлементы не выбраны - + @@ -3686,7 +3716,7 @@ Пустое выделение - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. содержит символ сварки, который может быть повреждён. - + You cannot delete this view because it has one or more dependent views that would become broken. Вы не можете удалить этот вид, потомучто это повредит один или более других зависимых от него видов. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies Зависимости объекта @@ -8192,7 +8222,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Добавить осевую линию между 2 линиями @@ -8200,7 +8230,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Добавить осевую линию между 2 точками @@ -8216,7 +8246,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Вставить вспомогательную вершину в Вид @@ -8237,7 +8267,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Добавить Осевую линию к Граням @@ -8253,7 +8283,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Вставить вспомогательные вершины по центру выбранных ребер @@ -8261,7 +8291,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Вставить вспомогательные вершины в четырех крайних точках выбранной окружности @@ -8948,4 +8978,100 @@ there is an open task dialog. Геометрическая Штриховка + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Косметический круг + + + + View + Вид + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Точка + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Точка + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Радиус: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + Технический чертёж + + + + Add Cosmetic Circle + Добавить косметический круг + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sl.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sl.ts index 3d91e089d4..625f6dde74 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sl.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sl.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Dodaj središčnico med dve daljici @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Dodaj središčnico med dve točki @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Dodaj razpolovišča @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Dodaj četrtinska oglišča @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TehRisanje - + Add Centerline between 2 Lines Dodaj središčnico med dve daljici @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TehRisanje - + Add Centerline between 2 Points Dodaj središčnico med dve točki @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TehRisanje - + Add Cosmetic Line Through 2 Points Dodaj skozi dve točki dopolnilno daljco @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TehRisbe (TechDraw) - + Insert Annotation Vstavi Pripis @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TehRisanje - + Insert Center Line Vstavi središčnico - + Add Centerline to Faces Dodaj ploskvam središčnico @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TehRisanje - + Remove Cosmetic Object Odstrani dopolnilni predmet @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TehRisanje - + Add Cosmetic Vertex Dodaj dopolnilno oglišče @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TehRisanje - + Insert Cosmetic Vertex Vstavi dopolnilno oglišče - + Add Cosmetic Vertex Dodaj dopolnilno oglišče @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TehRisanje - + Change Appearance of Lines Spremeni videz črt - + Change Appearance of selected Lines Spremeni videz črt @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TehRisanje - + Add Centerline to Faces Dodaj ploskvam središčnico @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TehRisanje - + Add Leaderline to View Dodaj pogledu opisnično črto @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TehRisanje - + Add Midpoint Vertices Dodaj razpolovišča @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TehRisanje - + Add Quadrant Vertices Dodaj četrtinska oglišča @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TehRisanje - + Insert Rich Text Annotation Vstavi pripis z obogatenim besedilom @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TehRisanje - + Show/Hide Invisible Edges Prikaži/skrij nevidne robove @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TehRisanje - + Create a Surface Finish Symbol Ustvari znak površinske obdelave - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Izberi pogled<br> - kliknite ta gumb<br> - izberite značilke znaka površinske obdelave v odprtem oknu @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TehRisanje - + Add Welding Information to Leaderline Dodaj opisnici podatek o varjenju @@ -2020,17 +2020,17 @@ Shrani stran kot DXF - + Add Midpoint Vertices Dodaj razpolovišča - + Add Quadrant Vertices Dodaj četrtinska oglišča - + Create Annotation Ustvari pripis @@ -2091,10 +2091,16 @@ Ustvari Središčnico + Create Cosmetic Line Ustvari dopolnilno črto + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Zapri dejavno pogovorno okno z opravili in poskusi ponovno. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Napačen izbor - + Can not attach leader. No base View selected. Opisnice ni mogoče pripeti. Noben osnovni pogled ni izbran. - - - - + + + + You must select a base View for the line. Za črto morate izbrati pogled predloge. - - + + No DrawViewPart objects in this selection Nobenega očrtovalnega pogleda ni v izboru - - + + No base View in Selection. Nobenega osnovnega pogleda ni v izboru. - + You must select Faces or an existing CenterLine. Izbrati morate ploskve ali obstoječo središčnico. - + No CenterLine in selection. V izboru ni nobene središčnice. - - - + + + Selection is not a CenterLine. Izbrano ni središčnica. - + Selection not understood. Izbor ni razumljiv. - + You must select 2 Vertexes or an existing CenterLine. Izbrati morate 2 oglišči ali obstoječo središčnico. - + Need 2 Vertices or 1 CenterLine. Potrebni sta dve oglišči ali ena središčnica. - + + Selection is empty. Nič ni izbrano. - + Not enough points in selection. Izbranih je premalo točk. - + Selection is not a Cosmetic Line. Izbrano ni dopolnilna daljica. - + You must select 2 Vertexes. Izbrani morate dve oglišči. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nič ni izbrano - + At least 1 object in selection is not a part view Vsaj en predmet v izboru ni pogled - + Unknown object type in selection V izboru je nepoznana vrsta predmeta - + No View in Selection. V izboru ni nobenega pogleda. - + You must select a View and/or lines. Izbrati morate pogled in/ali daljice. - + No Part Views in this selection V tem izboru ni pogledov na dele - + Select exactly one Leader line or one Weld symbol. Izberite natanko eno opisnično črto ali eno oznako za zvar. - - + + SurfaceFinishSymbols Znaki površinske obdelave - + No Part View in Selection Nobenega pogleda dela ni v izboru - + No %1 in Selection V izboru ni: %1 @@ -3538,11 +3566,13 @@ Uredi znak za varjenje + Create Cosmetic Line Ustvari dopolnilno črto + Edit Cosmetic Line Uredi dopolnilno črto @@ -3678,7 +3708,7 @@ Nobene izbrane podprvine - + @@ -3686,7 +3716,7 @@ Nič ni izbrano - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. oznako za varjenje, ki bi postala okvarjena. - + You cannot delete this view because it has one or more dependent views that would become broken. Tega pogleda ne morete izbrisati, ker vsebuje enega ali več odvisnih pogledov, ki bi se tako pokvarili. @@ -3844,7 +3874,7 @@ oznako za varjenje, ki bi postala okvarjena. - + Object dependencies Odvisnosti predmetov @@ -8196,7 +8226,7 @@ s pomočjo podanih X/Y odmikov TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Doda somernico med dve daljici @@ -8204,7 +8234,7 @@ s pomočjo podanih X/Y odmikov TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Doda somernico med dve točki @@ -8220,7 +8250,7 @@ s pomočjo podanih X/Y odmikov TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Vstavi v pogled dopolnilno oglišče @@ -8241,7 +8271,7 @@ s pomočjo podanih X/Y odmikov TechDraw_FaceCenterLine - + Adds a Centerline to Faces Doda ploskvam središčnico @@ -8257,7 +8287,7 @@ s pomočjo podanih X/Y odmikov TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Vstavi dopolnilna oglišča na sredino izbranih robov @@ -8265,7 +8295,7 @@ s pomočjo podanih X/Y odmikov TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Vstavi dopolnilna oglišča na četrtinke izbranih krožnic @@ -8951,4 +8981,100 @@ ker je odprto pogovorno okno. Geometrijsko črtkanje + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Pomožni krog + + + + View + Pogled + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2D točka + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3D točka + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Polmer: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TehRisbe (TechDraw) + + + + Add Cosmetic Circle + Dodaj dopolnilni krog + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sr-CS.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sr-CS.ts index 33c4edac4f..0b4e7aec80 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sr-CS.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sr-CS.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Dodaj osnu liniju između dve linije @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Dodaj osnu liniju između dve tačke @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Dodaj središnje tačke @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Dodaj kvadrant tačke @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Dodaj osnu liniju između dve linije @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Dodaj osnu liniju između dve tačke @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Dodaj pomoćnu liniju kroz dve tačke @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Unesi Napomenu @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Umetni osnu liniju - + Add Centerline to Faces Dodaj osnu liniju stranicama @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Ukloni pomoćni objekat @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Dodaj pomoćnu tačku @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Umetni pomoćnu tačku - + Add Cosmetic Vertex Dodaj pomoćnu tačku @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Promeni izgled linija - + Change Appearance of selected Lines Promenite izgled izabranih linija @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Dodaj osnu liniju stranicama @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Dodaj pokaznu liniju u pogled @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Dodaj središnje tačke @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Dodaj kvadrant tačke @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Unesi formatiranu Napomenu @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Prikaži/sakrij nevidljive ivice @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Napravi oznaku kvaliteta obrađene površine - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Izaberi pogled<br> - Klikni na ovu alatku<br> - U otvorenom panelu napravi oznaku kvaliteta površine @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Dodaj informacije o varu pokaznoj liniji @@ -2020,17 +2020,17 @@ Sačuvaj crtež kao dxf - + Add Midpoint Vertices Dodaj središnje tačke - + Add Quadrant Vertices Dodaj kvadrant tačke - + Create Annotation Napravi napomenu @@ -2091,10 +2091,16 @@ Napravi osnu liniju + Create Cosmetic Line Napravi pomoćnu liniju + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Zatvori dijalog aktivnog zadatka i pokušaj ponovo. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Pogrešan izbor - + Can not attach leader. No base View selected. Ne mogu pričvrstiti pokaznu oznaku. Nije izabran osnovni pogled. - - - - + + + + You must select a base View for the line. Morate izabrati osnovni pogled za liniju. - - + + No DrawViewPart objects in this selection Nije izabran nijedan pogled - - + + No base View in Selection. Nije izabran osnovni pogled. - + You must select Faces or an existing CenterLine. Moraš izabrati stranice ili postojeću osnu liniju. - + No CenterLine in selection. Nije izabrana osna linija. - - - + + + Selection is not a CenterLine. Izabrano nije osna linija. - + Selection not understood. Izbor nije shvaćen. - + You must select 2 Vertexes or an existing CenterLine. Moraš izabrati 2 temena ili postojeću osnu liniju. - + Need 2 Vertices or 1 CenterLine. Potrebna su 2 temena ili 1 osna linija. - + + Selection is empty. Nisi ništa izabrao. - + Not enough points in selection. Izabrano je nedovoljno tačaka. - + Selection is not a Cosmetic Line. Nije izabrana pomoćna linija. - + You must select 2 Vertexes. Moraš izabrati 2 temena. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Ništa nije izabrano - + At least 1 object in selection is not a part view Izabran je najmanje jedan objekat koji nije pogled dela - + Unknown object type in selection Izabran je nepoznati tip objekta - + No View in Selection. Nije izabran pogled. - + You must select a View and/or lines. Moraš izabrati pogled i/ili linije. - + No Part Views in this selection Nije izabran pogled dela - + Select exactly one Leader line or one Weld symbol. Izaberi tačno jednu pokaznu liniju ili simbol zavarivanja. - - + + SurfaceFinishSymbols Oznaka kvaliteta površine - + No Part View in Selection Nije izabran pogled dela - + No %1 in Selection Nije izabran %1 @@ -3538,11 +3566,13 @@ Uredite Oznaku vara + Create Cosmetic Line Napravi pomoćnu liniju + Edit Cosmetic Line Uredi pomoćnu liniju @@ -3678,7 +3708,7 @@ Nema izabranih podelemenata - + @@ -3686,7 +3716,7 @@ Nisi ništa izabrao - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. ima simbol zavarivanja koji bi se pokvario. - + You cannot delete this view because it has one or more dependent views that would become broken. Ne možeš obrisati ovaj pogled jer ima jedan ili više zavisnih objekata koji će postati neispravni. @@ -3844,7 +3874,7 @@ ima simbol zavarivanja koji bi se pokvario. - + Object dependencies Međuzavisnosti objekata @@ -8191,7 +8221,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Dodaje osnu liniju između dve linije @@ -8199,7 +8229,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Dodaje osnu liniju između dve tačke @@ -8215,7 +8245,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Umetni pomoćnu tačku u pogled @@ -8236,7 +8266,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Dodaje osnu liniju stranicama @@ -8252,7 +8282,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Umeće pomoćne tačke u sredine izabranih ivica @@ -8260,7 +8290,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Umetni pomoćne tačke i kvadrantnim tačkama izabranog kruga @@ -8947,4 +8977,100 @@ postoji otvoren panel zadataka. Geometrijska šrafura + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Pomoćna kružnica + + + + View + Pogled + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Tačka + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Tačka + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Poluprečnik: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Dodaj pomoćnu kružnicu + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sr.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sr.ts index f15a248f09..278209115a 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sr.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sr.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Додај осну линију између две линије @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Додај осну линију између две тачке @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Додај средишње тачке @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Додај квадрант тачке @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Додај осну линију између две линије @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Додај осну линију између две тачке @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Додај помоћну линију кроз две тачке @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Унеси Напомену @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Уметни осну линију - + Add Centerline to Faces Додај осну линију страницама @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Уклони помоћни објекат @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Додај помоћну тачку @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Уметни помоћну тачку - + Add Cosmetic Vertex Додај помоћну тачку @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Промени изглед линија - + Change Appearance of selected Lines Промените изглед изабраних линија @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Додај осну линију страницама @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Додај показну линију у поглед @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Додај средишње тачке @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Додај квадрант тачке @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Унеси форматирану Напомену @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Прикажи/сакриј невидљиве ивице @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Направи ознаку квалитета обрађене површине - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Изабери поглед<br> - Кликни на ову алатку<br> - У отвореном панелу направи ознаку @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Додај информације о вару показној линији @@ -2020,17 +2020,17 @@ Сачувај цртеж као dxf - + Add Midpoint Vertices Додај средишње тачке - + Add Quadrant Vertices Додај квадрант тачке - + Create Annotation Направи Напомену @@ -2091,10 +2091,16 @@ Направи Осну линију + Create Cosmetic Line Направипомоћну линију + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Затвори дијалог активног задатка и покушај поново. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Погрешан избор - + Can not attach leader. No base View selected. Не могу причврстити показну ознаку. Није изабран основни поглед. - - - - + + + + You must select a base View for the line. Морате изабрати основни поглед за линију. - - + + No DrawViewPart objects in this selection Није изабран ниједан поглед - - + + No base View in Selection. Није изабран основни поглед. - + You must select Faces or an existing CenterLine. Мораш изабрати странице или постојећу осну линију. - + No CenterLine in selection. Није изабрана осна линија. - - - + + + Selection is not a CenterLine. Изабрано није осна линија. - + Selection not understood. Избор није схваћен. - + You must select 2 Vertexes or an existing CenterLine. Мораш изабрати 2 темена или постојећу осну линију. - + Need 2 Vertices or 1 CenterLine. Потребна су 2 темена или 1 осна линија. - + + Selection is empty. Ниси ништа изабрао. - + Not enough points in selection. Изабрано је недовољно тачака. - + Selection is not a Cosmetic Line. Није изабрана помоћна линија. - + You must select 2 Vertexes. Мораш изабрати 2 темена. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Ништа није изабрано - + At least 1 object in selection is not a part view Изабран је најмање један објекат који није поглед дела - + Unknown object type in selection Изабран је непознати тип објекта - + No View in Selection. Није изабран поглед. - + You must select a View and/or lines. Мораш изабрати поглед и/или линије. - + No Part Views in this selection Није изабран поглед дела - + Select exactly one Leader line or one Weld symbol. Изабери тачно једну показну линију или симбол заваривања. - - + + SurfaceFinishSymbols Ознаку квалитета површине - + No Part View in Selection Није изабран поглед дела - + No %1 in Selection Није изабран %1 @@ -3538,11 +3566,13 @@ Уредите ознаку вара + Create Cosmetic Line Направипомоћну линију + Edit Cosmetic Line Уреди помоћну линију @@ -3678,7 +3708,7 @@ Нема изабраних поделемената - + @@ -3686,7 +3716,7 @@ Ниси ништа изабрао - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. има симбол заваривања који би се покварио. - + You cannot delete this view because it has one or more dependent views that would become broken. Не можеш обрисати овај поглед јер има један или више зависних објеката који ће постати неисправни. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies Међузависности објеката @@ -8191,7 +8221,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Додаје осну линију између две линије @@ -8199,7 +8229,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Додаје осну линију између две тачке @@ -8215,7 +8245,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Уметни помоћну тачку у поглед @@ -8236,7 +8266,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Додаје осну линију страницама @@ -8252,7 +8282,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Умеће помоћне тачке у средине изабраних ивица @@ -8260,7 +8290,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Уметни помоћне тачке у квадрантне тачке изабраног круга @@ -8947,4 +8977,100 @@ there is an open task dialog. Геометријска шрафура + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Помоћна кружница + + + + View + Поглед + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2д Тачка + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3д Тачка + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Полупречник: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Додај помоћну кружницу + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sv-SE.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sv-SE.ts index 86afef1cdb..a12f64c9d7 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sv-SE.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_sv-SE.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Lägg till mittlinje mellan 2 linjer @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Lägg till mittlinje mellan 2 punkter @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Lägg till mittpunktsvertices @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Lägg till kvadrantver @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Lägg till mittlinje mellan 2 linjer @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Lägg till mittlinje mellan 2 punkter @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Lägg till kosmetisk linje genom 2 punkter @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Infoga anteckning @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Infoga mittlinje - + Add Centerline to Faces Lägg till mittlinje i ansikten @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Ta bort kosmetiskt objekt @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Lägg till Kosmetiska Vertex @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Sätt in kosmetiska Vertex - + Add Cosmetic Vertex Lägg till Kosmetiska Vertex @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Ändra utseende på linjer - + Change Appearance of selected Lines Ändra utseende på valda linjer @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Lägg till mittlinje i ansikten @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Lägga till Leaderline i Visa @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Lägg till mittpunktsvertices @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Lägg till kvadrantver @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Infoga RTF-anteckning @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Visa/dölj osynliga kanter @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Lägg till svetsinformation till Leaderline @@ -2020,17 +2020,17 @@ Spara sida på dxf - + Add Midpoint Vertices Lägg till mittpunktsvertices - + Add Quadrant Vertices Lägg till kvadrantver - + Create Annotation Skapa anteckning @@ -2091,10 +2091,16 @@ Skapa CenterLine + Create Cosmetic Line Skapa kosmetisk linje + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Stäng aktiv uppgiftsdialog och försök igen. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Fel val - + Can not attach leader. No base View selected. Kan inte bifoga hänvisning. Ingen basvy markerad. - - - - + + + + You must select a base View for the line. Du måste markera en basvy för linjen. - - + + No DrawViewPart objects in this selection Inga DrawViewPart-objekt i aktuell markering - - + + No base View in Selection. Ingen basvy i markering. - + You must select Faces or an existing CenterLine. Du måste välja Ansikten eller en befintlig CenterLine. - + No CenterLine in selection. Ingen CenterLine i markering. - - - + + + Selection is not a CenterLine. Markering är inte en CenterLine. - + Selection not understood. Urval inte förstått. - + You must select 2 Vertexes or an existing CenterLine. Du måste välja 2 Vertexes eller en befintlig CenterLine. - + Need 2 Vertices or 1 CenterLine. Behöver 2 Vertices eller 1 CenterLine. - + + Selection is empty. Markeringen är tom. - + Not enough points in selection. Inte tillräckligt med poäng i markering. - + Selection is not a Cosmetic Line. Val är inte en Cosmetic Line. - + You must select 2 Vertexes. Du måste välja 2 Vertexes. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Inget markerat - + At least 1 object in selection is not a part view Ett eller flera objekt i markeringen är inte en delvy - + Unknown object type in selection Okänd objekttyp i markering - + No View in Selection. Ingen vy i markering. - + You must select a View and/or lines. Du måste välja en Visa och/eller rader. - + No Part Views in this selection Inga delvyer i det här valet - + Select exactly one Leader line or one Weld symbol. Välj exakt en Ledare fodrar eller en Svetsa symbol. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Redigera svetssymbol + Create Cosmetic Line Skapa kosmetisk linje + Edit Cosmetic Line Redigera kosmetisk linje @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. den har en svetssymbol som skulle bli trasig. - + You cannot delete this view because it has one or more dependent views that would become broken. Du kan inte ta bort denna vy eftersom den har en eller flera beroende vyer som skulle brytas. @@ -3844,7 +3874,7 @@ den har en svetssymbol som skulle bli trasig. - + Object dependencies Objektberoenden @@ -8196,7 +8226,7 @@ med hjälp av det givna X/Y-avstånden TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Lägger till en Mittlinje mellan 2 linjer @@ -8204,7 +8234,7 @@ med hjälp av det givna X/Y-avstånden TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Lägger till en mittlinje mellan 2 punkter @@ -8220,7 +8250,7 @@ med hjälp av det givna X/Y-avstånden TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Infogar en kosmetisk Vertex i en Vy @@ -8241,7 +8271,7 @@ med hjälp av det givna X/Y-avstånden TechDraw_FaceCenterLine - + Adds a Centerline to Faces Lägger till en mittlinje i Ansikten @@ -8257,7 +8287,7 @@ med hjälp av det givna X/Y-avstånden TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Infogar Kosmetiska Vertices vid Mittpunkten av valda Kanter @@ -8265,7 +8295,7 @@ med hjälp av det givna X/Y-avstånden TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Infogar kosmetiska vertices vid kvadrantpunkter av valda cirklar @@ -8952,4 +8982,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Vy + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Punkt + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Punkt + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Radie: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_tr.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_tr.ts index b83b4b9097..514707161d 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_tr.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_tr.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines 2 çizgi arasına Merkez çizgisi ekler @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points 2 nokta arasına Merkez çizgisi ekler @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Orta nokta köşeleri ekle @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Çeyrek daire köşeleri ekle @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TeknikÇizim - + Add Centerline between 2 Lines 2 çizgi arasına Merkez çizgisi ekler @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TeknikÇizim - + Add Centerline between 2 Points 2 nokta arasına Merkez çizgisi ekler @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TeknikÇizim - + Add Cosmetic Line Through 2 Points 2 nokta boyunca yardımcı doğru ekle @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TeknikÇizim - + Insert Annotation Açıklama girin @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TeknikÇizim - + Insert Center Line Yeni Eksen - + Add Centerline to Faces Yüzey(ler) e bir eksen ekle @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TeknikÇizim - + Remove Cosmetic Object Yardımcı nesneyi kaldır @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TeknikÇizim - + Add Cosmetic Vertex Yardımcı Nokta Ekle @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TeknikÇizim - + Insert Cosmetic Vertex Yardımcı nokta ekle - + Add Cosmetic Vertex Yardımcı Nokta Ekle @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TeknikÇizim - + Change Appearance of Lines Çizgilerin görünümünü değiştir - + Change Appearance of selected Lines Seçili Çizgilerin Görünümünü Değiştir @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TeknikÇizim - + Add Centerline to Faces Yüzey(ler) e bir eksen ekle @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TeknikÇizim - + Add Leaderline to View Görünüme Başlık Çizgisi Ekle @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TeknikÇizim - + Add Midpoint Vertices Orta nokta köşeleri ekle @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TeknikÇizim - + Add Quadrant Vertices Çeyrek daire köşeleri ekle @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TeknikÇizim - + Insert Rich Text Annotation Zengin metin dipnotu ekle @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TeknikÇizim - + Show/Hide Invisible Edges Görünmez kenarları Gizle/Göster @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TeknikÇizim - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TeknikÇizim - + Add Welding Information to Leaderline Başlık Çizgisine Kaynak Bilgileri Ekle @@ -2020,17 +2020,17 @@ Sayfayı dxf olarak kaydedin - + Add Midpoint Vertices Orta nokta köşeleri ekle - + Add Quadrant Vertices Çeyrek daire köşeleri ekle - + Create Annotation Açıklama Oluşturun @@ -2091,10 +2091,16 @@ MerkezÇizgisi Oluştur + Create Cosmetic Line Yardımcı çizgi oluştur + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Etkin görev iletişim kutusunu kapatın ve yeniden deneyin. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Yanlış seçim - + Can not attach leader. No base View selected. Kılavuz eklenemiyor. Hiç bir temel görünüm seçilmedi. - - - - + + + + You must select a base View for the line. Çizgi için bir temel görünüm seçmelisiniz. - - + + No DrawViewPart objects in this selection Bu seçimde GörünümParçasıÇiz nesneleri yok - - + + No base View in Selection. Seçimde temel görünüm yok. - + You must select Faces or an existing CenterLine. Yüzey yada mevcut merkez doğrusu(CenterLine) seçiniz. - + No CenterLine in selection. Seçimde merkez doğrusu(CenterLine) yok. - - - + + + Selection is not a CenterLine. Seçim bir merkez doğrusu(CenterLine) değil. - + Selection not understood. Seçim anlaşılmadı. - + You must select 2 Vertexes or an existing CenterLine. 2 nokta yada mevcut merkez doğrusu(CenterLine) seçiniz. - + Need 2 Vertices or 1 CenterLine. 2 köse yada bir merkez doğrusu(CenterLine) ye ihtiyaç var. - + + Selection is empty. Seçim boş. - + Not enough points in selection. Seçimde yeterli nokta yok. - + Selection is not a Cosmetic Line. Seçim bir yardımcı doğru değil. - + You must select 2 Vertexes. 2 Nokta seçmelisiniz. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Seçili hiçbir şey yok - + At least 1 object in selection is not a part view Seçimdeki en az 1 nesne bir parça görünümü değil - + Unknown object type in selection Seçimde bilinmeyen nesne tipi var - + No View in Selection. Seçimde görünüm yok. - + You must select a View and/or lines. Bir görünüm ve/veya çizgi seçmelisin. - + No Part Views in this selection Bu seçimde Parça Görünümü yok - + Select exactly one Leader line or one Weld symbol. Tam olarak bir lider hattı(Leader line) yada bir kaynak(Weld) sembolü seçiniz. - - + + SurfaceFinishSymbols YüzeyPürüzlülüğüSembolleri - + No Part View in Selection Seçimde Parça Görünümü Yok - + No %1 in Selection Seçimde %1 Yok @@ -3538,11 +3566,13 @@ Kaynak Sembolünü Düzenle + Create Cosmetic Line Yardımcı çizgi oluştur + Edit Cosmetic Line Yardımcı doğruyu düzenle @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Seçim boş - + No object selected @@ -3829,7 +3859,7 @@ it has a weld symbol that would become broken. Bu ölçü çizgisini silemezsiniz çünkü bozulabilecek bir kaynak sembolü içeriyor. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3843,7 +3873,7 @@ it has a weld symbol that would become broken. - + Object dependencies Nesne bağımlılıkları @@ -8192,7 +8222,7 @@ gösterimleri otomatik dağıtır TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines 2 Çizgi arasına Eksen Çizgisi ekler @@ -8200,7 +8230,7 @@ gösterimleri otomatik dağıtır TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points 2 Nokta arasında Eksen Çizgisi ekler @@ -8216,7 +8246,7 @@ gösterimleri otomatik dağıtır TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Görünüme Yardımcı Nokta Ekler @@ -8237,7 +8267,7 @@ gösterimleri otomatik dağıtır TechDraw_FaceCenterLine - + Adds a Centerline to Faces Yüzlere Eksen Çizgisi ekler @@ -8253,7 +8283,7 @@ gösterimleri otomatik dağıtır TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Seçili Kenarların Ortasına Yardımcı Noktalar Ekler @@ -8261,7 +8291,7 @@ gösterimleri otomatik dağıtır TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Seçili Çemberin Çeyrek Kısımlarına Yardımcı Noktalar Ekler @@ -8948,4 +8978,100 @@ there is an open task dialog. geom kapağı + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Yardımcı Çember + + + + View + Görünüm + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Nokta + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Nokta + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Yarıçap: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TeknikÇizim + + + + Add Cosmetic Circle + Yardımcı Çember Ekle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_uk.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_uk.ts index 07dad969a0..dd3073204a 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_uk.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_uk.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Додати центрлінію між 2 лініями @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Додати центрлінію між 2 точками @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Add Midpoint Vertices @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Add Quadrant Vertices @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw ТехМалюнок - + Add Centerline between 2 Lines Додати центрлінію між 2 лініями @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw ТехМалюнок - + Add Centerline between 2 Points Додати центрлінію між 2 точками @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw ТехМалюнок - + Add Cosmetic Line Through 2 Points Add Cosmetic Line Through 2 Points @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw ТехМалюнок - + Insert Annotation Вставити нотатку @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw ТехМалюнок - + Insert Center Line Insert Center Line - + Add Centerline to Faces Add Centerline to Faces @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw ТехМалюнок - + Remove Cosmetic Object Remove Cosmetic Object @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw ТехМалюнок - + Add Cosmetic Vertex Add Cosmetic Vertex @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw ТехМалюнок - + Insert Cosmetic Vertex Insert Cosmetic Vertex - + Add Cosmetic Vertex Add Cosmetic Vertex @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw ТехМалюнок - + Change Appearance of Lines Змінити вигляд ліній - + Change Appearance of selected Lines Змінити вигляд вибраних ліній @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw ТехМалюнок - + Add Centerline to Faces Add Centerline to Faces @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw ТехМалюнок - + Add Leaderline to View Add Leaderline to View @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw ТехМалюнок - + Add Midpoint Vertices Add Midpoint Vertices @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw ТехМалюнок - + Add Quadrant Vertices Add Quadrant Vertices @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw ТехМалюнок - + Insert Rich Text Annotation Insert Rich Text Annotation @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw ТехМалюнок - + Show/Hide Invisible Edges Show/Hide Invisible Edges @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw ТехМалюнок - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw ТехМалюнок - + Add Welding Information to Leaderline Add Welding Information to Leaderline @@ -2020,17 +2020,17 @@ Зберегти сторінку в dxf файл - + Add Midpoint Vertices Add Midpoint Vertices - + Add Quadrant Vertices Add Quadrant Vertices - + Create Annotation Create Annotation @@ -2091,10 +2091,16 @@ Create CenterLine + Create Cosmetic Line Create Cosmetic Line + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Close active task dialog and try again. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Wrong Selection - + Can not attach leader. No base View selected. Can not attach leader. No base View selected. - - - - + + + + You must select a base View for the line. You must select a base View for the line. - - + + No DrawViewPart objects in this selection No DrawViewPart objects in this selection - - + + No base View in Selection. No base View in Selection. - + You must select Faces or an existing CenterLine. You must select Faces or an existing CenterLine. - + No CenterLine in selection. No CenterLine in selection. - - - + + + Selection is not a CenterLine. Selection is not a CenterLine. - + Selection not understood. Selection not understood. - + You must select 2 Vertexes or an existing CenterLine. You must select 2 Vertexes or an existing CenterLine. - + Need 2 Vertices or 1 CenterLine. Need 2 Vertices or 1 CenterLine. - + + Selection is empty. Selection is empty. - + Not enough points in selection. Not enough points in selection. - + Selection is not a Cosmetic Line. Selection is not a Cosmetic Line. - + You must select 2 Vertexes. You must select 2 Vertexes. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected Nothing selected - + At least 1 object in selection is not a part view At least 1 object in selection is not a part view - + Unknown object type in selection Unknown object type in selection - + No View in Selection. No View in Selection. - + You must select a View and/or lines. You must select a View and/or lines. - + No Part Views in this selection No Part Views in this selection - + Select exactly one Leader line or one Weld symbol. Select exactly one Leader line or one Weld symbol. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edit Welding Symbol + Create Cosmetic Line Create Cosmetic Line + Edit Cosmetic Line Edit Cosmetic Line @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. it has a weld symbol that would become broken. - + You cannot delete this view because it has one or more dependent views that would become broken. Не можна видалити цей вид, оскільки він має один або більше залежних видів, що будуть зламані. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies Залежності обʼєктів @@ -8195,7 +8225,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Adds a Centerline between 2 Lines @@ -8203,7 +8233,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Adds a Centerline between 2 Points @@ -8219,7 +8249,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8240,7 +8270,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8256,7 +8286,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8264,7 +8294,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8951,4 +8981,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Вид + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Point + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Point + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Радіус: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + ТехМалюнок + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_val-ES.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_val-ES.ts index c032c7e28c..dd297d2d9b 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_val-ES.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_val-ES.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines Afig una línia central entre 2 línies @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points Afig una línia central entre 2 punts @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices Afig vèrtex de punt central @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices Afig vèrtexs de quadrant @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines Afig una línia central entre 2 línies @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points Afig una línia central entre 2 punts @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points Add Cosmetic Line Through 2 Points @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation Insereix Anotació @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line Insereix una línia central - + Add Centerline to Faces Afig una línia central les cares @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object Elimina un objecte cosmètic @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex Afig un vèrtex cosmètic @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex Insereix un vèrtex cosmètic - + Add Cosmetic Vertex Afig un vèrtex cosmètic @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines Canvia l'aparença de les línies - + Change Appearance of selected Lines Change Appearance of selected Lines @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces Afig una línia central les cares @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View Afig un línia guia a la vista @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices Afig vèrtex de punt central @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices Afig vèrtexs de quadrant @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation Insereix una anotació de text enriquit @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges Mostra/amaga les arestes invisibles @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline Afig la informació de soldadura a la línia guia @@ -2020,17 +2020,17 @@ Save page to dxf - + Add Midpoint Vertices Afig vèrtex de punt central - + Add Quadrant Vertices Afig vèrtexs de quadrant - + Create Annotation Create Annotation @@ -2091,10 +2091,16 @@ Create CenterLine + Create Cosmetic Line Create Cosmetic Line + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ Tanca el quadre de diàleg de tasques actiu i intenta-ho altra vegada. - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection Selecció incorrecta - + Can not attach leader. No base View selected. No es pot adjuntar la guia. No s'ha seleccionat cap vista de base. - - - - + + + + You must select a base View for the line. Heu de seleccionar una vista de base per a la línia. - - + + No DrawViewPart objects in this selection No hi ha cap objecte DrawViewPart en aquesta selecció - - + + No base View in Selection. No hi ha cap Vista de base en la selecció. - + You must select Faces or an existing CenterLine. Heu de seleccionar cares o una línia central existent. - + No CenterLine in selection. No hi ha cap línia central en la selecció. - - - + + + Selection is not a CenterLine. La selecció no és una línia central. - + Selection not understood. No s'ha entés la selecció. - + You must select 2 Vertexes or an existing CenterLine. Heu de seleccionar 2 vèrtex o una línia central existent. - + Need 2 Vertices or 1 CenterLine. Es necessiten 2 vèrtexs o 1 línia central. - + + Selection is empty. Selection is empty. - + Not enough points in selection. Not enough points in selection. - + Selection is not a Cosmetic Line. Selection is not a Cosmetic Line. - + You must select 2 Vertexes. You must select 2 Vertexes. - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected No s'ha seleccionat res - + At least 1 object in selection is not a part view Com a mínim 1 objecte eln la selecció no és una vista de peça - + Unknown object type in selection Tipus d'objecte desconegut en la selecció - + No View in Selection. No hi ha cap vista en la selecció. - + You must select a View and/or lines. Heu de seleccionar una vista i/o línies. - + No Part Views in this selection No hi ha cap vista de peça en la selecció. - + Select exactly one Leader line or one Weld symbol. Seleccioneu exactament una única línia guia o un únic símbol de soldadura. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edita un símbol de soldadura + Create Cosmetic Line Create Cosmetic Line + Edit Cosmetic Line Edit Cosmetic Line @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. it has a weld symbol that would become broken. - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies Dependències de l'objecte @@ -8186,7 +8216,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines Afig una línia central entre 2 línies @@ -8194,7 +8224,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points Afig una línia central entre 2 punts @@ -8210,7 +8240,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Insereix un vèrtex cosmètic en una vista @@ -8231,7 +8261,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Afig una línia central a una cara @@ -8247,7 +8277,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Insereix un vèrtex cosmètic en el punt central de les arestes seleccionades @@ -8255,7 +8285,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Insereix un vèrtex cosmètic en els punts quadrants dels cercles seleccionats @@ -8942,4 +8972,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + Visualitza + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Point + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Point + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + Radi: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_zh-CN.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_zh-CN.ts index 6a25175282..200e7234ee 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_zh-CN.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_zh-CN.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines 在两条线之间添加中心线 @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points 在 2 点之间添加中心线 @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices 添加中点 @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices 添加象限顶点 @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw 工程图 - + Add Centerline between 2 Lines 在两条线之间添加中心线 @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw 工程图 - + Add Centerline between 2 Points 在 2 点之间添加中心线 @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw 工程图 - + Add Cosmetic Line Through 2 Points 通过 2 点添加修饰线 @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw 工程图 - + Insert Annotation 插入批注 @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw 工程图 - + Insert Center Line 插入中心线 - + Add Centerline to Faces 从面取中心线 @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw 工程图 - + Remove Cosmetic Object 移除饰性对象 @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw 工程图 - + Add Cosmetic Vertex 添加饰品顶点 @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw 工程图 - + Insert Cosmetic Vertex 插入饰品顶点 - + Add Cosmetic Vertex 添加饰品顶点 @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw 工程图 - + Change Appearance of Lines 更改线的外观 - + Change Appearance of selected Lines 更改所选线条外观 @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw 工程图 - + Add Centerline to Faces 从面取中心线 @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw 工程图 - + Add Leaderline to View 添加引导线到视图 @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw 工程图 - + Add Midpoint Vertices 添加中点 @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw 工程图 - + Add Quadrant Vertices 添加象限顶点 @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw 工程图 - + Insert Rich Text Annotation 插入富文本批注 @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw 工程图 - + Show/Hide Invisible Edges 显示/隐藏不可见边缘 @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw 工程图 - + Create a Surface Finish Symbol Create a Surface Finish Symbol - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw 工程图 - + Add Welding Information to Leaderline 向指引线添加焊接信息 @@ -2020,17 +2020,17 @@ 保存页面到 dxf - + Add Midpoint Vertices 添加中点 - + Add Quadrant Vertices 添加象限顶点 - + Create Annotation 创建批注 @@ -2091,10 +2091,16 @@ 创建中心线 + Create Cosmetic Line Create Cosmetic Line + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ 关闭活动任务对话框并重试。 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection 错误选择。 - + Can not attach leader. No base View selected. 无法附加指引线。没有选择基础视图。 - - - - + + + + You must select a base View for the line. 您必须为该线选择一个基视图。 - - + + No DrawViewPart objects in this selection No DrawViewPart objects in this selection - - + + No base View in Selection. 在选择中没有基本视图。 - + You must select Faces or an existing CenterLine. You must select Faces or an existing CenterLine. - + No CenterLine in selection. No CenterLine in selection. - - - + + + Selection is not a CenterLine. Selection is not a CenterLine. - + Selection not understood. Selection not understood. - + You must select 2 Vertexes or an existing CenterLine. You must select 2 Vertexes or an existing CenterLine. - + Need 2 Vertices or 1 CenterLine. Need 2 Vertices or 1 CenterLine. - + + Selection is empty. 没有选择对象。 - + Not enough points in selection. 没有选择足够的点。 - + Selection is not a Cosmetic Line. Selection is not a Cosmetic Line. - + You must select 2 Vertexes. 你必须选择两个交点。 - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected 未选择任何内容 - + At least 1 object in selection is not a part view 至少一个所选对象不是零件视图 - + Unknown object type in selection 选择了未知的对象类型 - + No View in Selection. 选择中没有视图。 - + You must select a View and/or lines. 您必须选择一个视图（或多个线条）。 - + No Part Views in this selection 选择中没有部件视图。 - + Select exactly one Leader line or one Weld symbol. Select exactly one Leader line or one Weld symbol. - - + + SurfaceFinishSymbols SurfaceFinishSymbols - + No Part View in Selection No Part View in Selection - + No %1 in Selection No %1 in Selection @@ -3538,11 +3566,13 @@ Edit Welding Symbol + Create Cosmetic Line Create Cosmetic Line + Edit Cosmetic Line Edit Cosmetic Line @@ -3678,7 +3708,7 @@ 未选择子元素 - + @@ -3686,7 +3716,7 @@ Selection is empty - + No object selected @@ -3829,7 +3859,7 @@ it has a weld symbol that would become broken. 指引线 - + You cannot delete this view because it has one or more dependent views that would become broken. 您不能删除此视图，因为它有一个或多个依赖的视图会被损坏。 @@ -3843,7 +3873,7 @@ it has a weld symbol that would become broken. - + Object dependencies 对象依赖关系 @@ -8194,7 +8224,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines 在两线之间添加中心线 @@ -8202,7 +8232,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points 在 2 点之间添加中心线 @@ -8218,7 +8248,7 @@ using the given X/Y Spacing TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View Inserts a Cosmetic Vertex into a View @@ -8239,7 +8269,7 @@ using the given X/Y Spacing TechDraw_FaceCenterLine - + Adds a Centerline to Faces Adds a Centerline to Faces @@ -8255,7 +8285,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges Inserts Cosmetic Vertices at Midpoint of selected Edges @@ -8263,7 +8293,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles Inserts Cosmetic Vertices at Quadrant Points of selected Circles @@ -8950,4 +8980,100 @@ there is an open task dialog. 几何图形 + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + Cosmetic Circle + + + + View + 视图 + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d Point + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d Point + + + + Circle Center + Circle Center + + + + X: + X: + + + + Y: + Y: + + + + Z: + Z: + + + + Radius: + 半径: + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + 工程图 + + + + Add Cosmetic Circle + Add Cosmetic Circle + + diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_zh-TW.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_zh-TW.ts index aeec6cce19..03ea86a3ec 100644 --- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_zh-TW.ts +++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw_zh-TW.ts @@ -4,7 +4,7 @@ Cmd2LineCenterLine - + Add Centerline between 2 Lines 在兩條線中加入中心線 @@ -12,7 +12,7 @@ Cmd2PointCenterLine - + Add Centerline between 2 Points 加入中心線在兩點間 @@ -20,7 +20,7 @@ CmdMidpoints - + Add Midpoint Vertices 加入頂點的中心點 @@ -28,7 +28,7 @@ CmdQuadrants - + Add Quadrant Vertices 增加象限頂點 @@ -36,12 +36,12 @@ CmdTechDraw2LineCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Lines 在兩條線中加入中心線 @@ -49,12 +49,12 @@ CmdTechDraw2PointCenterLine - + TechDraw TechDraw - + Add Centerline between 2 Points 加入中心線在兩點間 @@ -62,12 +62,12 @@ CmdTechDraw2PointCosmeticLine - + TechDraw TechDraw - + Add Cosmetic Line Through 2 Points 通過 2 點添加裝飾線 @@ -114,12 +114,12 @@ CmdTechDrawAnnotation - + TechDraw TechDraw - + Insert Annotation 插入註釋 @@ -158,17 +158,17 @@ CmdTechDrawCenterLineGroup - + TechDraw TechDraw - + Insert Center Line 插入中央線 - + Add Centerline to Faces 添加中心線至面 @@ -233,12 +233,12 @@ CmdTechDrawCosmeticEraser - + TechDraw TechDraw - + Remove Cosmetic Object 移除裝飾物件 @@ -246,12 +246,12 @@ CmdTechDrawCosmeticVertex - + TechDraw TechDraw - + Add Cosmetic Vertex 添加裝飾頂點 @@ -259,17 +259,17 @@ CmdTechDrawCosmeticVertexGroup - + TechDraw TechDraw - + Insert Cosmetic Vertex 插入裝飾頂點 - + Add Cosmetic Vertex 添加裝飾頂點 @@ -277,17 +277,17 @@ CmdTechDrawDecorateLine - + TechDraw TechDraw - + Change Appearance of Lines 改變線之外觀 - + Change Appearance of selected Lines 更改選取線條的外觀 @@ -996,7 +996,7 @@ Insert '⌀' Prefix - 插入 '⌀' 前置 + 插入 '⌀' 前綴 @@ -1010,12 +1010,12 @@ TechDraw - TechDraw + 技術繪圖 Insert '⌀' Prefix - 插入 '⌀' 前置 + 插入 '⌀' 前綴 @@ -1034,7 +1034,7 @@ Insert '□' Prefix - 插入 '□' 前置 + 插入 '□' 前綴 @@ -1202,7 +1202,7 @@ TechDraw - TechDraw + 工程製圖 @@ -1220,17 +1220,17 @@ TechDraw - TechDraw + 技術繪圖 Remove Prefix - 移除前置 + 移除前綴 Remove prefix symbols at the beginning of the dimension text:<br>- Select one or more dimensions<br>- Click this tool - 移除標註文字的前置符號：<br>- 選擇一個以上的標註<br>- 點選此工具 + 移除標註文字的前綴符號：<br>- 選擇一個以上的標註<br>- 點選此工具 @@ -1413,12 +1413,12 @@ CmdTechDrawFaceCenterLine - + TechDraw TechDraw - + Add Centerline to Faces 添加中心線至面 @@ -1501,7 +1501,7 @@ Image files (*.jpg *.jpeg *.png *.bmp);;All files (*) - Image files (*.jpg *.jpeg *.png *.bmp);;All files (*) + 圖片檔(*.bmp *.jpg *.png *.tif);;所有檔案 (*.*) @@ -1520,12 +1520,12 @@ CmdTechDrawLeaderLine - + TechDraw TechDraw - + Add Leaderline to View 加入指線至視圖 @@ -1559,12 +1559,12 @@ CmdTechDrawMidpoints - + TechDraw TechDraw - + Add Midpoint Vertices 加入頂點的中心點 @@ -1652,12 +1652,12 @@ CmdTechDrawQuadrants - + TechDraw TechDraw - + Add Quadrant Vertices 增加象限頂點 @@ -1691,12 +1691,12 @@ CmdTechDrawRichTextAnnotation - + TechDraw TechDraw - + Insert Rich Text Annotation 插入富文字註解 @@ -1711,12 +1711,12 @@ Insert a simple or complex Section View - Insert a simple or complex Section View + 插入一簡單或複雜剖面視圖 Section View - Section View + 剖面視圖 @@ -1729,7 +1729,7 @@ TechDraw - TechDraw + 工程製圖 @@ -1740,12 +1740,12 @@ CmdTechDrawShowAll - + TechDraw TechDraw - + Show/Hide Invisible Edges 顯示/隱藏不可視的邊 @@ -1856,17 +1856,17 @@ CmdTechDrawSurfaceFinishSymbols - + TechDraw TechDraw - + Create a Surface Finish Symbol 建立一個表面紋理符號 - + Select a view<br> - click this button<br> - select surface finish symbol attributes in opened panel 選擇一個視圖<br> - 點擊此按鍵<br> -在開啟面板中選擇選擇表面粗糙度符號屬性 @@ -1950,12 +1950,12 @@ CmdTechDrawWeldSymbol - + TechDraw TechDraw - + Add Welding Information to Leaderline 加入銲接資訊到指線 @@ -2020,17 +2020,17 @@ 儲存頁面為 DXF 格式 - + Add Midpoint Vertices 加入頂點的中心點 - + Add Quadrant Vertices 增加象限頂點 - + Create Annotation 建立註解 @@ -2091,10 +2091,16 @@ 建立中心線 + Create Cosmetic Line 建立裝飾線 + + + Update CosmeticCircle + Update CosmeticCircle + Update CosmeticLine @@ -2164,22 +2170,22 @@ TechDraw Insert Prefix - TechDraw Insert Prefix + 技術繪圖插入前綴 Insert Prefix - 插入前置 + 插入前綴 TechDraw Remove Prefix - TechDraw Remove Prefix + 技術繪圖移除前綴 Remove Prefix - 移除前置 + 移除前綴 @@ -2274,7 +2280,7 @@ TechDraw Circle Centerlines - TechDraw Circle Centerlines + 工程製圖圓中心線 @@ -2437,7 +2443,7 @@ The view direction angle relative to +X in the BaseView. - The view direction angle relative to +X in the BaseView. + 在基礎視圖中相對於 +X 的視圖方向角度。 @@ -2521,7 +2527,7 @@ Link - 連結 + 鏈結 @@ -2705,14 +2711,14 @@ - - - - - - + + + + - + + + Wrong selection @@ -3062,21 +3068,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3111,21 +3118,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3157,158 +3165,178 @@ 關閉活動任務對話框並重試。 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Wrong Selection 錯誤的選擇 - + Can not attach leader. No base View selected. 無法附加指線。未選擇基本視圖。 - - - - + + + + You must select a base View for the line. 您必須給那條線選擇一個基礎視圖。 - - + + No DrawViewPart objects in this selection 此選擇中沒有 DrawViewPart 物件 - - + + No base View in Selection. 選擇中沒有基礎視圖。 - + You must select Faces or an existing CenterLine. 您必須選取面或現有的中心線。 - + No CenterLine in selection. 選擇中沒有中心線。 - - - + + + Selection is not a CenterLine. 選擇並非中心線 - + Selection not understood. 不了解選取什麼。 - + You must select 2 Vertexes or an existing CenterLine. 您必須選取 2 個點或現有的中心線。 - + Need 2 Vertices or 1 CenterLine. 需要 2 個點或 1 條中心線。 - + + Selection is empty. 選擇為空。 - + Not enough points in selection. 沒有足夠的點被選取。 - + Selection is not a Cosmetic Line. 選擇並非裝飾線 - + You must select 2 Vertexes. 您必須選擇2個點。 - - + + You must select a base View for the circle. + You must select a base View for the circle. + + + + Selection is not a Cosmetic edge. + Selection is not a Cosmetic edge. + + + + Please select a center for the circle. + Please select a center for the circle. + + + + Nothing selected 沒有選取項目 - + At least 1 object in selection is not a part view 至少 1 個選取物件不是零件視圖 - + Unknown object type in selection 未知的物件類型在選擇中 - + No View in Selection. 選擇中沒有視圖 - + You must select a View and/or lines. 您必須選擇一個視圖與/或線 - + No Part Views in this selection 此選擇中沒有零件視圖 - + Select exactly one Leader line or one Weld symbol. 選擇正好一個指線或一個銲接符號。 - - + + SurfaceFinishSymbols 表面紋理符號 - + No Part View in Selection 選擇中沒有零件視圖 - + No %1 in Selection 選擇中沒有 %1 @@ -3513,13 +3541,13 @@ Current View Direction - Current View Direction + 目前視圖方向 The view direction in BaseView coordinates - The view direction in BaseView coordinates + 在基礎視圖座標中的視圖方向 @@ -3538,11 +3566,13 @@ 編輯銲接符號 + Create Cosmetic Line 建立裝飾線 + Edit Cosmetic Line 編輯裝飾線 @@ -3678,7 +3708,7 @@ No subelements selected - + @@ -3686,7 +3716,7 @@ 選擇為空。 - + No object selected @@ -3830,7 +3860,7 @@ it has a weld symbol that would become broken. 它有銲接符號會損壞。 - + You cannot delete this view because it has one or more dependent views that would become broken. You cannot delete this view because it has one or more dependent views that would become broken. @@ -3844,7 +3874,7 @@ it has a weld symbol that would become broken. - + Object dependencies 物件相依 @@ -3996,7 +4026,7 @@ it has a tile weld that would become broken. No direction set - No direction set + 未設定方向 @@ -6036,27 +6066,27 @@ Do you want to continue? Set View Direction - Set View Direction + 設定視圖方向 Preset view direction looking up. - Preset view direction looking up. + 預設視圖方向往上。 Preset view direction looking down. - Preset view direction looking down. + 預設視圖方向往下。 Preset view direction looking left. - Preset view direction looking left. + 預設視圖方向往左。 Preset view direction looking right. - Preset view direction looking right. + 預設視圖方向往右。 @@ -6081,12 +6111,12 @@ Do you want to continue? Update Now - Update Now + 馬上更新 No direction set - No direction set + 未設定方向 @@ -6097,7 +6127,7 @@ Do you want to continue? Can not continue. Object * %1 or %2 not found. - Can not continue. Object * %1 or %2 not found. + 無法繼續，找不到物件 * %1 或 %2。 @@ -6919,7 +6949,7 @@ be used instead of the dimension value Rotation - Rotation + 旋轉 @@ -6929,7 +6959,7 @@ be used instead of the dimension value Offset X - Offset X + X 偏移 @@ -6939,7 +6969,7 @@ be used instead of the dimension value Offset Y - Offset Y + Y 偏移 @@ -6997,7 +7027,7 @@ be used instead of the dimension value Offset X - Offset X + X 偏移 @@ -7007,12 +7037,12 @@ be used instead of the dimension value Rotation - Rotation + 旋轉 Offset Y - Offset Y + Y 偏移 @@ -7788,27 +7818,27 @@ using the given X/Y Spacing Set View Direction - Set View Direction + 設定視圖方向 Preset view direction looking up. - Preset view direction looking up. + 預設視圖方向往上。 Preset view direction looking down. - Preset view direction looking down. + 預設視圖方向往下。 Preset view direction looking left. - Preset view direction looking left. + 預設視圖方向往左。 Preset view direction looking right. - Preset view direction looking right. + 預設視圖方向往右。 @@ -7818,22 +7848,22 @@ using the given X/Y Spacing <html><head/><body><p>Rebuild display now. May be slow for complex models.</p></body></html> - <html><head/><body><p>Rebuild display now. May be slow for complex models.</p></body></html> + <html><head/><body><p>現在重建顯示。對複雜模型可能會變慢。</p></body></html> Update Now - Update Now + 馬上更新 Check to update display after every property change. - Check to update display after every property change. + 勾選以在每次屬性變更後更新顯示。 Live Update - Live Update + 即時更新 @@ -7868,7 +7898,7 @@ using the given X/Y Spacing Can not continue. Object * %1 or %2 not found. - Can not continue. Object * %1 or %2 not found. + 無法繼續，找不到物件 * %1 或 %2。 @@ -8158,7 +8188,7 @@ using the given X/Y Spacing SectionView - SectionView + 剖面視圖 @@ -8187,7 +8217,7 @@ using the given X/Y Spacing TechDraw_2LineCenterLine - + Adds a Centerline between 2 Lines 在兩條線中加入中心線 @@ -8195,7 +8225,7 @@ using the given X/Y Spacing TechDraw_2PointCenterLine - + Adds a Centerline between 2 Points 在兩點間加入中心線 @@ -8205,13 +8235,13 @@ using the given X/Y Spacing Insert complex Section View - Insert complex Section View + 插入複雜剖面視圖 TechDraw_CosmeticVertex - + Inserts a Cosmetic Vertex into a View 在視圖中插入裝飾頂點 @@ -8221,18 +8251,18 @@ using the given X/Y Spacing Remove Prefix - 移除前置 + 移除前綴 Remove prefix symbols at the beginning of the dimension text:<br>- Select one or more dimensions<br>- Click this tool - 移除標註文字的前置符號：<br>- 選擇一個以上的標註<br>- 點選此工具 + 移除標註文字的前綴符號：<br>- 選擇一個以上的標註<br>- 點選此工具 TechDraw_FaceCenterLine - + Adds a Centerline to Faces 添加中心線至面 @@ -8248,7 +8278,7 @@ using the given X/Y Spacing TechDraw_Midpoints - + Inserts Cosmetic Vertices at Midpoint of selected Edges 在選擇邊之中點處插入裝飾頂點 @@ -8256,7 +8286,7 @@ using the given X/Y Spacing TechDraw_Quadrants - + Inserts Cosmetic Vertices at Quadrant Points of selected Circles 在選擇圓之象限點處插入裝飾頂點 @@ -8266,7 +8296,7 @@ using the given X/Y Spacing Insert simple Section View - Insert simple Section View + 插入簡單剖面視圖 @@ -8943,4 +8973,100 @@ there is an open task dialog. GeomHatch + + TechDrawGui::TaskCosmeticCircle + + + Cosmetic Circle + 裝飾圓 + + + + View + 檢視 + + + + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + Treat the center point as a 2d point within the parent View. Z coordinate is ignored. + + + + 2d Point + 2d 的點 + + + + Treat the center point as a 3d point and project it onto the parent View. + Treat the center point as a 3d point and project it onto the parent View. + + + + 3d Point + 3d 的點 + + + + Circle Center + Circle Center + + + + X: + X： + + + + Y: + Y： + + + + Z: + Z： + + + + Radius: + 半徑： + + + + Start Angle: + Start Angle: + + + + End angle (conventional) of arc in degrees. + End angle (conventional) of arc in degrees. + + + + End Angle: + End Angle: + + + + Start angle (conventional) of arc in degrees. + Start angle (conventional) of arc in degrees. + + + + Arc of Circle + Arc of Circle + + + + CmdTechDrawCosmeticCircle + + + TechDraw + TechDraw + + + + Add Cosmetic Circle + 添加裝飾圓 + + diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.h b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.h index 12fc33ad8d..6de473395d 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticCircle.h +++ b/src/Mod/TechDraw/Gui/TaskCosmeticCircle.h @@ -82,7 +82,6 @@ private: TechDraw::CosmeticEdge* m_ce; TechDraw::CosmeticEdge* m_saveCE; Base::Vector3d m_center; - double m_radius; bool m_createMode; std::string m_tag; bool m_is3d; diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp index 1340e668b4..847d07edb9 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include "PreferencesGui.h" #include "QGIView.h" @@ -360,7 +361,8 @@ std::vector ViewProviderViewPart::getSelectedCosmetics(std::vector< result.emplace_back(sub); } } else if (DU::getGeomTypeFromName(sub) == "Edge") { - if (DU::isCosmeticEdge(getViewObject(), sub)) { + if (DU::isCosmeticEdge(getViewObject(), sub) || + DU::isCenterLine(getViewObject(), sub)) { result.emplace_back(sub); } } @@ -380,9 +382,16 @@ void ViewProviderViewPart::deleteCosmeticElements(std::vector remov } if (DU::getGeomTypeFromName(name) == "Edge") { CosmeticEdge* edge = getViewObject()->getCosmeticEdgeBySelection(name); - // if not edge, something has gone very wrong! - getViewObject()->removeCosmeticEdge(edge->getTagAsString()); - continue; + if (edge) { + // if not edge, something has gone very wrong! + getViewObject()->removeCosmeticEdge(edge->getTagAsString()); + continue; + } + CenterLine* line = getViewObject()->getCenterLineBySelection(name); + if (line) { + getViewObject()->removeCenterLine(line->getTagAsString()); + continue; + } } } } diff --git a/src/Mod/Test/BaseTests.py b/src/Mod/Test/BaseTests.py index 30ec380436..3e32767447 100644 --- a/src/Mod/Test/BaseTests.py +++ b/src/Mod/Test/BaseTests.py @@ -266,31 +266,20 @@ class AlgebraTestCase(unittest.TestCase): self.assertNotEqual(m2, m4 * m3, "Wrong multiplication order") def testRotationFromMatrix(self): - m1 = FreeCAD.Matrix() - m1.rotateZ(0.2) - m1.scale(0.5) - m1.rotateY(0.2) - m1.scale(3) - m1.move(10, 5, -3) - r1 = FreeCAD.Rotation(m1) - m2 = FreeCAD.Matrix() - m2.rotateZ(0.2) - m2.rotateY(0.2) - m2.move(10, 5, -3) - r2 = FreeCAD.Rotation(m2) - self.assertTrue(r1.isSame(r2, 1e-7), "Scale on matrix influenced rotation") - m3 = FreeCAD.Matrix() - m3.scale(-1) - r3 = FreeCAD.Rotation(m3) - r0 = FreeCAD.Rotation() - self.assertTrue(r3.isSame(r0, 1e-7), "Scale on matrix influenced rotation") - m4 = FreeCAD.Matrix() - m4.scale(1.25, 1.0, 0.25) - m4.move(4, 5, 6) - r24 = FreeCAD.Rotation(m2 * m4) - r42 = FreeCAD.Rotation(m4 * m2) - self.assertTrue(r2.isSame(r24, 1e-7), "Scale on matrix influenced rotation") - self.assertTrue(r2.isSame(r42, 1e-7), "Scale on matrix influenced rotation") + rot = FreeCAD.Rotation(45, 30, 0) + m_r = rot.toMatrix() + m_r.move(5, 6, 7) + m_s = FreeCAD.Matrix() + m_s.scale(1, 1, 3) + m_s.move(7, 3, 2) + target_rot = FreeCAD.Rotation(45, 60, 0) + err = "Non uniform scale has wrong affect non orthogonal rotation" + self.assertTrue(FreeCAD.Rotation(m_s * m_r).isSame(target_rot, 1e-12), err) + err = "Right multiplication with non uniform scale must not affect rotation" + self.assertTrue(FreeCAD.Rotation(m_r * m_s).isSame(rot, 1e-12), err) + m_r.scale(-2) + err = "Uniform scale must not affect rotation" + self.assertTrue(FreeCAD.Rotation(m_r).isSame(rot, 1e-12), err) def testRotation(self): r = FreeCAD.Rotation(1, 0, 0, 0) # 180 deg around (1,0,0) @@ -374,24 +363,6 @@ class AlgebraTestCase(unittest.TestCase): p.Rotation.Angle = math.pi / 2 self.assertEqual(abs(p.inverse().Rotation.Angle), p.Rotation.Angle) - def testMatrixToRotationFailure(self): - mat = FreeCAD.Matrix() - mat.A21 = 1.0 - with self.assertRaises(ValueError): - FreeCAD.Placement(mat) - with self.assertRaises(ValueError): - FreeCAD.Rotation(mat) - with self.assertRaises(ValueError): - FreeCAD.Rotation(*mat.A) - with self.assertRaises(ValueError): - FreeCAD.Rotation(1, 1, 0, 0, 1, 0, 0, 0, 1) - with self.assertRaises(ValueError): - rot = FreeCAD.Rotation() - rot.Matrix = FreeCAD.Matrix(1, 1, 0, 0, 1, 0, 0, 0, 1) - with self.assertRaises(ValueError): - plm = FreeCAD.Placement() - rot.Matrix = FreeCAD.Matrix(1, 1, 0, 0, 1, 0, 0, 0, 1) - def testYawPitchRoll(self): def getYPR1(yaw, pitch, roll): r = FreeCAD.Rotation() diff --git a/src/Mod/Tux/Resources/translations/Tux_pt-BR.qm b/src/Mod/Tux/Resources/translations/Tux_pt-BR.qm index 65bb8110b7..11d87ca304 100644 Binary files a/src/Mod/Tux/Resources/translations/Tux_pt-BR.qm and b/src/Mod/Tux/Resources/translations/Tux_pt-BR.qm differ diff --git a/src/Mod/Tux/Resources/translations/Tux_pt-BR.ts b/src/Mod/Tux/Resources/translations/Tux_pt-BR.ts index d016781236..90b74f0868 100644 --- a/src/Mod/Tux/Resources/translations/Tux_pt-BR.ts +++ b/src/Mod/Tux/Resources/translations/Tux_pt-BR.ts @@ -6,7 +6,7 @@ Select - Selecionar + Selecione diff --git a/src/Mod/Tux/Resources/translations/Tux_zh-TW.qm b/src/Mod/Tux/Resources/translations/Tux_zh-TW.qm index 586d20fb80..5ca557b1e4 100644 Binary files a/src/Mod/Tux/Resources/translations/Tux_zh-TW.qm and b/src/Mod/Tux/Resources/translations/Tux_zh-TW.qm differ diff --git a/src/Mod/Tux/Resources/translations/Tux_zh-TW.ts b/src/Mod/Tux/Resources/translations/Tux_zh-TW.ts index 472c032d10..f62cff21cb 100644 --- a/src/Mod/Tux/Resources/translations/Tux_zh-TW.ts +++ b/src/Mod/Tux/Resources/translations/Tux_zh-TW.ts @@ -81,12 +81,12 @@ Turntable - 可旋轉 + 旋轉台 Free Turntable - Free Turntable + 自由旋轉台 diff --git a/src/Mod/Web/Gui/Resources/translations/Web_zh-TW.ts b/src/Mod/Web/Gui/Resources/translations/Web_zh-TW.ts index b5e244ba11..aa526b9d01 100644 --- a/src/Mod/Web/Gui/Resources/translations/Web_zh-TW.ts +++ b/src/Mod/Web/Gui/Resources/translations/Web_zh-TW.ts @@ -156,7 +156,7 @@ There were serious errors while loading the file. Some data might have been modified or not recovered at all. Saving the project will most likely result in loss of data. - There were serious errors while loading the file. Some data might have been modified or not recovered at all. Saving the project will most likely result in loss of data. + 在載入檔案時出現嚴重錯誤。某些資料可能已被修改或未能完全恢復。儲存該專案將很可能導致資料損失。 diff --git a/src/Mod/Web/Gui/Workbench.cpp b/src/Mod/Web/Gui/Workbench.cpp index 08f60fcad5..d8cafd677d 100644 --- a/src/Mod/Web/Gui/Workbench.cpp +++ b/src/Mod/Web/Gui/Workbench.cpp @@ -138,7 +138,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // Gui::MenuItem* tool = new Gui::MenuItem( menuBar ); // tool->setCommand("&Tools"); // *tool << "Std_CommandLine" << "Std_DlgParameter" << "Separator" << "Std_DlgMacroRecord" - // << "Std_MacroStopRecord" << "Std_DlgMacroExecute" << "Std_DlgMacroExecuteDirect" + // << "Std_DlgMacroExecute" << "Std_DlgMacroExecuteDirect" // << "Separator" << "Std_ViewScreenShot" << "Separator" << "Std_DlgCustomize"; // // // Mesh diff --git a/src/Tools/generateBase/generateMetaModel_Module.xsd b/src/Tools/generateBase/generateMetaModel_Module.xsd index 725b1a151f..799056ef07 100644 --- a/src/Tools/generateBase/generateMetaModel_Module.xsd +++ b/src/Tools/generateBase/generateMetaModel_Module.xsd @@ -18,6 +18,7 @@ + diff --git a/src/Tools/generateBase/generateModel_Module.py b/src/Tools/generateBase/generateModel_Module.py index be37255883..9e126b68df 100644 --- a/src/Tools/generateBase/generateModel_Module.py +++ b/src/Tools/generateBase/generateModel_Module.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -# Generated Fri Mar 31 16:59:53 2023 by generateDS.py. +# Generated Wed Sep 27 11:00:46 2023 by generateDS.py. # Update it with: python generateDS.py -o generateModel_Module.py generateMetaModel_Module.xsd # # WARNING! All changes made in this file will be lost! @@ -789,6 +789,7 @@ class Methode: Name="", Const=0, Keyword=0, + NoArgs=0, Class=0, Static=0, Documentation=None, @@ -797,6 +798,7 @@ class Methode: self.Name = Name self.Const = Const self.Keyword = Keyword + self.NoArgs = NoArgs self.Class = Class self.Static = Static self.Documentation = Documentation @@ -849,6 +851,12 @@ class Methode: def setKeyword(self, Keyword): self.Keyword = Keyword + def getNoargs(self): + return self.NoArgs + + def setNoargs(self, NoArgs): + self.NoArgs = NoArgs + def getClass(self): return self.Class @@ -876,6 +884,8 @@ class Methode: outfile.write(' Const="%s"' % (self.getConst(),)) if self.getKeyword() is not None: outfile.write(' Keyword="%s"' % (self.getKeyword(),)) + if self.getNoargs() is not None: + outfile.write(' NoArgs="%s"' % (self.getNoargs(),)) if self.getClass() is not None: outfile.write(' Class="%s"' % (self.getClass(),)) if self.getStatic() is not None: @@ -900,6 +910,8 @@ class Methode: showIndent(outfile, level) outfile.write('Keyword = "%s",\n' % (self.getKeyword(),)) showIndent(outfile, level) + outfile.write('NoArgs = "%s",\n' % (self.getNoargs(),)) + showIndent(outfile, level) outfile.write('Class = "%s",\n' % (self.getClass(),)) showIndent(outfile, level) outfile.write('Static = "%s",\n' % (self.getStatic(),)) @@ -948,6 +960,13 @@ class Methode: self.Keyword = 0 else: raise ValueError("Bad boolean attribute (Keyword)") + if attrs.get("NoArgs"): + if attrs.get("NoArgs").value in ("true", "1"): + self.NoArgs = 1 + elif attrs.get("NoArgs").value in ("false", "0"): + self.NoArgs = 0 + else: + raise ValueError("Bad boolean attribute (NoArgs)") if attrs.get("Class"): if attrs.get("Class").value in ("true", "1"): self.Class = 1 @@ -1549,12 +1568,7 @@ class Content: subclass = None def __init__( - self, - Property=None, - Feature=None, - DocObject=None, - GuiCommand=None, - PreferencesPage=None, + self, Property=None, Feature=None, DocObject=None, GuiCommand=None, PreferencesPage=None ): if Property is None: self.Property = [] @@ -2694,6 +2708,16 @@ class SaxGeneratemodelHandler(handler.ContentHandler): self.reportError( '"Keyword" attribute must be boolean ("true", "1", "false", "0")' ) + val = attrs.get("NoArgs", None) + if val is not None: + if val in ("true", "1"): + obj.setNoargs(1) + elif val in ("false", "0"): + obj.setNoargs(0) + else: + self.reportError( + '"NoArgs" attribute must be boolean ("true", "1", "false", "0")' + ) val = attrs.get("Class", None) if val is not None: if val in ("true", "1"): @@ -3062,11 +3086,7 @@ class SaxGeneratemodelHandler(handler.ContentHandler): locator = self.locator sys.stderr.write( "Doc: %s Line: %d Column: %d\n" - % ( - locator.getSystemId(), - locator.getLineNumber(), - locator.getColumnNumber() + 1, - ) + % (locator.getSystemId(), locator.getLineNumber(), locator.getColumnNumber() + 1) ) sys.stderr.write(mesg) sys.stderr.write("\n") diff --git a/src/Tools/generateTemplates/templateClassPyExport.py b/src/Tools/generateTemplates/templateClassPyExport.py index 72f5ed1341..a9c4df8bfd 100644 --- a/src/Tools/generateTemplates/templateClassPyExport.py +++ b/src/Tools/generateTemplates/templateClassPyExport.py @@ -121,6 +121,19 @@ public: /// implementer for the @i.Name@() method PyObject* @i.Name@(PyObject *args, PyObject *kwd); - += elif i.NoArgs: + /// callback for the @i.Name@() method + static PyObject * staticCallback_@i.Name@ (PyObject *self, PyObject *args); ++ if i.Static: + /// implementer for the @i.Name@() method + static PyObject* @i.Name@(); += elif i.Class: + /// implementer for the @i.Name@() method + static PyObject* @i.Name@(PyObject *self); += else: + /// implementer for the @i.Name@() method + PyObject* @i.Name@(); +- = else: /// callback for the @i.Name@() method static PyObject * staticCallback_@i.Name@ (PyObject *self, PyObject *args); @@ -389,6 +402,17 @@ PyMethodDef @self.export.Name@::Methods[] = { reinterpret_cast(reinterpret_cast( staticCallback_@i.Name@ )), METH_VARARGS|METH_KEYWORDS, - += elif i.NoArgs: ++ if i.Class: + reinterpret_cast(reinterpret_cast( staticCallback_@i.Name@ )), + METH_NOARGS|METH_CLASS, += elif i.Static: + reinterpret_cast(reinterpret_cast( staticCallback_@i.Name@ )), + METH_NOARGS|METH_STATIC, += else: + reinterpret_cast( staticCallback_@i.Name@ ), + METH_NOARGS, +- = elif i.Class: reinterpret_cast(reinterpret_cast( staticCallback_@i.Name@ )), METH_VARARGS|METH_CLASS, @@ -532,6 +556,8 @@ PyGetSetDef @self.export.Name@::GetterSetter[] = { // has to be implemented in @self.export.Name@Imp.cpp + if i.Keyword: PyObject * @self.export.Name@::staticCallback_@i.Name@ (PyObject *self, PyObject *args, PyObject * kwd) += elif i.NoArgs: +PyObject * @self.export.Name@::staticCallback_@i.Name@ (PyObject *self, PyObject * Py_UNUSED(args)) = else: PyObject * @self.export.Name@::staticCallback_@i.Name@ (PyObject *self, PyObject *args) - @@ -568,6 +594,15 @@ PyObject * @self.export.Name@::staticCallback_@i.Name@ (PyObject *self, PyObject = else: PyObject* ret = static_cast<@self.export.Name@*>(self)->@i.Name@(args, kwd); - += elif i.NoArgs: ++ if i.Static: + (void)self; + PyObject* ret = @self.export.Name@::@i.Name@(); += elif i.Class: + PyObject* ret = @self.export.Name@::@i.Name@(self); += else: + PyObject* ret = static_cast<@self.export.Name@*>(self)->@i.Name@(); +- = else: + if i.Static: (void)self; @@ -881,6 +916,12 @@ PyObject* @self.export.Name@::@i.Name@(PyObject *self, PyObject *args, PyObject = else: PyObject* @self.export.Name@::@i.Name@(PyObject *args, PyObject *kwds) - += elif i.NoArgs: ++ if i.Class: +PyObject* @self.export.Name@::@i.Name@(PyObject *self) += else: +PyObject* @self.export.Name@::@i.Name@() +- = else: + if i.Class: PyObject* @self.export.Name@::@i.Name@(PyObject *self, PyObject *args) @@ -1222,6 +1263,12 @@ PyObject* @self.export.Name@::@i.Name@(PyObject * /*self*/, PyObject * /*args*/, = else: PyObject* @self.export.Name@::@i.Name@(PyObject * /*args*/, PyObject * /*kwds*/) - += elif i.NoArgs: ++ if i.Class: +PyObject* @self.export.Name@::@i.Name@(PyObject * /*self*/) += else: +PyObject* @self.export.Name@::@i.Name@() +- = else: + if i.Class: PyObject* @self.export.Name@::@i.Name@(PyObject * /*self*/, PyObject * /*args*/) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9dd3de88f0..7cb488ecd4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,9 +2,9 @@ if(MSVC) add_compile_options(/wd4251) option( - gtest_force_shared_crt - "Use shared (DLL) run-time lib even when Google Test is built as static lib." - ON) + gtest_force_shared_crt + "Use shared (DLL) run-time lib even when Google Test is built as static lib." + ON) set(Google_Tests_LIBS oldnames.lib @@ -14,8 +14,8 @@ if(MSVC) optimized msvcprt.lib ) - #Universal C runtime introduced in VS 2015 (cl version 19) - if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19")) + # Universal C runtime introduced in VS 2015 (cl version 19) + if(NOT(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19")) list(APPEND Google_Tests_LIBS debug vcruntimed.lib debug ucrtd.lib @@ -40,32 +40,35 @@ endif() set(CMAKE_AUTOMOC ON) function(setup_qt_test) - foreach (_testname ${ARGN}) + foreach(_testname ${ARGN}) add_executable(${_testname}_Tests_run ${_testname}.cpp) add_test(NAME ${_testname}_Tests_run COMMAND ${_testname}_Tests_run) - if (NOT BUILD_DYNAMIC_LINK_PYTHON) + + if(NOT BUILD_DYNAMIC_LINK_PYTHON) list(APPEND ${_testname}_LIBS - ${PYTHON_LIBRARIES} - ) - endif () + ${PYTHON_LIBRARIES} + ) + endif() + target_include_directories(${_testname}_Tests_run PUBLIC - ${Python3_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} - ${QtGui_INCLUDE_DIRS} - ${QtWidgets_INCLUDE_DIRS} - ${QtTest_INCLUDE_DIRS} - ${COIN3D_INCLUDE_DIRS}) + ${Python3_INCLUDE_DIRS} + ${XercesC_INCLUDE_DIRS} + ${QtGui_INCLUDE_DIRS} + ${QtWidgets_INCLUDE_DIRS} + ${QtTest_INCLUDE_DIRS} + ${COIN3D_INCLUDE_DIRS}) target_link_libraries(${_testname}_Tests_run - FreeCADApp - FreeCADGui - ${QtCore_LIBRARIES} - ${QtWidgets_LIBRARIES} - ${QtTest_LIBRARIES} - ${${_testname}_LIBS}) - endforeach () + FreeCADApp + FreeCADGui + ${QtCore_LIBRARIES} + ${QtWidgets_LIBRARIES} + ${QtTest_LIBRARIES} + ${${_testname}_LIBS}) + endforeach() endfunction() add_executable(Tests_run) +add_executable(Material_tests_run) add_executable(Mesh_tests_run) add_executable(Part_tests_run) add_executable(Points_tests_run) @@ -82,4 +85,3 @@ target_link_libraries(Tests_run ${Google_Tests_LIBS} FreeCADApp ) - diff --git a/tests/src/Base/CoordinateSystem.cpp b/tests/src/Base/CoordinateSystem.cpp index 3a22aca6f0..1706ffbcc0 100644 --- a/tests/src/Base/CoordinateSystem.cpp +++ b/tests/src/Base/CoordinateSystem.cpp @@ -73,10 +73,10 @@ TEST(CoordinateSystem, TestTransformPlacement) csT.transform(plm); Base::Placement dis = cs.displacement(csT); - EXPECT_EQ(plm, dis); + EXPECT_EQ(plm.isSame(dis, 1e-15), true); Base::Placement disT = csT.displacement(cs); - EXPECT_EQ(plm.inverse(), disT); + EXPECT_EQ(plm.inverse().isSame(disT, 1e-15), true); } TEST(CoordinateSystem, TestMultTransformPlacement) @@ -106,10 +106,10 @@ TEST(CoordinateSystem, TestTransformRotation) csT.transform(rot); Base::Placement dis = cs.displacement(csT); - EXPECT_EQ(rot, dis.getRotation()); + EXPECT_EQ(rot.isSame(dis.getRotation(), 1e-15), true); Base::Placement disT = csT.displacement(cs); - EXPECT_EQ(rot.inverse(), disT.getRotation()); + EXPECT_EQ(rot.inverse().isSame(disT.getRotation(), 1e-15), true); } TEST(CoordinateSystem, TestTransformPoint) @@ -141,10 +141,10 @@ TEST(CoordinateSystem, TestSetPlacement) csT.setPlacement(plm); Base::Placement dis = cs.displacement(csT); - EXPECT_EQ(plm, dis); + EXPECT_EQ(plm.isSame(dis, 1e-15), true); Base::Placement disT = csT.displacement(cs); - EXPECT_EQ(plm.inverse(), disT); + EXPECT_EQ(plm.inverse().isSame(disT, 1e-15), true); } // NOLINTEND diff --git a/tests/src/Base/Rotation.cpp b/tests/src/Base/Rotation.cpp index c5cb73f4a4..d8d6676a9e 100644 --- a/tests/src/Base/Rotation.cpp +++ b/tests/src/Base/Rotation.cpp @@ -8,16 +8,17 @@ TEST(Rotation, TestNonUniformScaleLeft) { Base::Rotation rot; - rot.setYawPitchRoll(20.0, 0.0, 0.0); + rot.setYawPitchRoll(45.0, 0.0, 0.0); Base::Matrix4D mat; rot.getValue(mat); Base::Matrix4D scale; - scale.scale(2.0, 3.0, 4.0); + scale.scale(1.0, std::sqrt(3.0), 1.0); Base::Rotation scaled_rot(scale * mat); + rot.setYawPitchRoll(60.0, 0.0, 0.0); EXPECT_EQ(scaled_rot.isSame(rot, 1.0e-7), true); EXPECT_EQ(rot.isSame(scaled_rot, 1.0e-7), true); } @@ -66,13 +67,4 @@ TEST(Rotation, TestUniformScaleLT1) EXPECT_EQ(scaled_rot.isSame(scaled_rot, 1.0e-7), true); } -TEST(Rotation, TestRotationFailure) -{ - Base::Matrix4D mat; - mat.setCol(0, Base::Vector3d {1, 0, 0}); - mat.setCol(1, Base::Vector3d {1, 1, 0}); - mat.setCol(2, Base::Vector3d {0, 0, 1}); - - EXPECT_THROW(Base::Rotation {mat}, Base::ValueError); -} // NOLINTEND(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers) diff --git a/tests/src/Mod/CMakeLists.txt b/tests/src/Mod/CMakeLists.txt index 3b172b15a3..0d12ca7606 100644 --- a/tests/src/Mod/CMakeLists.txt +++ b/tests/src/Mod/CMakeLists.txt @@ -1,3 +1,4 @@ +add_subdirectory(Material) add_subdirectory(Mesh) add_subdirectory(Part) add_subdirectory(Points) diff --git a/tests/src/Mod/Material/App/CMakeLists.txt b/tests/src/Mod/Material/App/CMakeLists.txt new file mode 100644 index 0000000000..879f74ef06 --- /dev/null +++ b/tests/src/Mod/Material/App/CMakeLists.txt @@ -0,0 +1,6 @@ + +target_sources( + Material_tests_run + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Model.cpp +) diff --git a/tests/src/Mod/Material/App/Model.cpp b/tests/src/Mod/Material/App/Model.cpp new file mode 100644 index 0000000000..19300f1231 --- /dev/null +++ b/tests/src/Mod/Material/App/Model.cpp @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/*************************************************************************** + * Copyright (c) 2023 David Carter * + * * + * This file is part of FreeCAD. * + * * + * FreeCAD is free software: you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation, either version 2.1 of the * + * License, or (at your option) any later version. * + * * + * FreeCAD is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with FreeCAD. If not, see * + * . * + * * + **************************************************************************/ + +#include "gtest/gtest.h" + +#include +#ifndef _PreComp_ +#endif + +#include + +#include + +#include +#include +#include + +// clang-format off + +class MaterialTest : public ::testing::Test { + protected: + static void SetUpTestSuite() { + if (App::Application::GetARGC() == 0) { + constexpr int argc = 1; + std::array argv {"FreeCAD"}; + App::Application::Config()["ExeName"] = "FreeCAD"; + App::Application::init(argc, argv.data()); + } + } + + void SetUp() override { + _modelManager = new Materials::ModelManager(); + _materialManager = new Materials::MaterialManager(); + } + + // void TearDown() override {} + Materials::ModelManager* _modelManager; + Materials::MaterialManager* _materialManager; +}; + +TEST_F(MaterialTest, TestApplication) +{ + try { + App::GetApplication(); + } + catch (...) { + ADD_FAILURE() << "Application failure\n"; + } + + SUCCEED(); +} + +TEST_F(MaterialTest, TestResources) +{ + try { + auto param = App::GetApplication().GetParameterGroupByPath( + "User parameter:BaseApp/Preferences/Mod/Material/Resources"); + EXPECT_NE(param, nullptr); + } + catch (const std::exception &e) + { + FAIL() << "Exception: " << e.what() << "\n"; + } +} + +TEST_F(MaterialTest, TestModelLoad) +{ + EXPECT_NE(_modelManager, nullptr); + + auto density = _modelManager->getModel(QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af")); + EXPECT_EQ(density.getName(), QString::fromStdString("Density")); + EXPECT_EQ(density.getUUID(), QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af")); + + auto& prop = density[QString::fromStdString("Density")]; + EXPECT_EQ(prop.getName(), QString::fromStdString("Density")); +} + +TEST_F(MaterialTest, TestMaterialsWithModel) +{ + auto materials = _materialManager->materialsWithModel( + QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic + EXPECT_GT(materials->size(), 0); + + auto materialsComplete = _materialManager->materialsWithModelComplete( + QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic + EXPECT_LE(materialsComplete->size(), materials->size()); + + auto materialsLinearElastic = _materialManager->materialsWithModel( + QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); // LinearElastic + + // All LinearElastic models should be in IsotropicLinearElastic since it is inherited + EXPECT_LE(materialsLinearElastic->size(), materials->size()); + for (auto itp = materialsLinearElastic->begin(); itp != materialsLinearElastic->end(); itp++) { + auto mat = itp->first; + EXPECT_NO_THROW(materials->at(mat)); + } +} + +TEST_F(MaterialTest, testMaterialByPath) +{ + auto& steel = _materialManager->getMaterialByPath( + QString::fromStdString("StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat"), + QString::fromStdString("System")); + EXPECT_NE(&steel, nullptr); + EXPECT_EQ(steel.getName(), QString::fromStdString("CalculiX-Steel")); + EXPECT_EQ(steel.getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d")); + + // The same but with a leading '/' + auto& steel2 = _materialManager->getMaterialByPath( + QString::fromStdString("/System/StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat"), + QString::fromStdString("System")); + EXPECT_NE(&steel2, nullptr); + EXPECT_EQ(steel2.getName(), QString::fromStdString("CalculiX-Steel")); + EXPECT_EQ(steel2.getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d")); + + // Same with the library name as a prefix + auto& steel3 = _materialManager->getMaterialByPath( + QString::fromStdString("StandardMaterial/Metal/Steel/CalculiX-Steel.FCMat"), + QString::fromStdString("System")); + EXPECT_NE(&steel3, nullptr); + EXPECT_EQ(steel3.getName(), QString::fromStdString("CalculiX-Steel")); + EXPECT_EQ(steel3.getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d")); +} + +// clang-format on diff --git a/tests/src/Mod/Material/CMakeLists.txt b/tests/src/Mod/Material/CMakeLists.txt new file mode 100644 index 0000000000..ff798efcb3 --- /dev/null +++ b/tests/src/Mod/Material/CMakeLists.txt @@ -0,0 +1,15 @@ + +target_include_directories(Material_tests_run PUBLIC + ${EIGEN3_INCLUDE_DIR} + ${OCC_INCLUDE_DIR} + ${Python3_INCLUDE_DIRS} + ${XercesC_INCLUDE_DIRS} +) + +target_link_libraries(Material_tests_run + gtest_main + ${Google_Tests_LIBS} + Material +) + +add_subdirectory(App)