diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
index e5fb35d04e..146bd70949 100644
--- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
+++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
@@ -92,8 +92,11 @@ macro(SetupShibokenAndPyside)
if(PYSIDE_MAJOR_VERSION LESS 6)
file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QGraphicsSvgItem\n"
"from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QSvgWidget\n")
+ file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n")
else()
file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvgWidgets import *\n")
+ file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n"
+ "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineCore import QWebEnginePage\n")
endif()
endif()
diff --git a/src/3rdParty/OndselSolver b/src/3rdParty/OndselSolver
index fe99ad2593..2d71435110 160000
--- a/src/3rdParty/OndselSolver
+++ b/src/3rdParty/OndselSolver
@@ -1 +1 @@
-Subproject commit fe99ad259391b8fd9390f919926aa3c8b6cde787
+Subproject commit 2d71435110f2232cffa9c33a436ad63dd8036ce1
diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp
index 3117e5e739..c2d77a24e6 100644
--- a/src/App/PropertyStandard.cpp
+++ b/src/App/PropertyStandard.cpp
@@ -3072,7 +3072,8 @@ void PropertyMaterialList::Save(Base::Writer& writer) const
{
if (!writer.isForceXML()) {
writer.Stream() << writer.ind() << ""
+ << (getSize() ? writer.addFile(getName(), this) : "") << "\""
+ << " version=\"2\"/>"
<< std::endl;
}
}
@@ -3082,6 +3083,9 @@ void PropertyMaterialList::Restore(Base::XMLReader& reader)
reader.readElement("MaterialList");
if (reader.hasAttribute("file")) {
std::string file(reader.getAttribute("file"));
+ if (reader.hasAttribute("version")) {
+ formatVersion = static_cast(reader.getAttributeAsInteger("version"));
+ }
if (!file.empty()) {
// initiate a file read
@@ -3093,10 +3097,6 @@ void PropertyMaterialList::Restore(Base::XMLReader& reader)
void PropertyMaterialList::SaveDocFile(Base::Writer& writer) const
{
Base::OutputStream str(writer.Stream());
- // Write the version. Versions should be negative. A non-negative value is a count
- // and should be processed as a V0
- int32_t version = -1;
- str << version;
uint32_t uCt = (uint32_t)getSize();
str << uCt;
for (const auto& it : _lValueList) {
@@ -3113,14 +3113,22 @@ void PropertyMaterialList::SaveDocFile(Base::Writer& writer) const
void PropertyMaterialList::RestoreDocFile(Base::Reader& reader)
{
Base::InputStream str(reader);
- int32_t version;
- str >> version;
- if (version < 0) {
- RestoreDocFileV1(reader);
+ if (formatVersion == Version_2) {
+ // V2 is same as V0
+ uint32_t count = 0;
+ str >> count;
+ RestoreDocFileV0(count, reader);
}
else {
- uint32_t uCt = static_cast(version);
- RestoreDocFileV0(uCt, reader);
+ int32_t version;
+ str >> version;
+ if (version < 0) {
+ RestoreDocFileV1(reader);
+ }
+ else {
+ uint32_t uCt = static_cast(version);
+ RestoreDocFileV0(uCt, reader);
+ }
}
}
@@ -3128,8 +3136,8 @@ void PropertyMaterialList::RestoreDocFileV0(uint32_t count, Base::Reader& reader
{
Base::InputStream str(reader);
std::vector values(count);
- uint32_t value; // must be 32 bit long
- float valueF;
+ uint32_t value {}; // must be 32 bit long
+ float valueF {};
for (auto& it : values) {
str >> value;
it.ambientColor.setPackedValue(value);
@@ -3153,8 +3161,8 @@ void PropertyMaterialList::RestoreDocFileV1(Base::Reader& reader)
uint32_t count = 0;
str >> count;
std::vector values(count);
- uint32_t value; // must be 32 bit long
- float valueF;
+ uint32_t value {}; // must be 32 bit long
+ float valueF {};
for (auto& it : values) {
str >> value;
it.ambientColor.setPackedValue(value);
diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h
index ed617cc821..60978ecb53 100644
--- a/src/App/PropertyStandard.h
+++ b/src/App/PropertyStandard.h
@@ -1189,13 +1189,21 @@ public:
protected:
Material getPyValue(PyObject* py) const override;
+private:
+ enum Format {
+ Version_0,
+ Version_1,
+ Version_2
+ };
+
void RestoreDocFileV0(uint32_t count, Base::Reader& reader);
void RestoreDocFileV1(Base::Reader& reader);
-private:
void verifyIndex(int index) const;
void setSizeOne();
int resizeByOneIfNeeded(int index);
+
+ Format formatVersion {Version_0};
};
diff --git a/src/App/Resources/translations/App.ts b/src/App/Resources/translations/App.ts
index 12677d829c..809e5359df 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 dab4f0c83e..5ef10b7498 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 5842e645e6..7c205e26e8 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
-
+ UnnamedSense nom
diff --git a/src/App/Resources/translations/App_cs.ts b/src/App/Resources/translations/App_cs.ts
index 5c03231710..29789bcc89 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
-
+ UnnamedNepojmenovaný
diff --git a/src/App/Resources/translations/App_de.ts b/src/App/Resources/translations/App_de.ts
index 70ecbedbc8..852845dfbc 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
-
+ UnnamedUnbenannt
diff --git a/src/App/Resources/translations/App_el.ts b/src/App/Resources/translations/App_el.ts
index cab6a72ec1..a783c4e4a4 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 11fbc24e42..2b0e6d5725 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
-
+ UnnamedSin nombre
diff --git a/src/App/Resources/translations/App_es-ES.ts b/src/App/Resources/translations/App_es-ES.ts
index 1108d87fc6..6c2f83209c 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
-
+ UnnamedSin nombre
diff --git a/src/App/Resources/translations/App_eu.ts b/src/App/Resources/translations/App_eu.ts
index 186a90e088..a5b1cbf5f9 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
-
+ UnnamedIzenik gabea
diff --git a/src/App/Resources/translations/App_fi.ts b/src/App/Resources/translations/App_fi.ts
index c19135174b..5c7f2abba6 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
-
+ UnnamedNimetön
diff --git a/src/App/Resources/translations/App_fr.ts b/src/App/Resources/translations/App_fr.ts
index d633b604d2..53e6a7667e 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
-
+ UnnamedSans nom
diff --git a/src/App/Resources/translations/App_hr.ts b/src/App/Resources/translations/App_hr.ts
index 1af01d4fc8..e5e9973dd9 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
-
+ UnnamedNeimenovano
diff --git a/src/App/Resources/translations/App_hu.ts b/src/App/Resources/translations/App_hu.ts
index b61a6d5f91..fe74af4464 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
-
+ UnnamedNévtelen
diff --git a/src/App/Resources/translations/App_id.ts b/src/App/Resources/translations/App_id.ts
index 8311c9eb8b..8cc985b10b 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
-
+ UnnamedTanpa nama
diff --git a/src/App/Resources/translations/App_it.ts b/src/App/Resources/translations/App_it.ts
index f3824dfa16..c2f3f1d4a3 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
-
+ UnnamedSenza nome
diff --git a/src/App/Resources/translations/App_ja.ts b/src/App/Resources/translations/App_ja.ts
index 316b3b0fd4..9ae4207bf4 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 bd66f8dd63..a3fab712cc 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 6c2ced0ec9..c861b3c081 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 df16382475..200c6d7fd8 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
-
+ UnnamedNaamloos
diff --git a/src/App/Resources/translations/App_pl.ts b/src/App/Resources/translations/App_pl.ts
index 0ee8711bff..336135825b 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
-
+ UnnamedNienazwany
diff --git a/src/App/Resources/translations/App_pt-BR.ts b/src/App/Resources/translations/App_pt-BR.ts
index 354907f2f7..b05f81f177 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
-
+ UnnamedSem nome
diff --git a/src/App/Resources/translations/App_pt-PT.ts b/src/App/Resources/translations/App_pt-PT.ts
index 0196119298..353988dc23 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
-
+ UnnamedSem nome
diff --git a/src/App/Resources/translations/App_ro.ts b/src/App/Resources/translations/App_ro.ts
index 272111488e..8c53d87fff 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
-
+ UnnamedNedenumit
diff --git a/src/App/Resources/translations/App_ru.ts b/src/App/Resources/translations/App_ru.ts
index 6837413a4c..d8211a9466 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 5c5f09cc7f..4de3ffb406 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
-
+ UnnamedNeimenovan
diff --git a/src/App/Resources/translations/App_sr-CS.ts b/src/App/Resources/translations/App_sr-CS.ts
index 3b4cff4a57..4a12bd4b74 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
-
+ UnnamedBez imena
diff --git a/src/App/Resources/translations/App_sr.ts b/src/App/Resources/translations/App_sr.ts
index 291f5c4013..27a1c30134 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 238b5325cb..9ae6a40380 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
-
+ UnnamedNamnlös
diff --git a/src/App/Resources/translations/App_tr.ts b/src/App/Resources/translations/App_tr.ts
index 281dc1904b..7d59b998fd 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İsimsiz
diff --git a/src/App/Resources/translations/App_uk.ts b/src/App/Resources/translations/App_uk.ts
index a5f9c0aa94..8f2abc70f2 100644
--- a/src/App/Resources/translations/App_uk.ts
+++ b/src/App/Resources/translations/App_uk.ts
@@ -13,7 +13,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 99a65c325f..3f7088eb3a 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
-
+ UnnamedSense nom
diff --git a/src/App/Resources/translations/App_zh-CN.ts b/src/App/Resources/translations/App_zh-CN.ts
index 9a078ae572..ee4145a24f 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 c07df64f20..a563e72c90 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/Gui/Action.cpp b/src/Gui/Action.cpp
index d6423d359a..eee53308af 100644
--- a/src/Gui/Action.cpp
+++ b/src/Gui/Action.cpp
@@ -36,7 +36,6 @@
# include
# include
# include
-# include
#endif
#include
@@ -55,7 +54,6 @@
#include "Macro.h"
#include "MainWindow.h"
#include "PythonEditor.h"
-#include "UserSettings.h"
#include "WhatsThis.h"
#include "Widgets.h"
#include "Workbench.h"
@@ -631,7 +629,7 @@ WorkbenchGroup::WorkbenchGroup ( Command* pcCmd, QObject * parent )
void WorkbenchGroup::addTo(QWidget *widget)
{
- if (widget->inherits("QToolBar") || widget->inherits("QMenuBar")) {
+ if (widget->inherits("QToolBar")) {
ParameterGrp::handle hGrp;
hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Workbenches");
QWidget* wbSel;
@@ -642,13 +640,7 @@ void WorkbenchGroup::addTo(QWidget *widget)
wbSel = new WorkbenchTabWidget(this, widget);
}
- if (widget->inherits("QToolBar")) {
- qobject_cast(widget)->addWidget(wbSel);
- }
- else {
- bool left = WorkbenchSwitcher::isLeftCorner(WorkbenchSwitcher::getValue());
- qobject_cast(widget)->setCornerWidget(wbSel, left ? Qt::TopLeftCorner : Qt::TopRightCorner);
- }
+ static_cast(widget)->addWidget(wbSel);
}
else if (widget->inherits("QMenu")) {
auto menu = qobject_cast(widget);
diff --git a/src/Gui/BlenderNavigationStyle.cpp b/src/Gui/BlenderNavigationStyle.cpp
index cb6775ccf8..28a6954dd6 100644
--- a/src/Gui/BlenderNavigationStyle.cpp
+++ b/src/Gui/BlenderNavigationStyle.cpp
@@ -172,9 +172,7 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
case SoMouseButtonEvent::BUTTON3:
if (press) {
this->centerTime = ev->getTime();
- float ratio = vp.getViewportAspectRatio();
- SbViewVolume vv = viewer->getSoRenderManager()->getCamera()->getViewVolume(ratio);
- this->panningplane = vv.getPlane(viewer->getSoRenderManager()->getCamera()->focalDistance.getValue());
+ setupPanningPlane(getCamera());
this->lockrecenter = false;
}
else {
@@ -182,10 +180,7 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
float dci = (float)QApplication::doubleClickInterval()/1000.0f;
// is it just a middle click?
if (tmp.getValue() < dci && !this->lockrecenter) {
- if (!this->lookAtPoint(pos)) {
- panToCenter(panningplane, posn);
- this->interactiveCountDec();
- }
+ lookAtPoint(pos);
processed = true;
}
}
diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/CADNavigationStyle.cpp
index 931eafaf5a..b5d9dbb632 100644
--- a/src/Gui/CADNavigationStyle.cpp
+++ b/src/Gui/CADNavigationStyle.cpp
@@ -179,9 +179,7 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev)
case SoMouseButtonEvent::BUTTON3:
if (press) {
this->centerTime = ev->getTime();
- float ratio = vp.getViewportAspectRatio();
- SbViewVolume vv = viewer->getSoRenderManager()->getCamera()->getViewVolume(ratio);
- this->panningplane = vv.getPlane(viewer->getSoRenderManager()->getCamera()->focalDistance.getValue());
+ setupPanningPlane(getCamera());
this->lockrecenter = false;
}
else {
@@ -189,10 +187,7 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev)
float dci = (float)QApplication::doubleClickInterval()/1000.0f;
// is it just a middle click?
if (tmp.getValue() < dci && !this->lockrecenter) {
- if (!this->lookAtPoint(pos)) {
- panToCenter(panningplane, posn);
- this->interactiveCountDec();
- }
+ lookAtPoint(pos);
processed = true;
}
}
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index f3da6bc391..cb75c5cc66 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -1217,7 +1217,6 @@ SET(FreeCADGui_CPP_SRCS
ManualAlignment.cpp
StartupProcess.cpp
TransactionObject.cpp
- UserSettings.cpp
)
SET(FreeCADGui_SRCS
Application.h
@@ -1255,7 +1254,6 @@ SET(FreeCADGui_SRCS
ManualAlignment.h
StartupProcess.h
TransactionObject.h
- UserSettings.h
${FreeCADGui_SDK_MOC_HDRS}
)
diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index e289a92592..53836e35dc 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -1419,6 +1419,7 @@ void Document::RestoreDocFile(Base::Reader &reader)
for (int i=0; ireadElement("ViewProvider");
std::string name = localreader->getAttribute("name");
+
bool expanded = false;
if (!hasExpansion && localreader->hasAttribute("expanded")) {
const char* attr = localreader->getAttribute("expanded");
@@ -1426,15 +1427,24 @@ void Document::RestoreDocFile(Base::Reader &reader)
expanded = true;
}
}
- ViewProvider* pObj = getViewProviderByName(name.c_str());
+
+ int treeRank = -1;
+ if (localreader->hasAttribute("treeRank")) {
+ treeRank = int(localreader->getAttributeAsInteger("treeRank"));
+ }
+
+ auto pObj = dynamic_cast(getViewProviderByName(name.c_str()));
// check if this feature has been registered
- if (pObj){
+ if (pObj) {
pObj->Restore(*localreader);
}
+ if (pObj && treeRank >= 0) {
+ pObj->setTreeRank(treeRank);
+ }
+
if (pObj && expanded) {
- auto vp = static_cast(pObj);
- this->signalExpandObject(*vp, TreeItemMode::ExpandItem,0,0);
+ this->signalExpandObject(*pObj, TreeItemMode::ExpandItem, 0, 0);
}
localreader->readEndElement("ViewProvider");
}
@@ -1536,8 +1546,6 @@ void Document::SaveDocFile (Base::Writer &writer) const
if(!hasExpansion)
writer.Stream() << ">" << std::endl;
- std::map::const_iterator it;
-
// writing the view provider names itself
writer.Stream() << writer.ind() << "_ViewProviderMap.size() <<"\">" << std::endl;
@@ -1545,12 +1553,13 @@ void Document::SaveDocFile (Base::Writer &writer) const
bool xml = writer.isForceXML();
//writer.setForceXML(true);
writer.incInd(); // indentation for 'ViewProvider name'
- for(it = d->_ViewProviderMap.begin(); it != d->_ViewProviderMap.end(); ++it) {
- const App::DocumentObject* doc = it->first;
- ViewProvider* obj = it->second;
+ for(const auto& it : d->_ViewProviderMap) {
+ const App::DocumentObject* doc = it.first;
+ ViewProviderDocumentObject* obj = it.second;
writer.Stream() << writer.ind() << "getNameInDocument() << "\" "
- << "expanded=\"" << (doc->testStatus(App::Expand) ? 1:0) << "\"";
+ << doc->getNameInDocument() << "\""
+ << " expanded=\"" << (doc->testStatus(App::Expand) ? 1:0) << "\""
+ << " treeRank=\"" << obj->getTreeRank() << "\"";
if (obj->hasExtensions())
writer.Stream() << " Extensions=\"True\"";
diff --git a/src/Gui/GestureNavigationStyle.cpp b/src/Gui/GestureNavigationStyle.cpp
index cedae26205..01ef0aec9e 100644
--- a/src/Gui/GestureNavigationStyle.cpp
+++ b/src/Gui/GestureNavigationStyle.cpp
@@ -297,7 +297,8 @@ public:
//MMB click
if(ev.isPress(3) && ev.mbstate() == 0x010){
ev.flags->processed = true;
- ns.onSetRotationCenter(ev.inventor_event->getPosition());
+ ns.setupPanningPlane(ns.viewer->getCamera());
+ ns.lookAtPoint(ev.inventor_event->getPosition());
return transit();
}
@@ -314,8 +315,10 @@ public:
bool press = (kbev->getState() == SoKeyboardEvent::DOWN);
switch (kbev->getKey()) {
case SoKeyboardEvent::H:
- if (!press)
- ns.onSetRotationCenter(kbev->getPosition());
+ if (!press) {
+ ns.setupPanningPlane(ns.viewer->getCamera());
+ ns.lookAtPoint(kbev->getPosition());
+ }
break;
case SoKeyboardEvent::PAGE_UP:
if(!press){
@@ -538,7 +541,7 @@ public:
if (ns.logging)
Base::Console().Log(" -> PanState\n");
this->ratio = ns.viewer->getSoRenderManager()->getViewportRegion().getViewportAspectRatio();
- ns.pan(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
+ ns.setupPanningPlane(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
}
virtual ~PanState() = default;
@@ -585,7 +588,7 @@ public:
if (ns.logging)
Base::Console().Log(" -> StickyPanState\n");
this->ratio = ns.viewer->getSoRenderManager()->getViewportRegion().getViewportAspectRatio();
- ns.pan(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
+ ns.setupPanningPlane(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
}
virtual ~StickyPanState(){
auto &ns = this->outermost_context().ns;
@@ -631,7 +634,7 @@ public:
this->base_pos = static_cast(this->triggering_event())->inventor_event->getPosition();
if (ns.logging)
Base::Console().Log(" -> TiltState\n");
- ns.pan(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
+ ns.setupPanningPlane(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
}
virtual ~TiltState() = default;
@@ -681,7 +684,7 @@ public:
this->base_pos = static_cast(this->triggering_event())->inventor_event->getPosition();
if (ns.logging)
Base::Console().Log(" -> GestureState\n");
- ns.pan(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
+ ns.setupPanningPlane(ns.viewer->getSoRenderManager()->getCamera());//set up panningplane
this->ratio = ns.viewer->getSoRenderManager()->getViewportRegion().getViewportAspectRatio();
enableTilt = !(App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/View")->GetBool("DisableTouchTilt",true));
@@ -1007,16 +1010,6 @@ void GestureNavigationStyle::onRollGesture(int direction)
}
-void GestureNavigationStyle::onSetRotationCenter(SbVec2s cursor){
- SbBool ret = NavigationStyle::lookAtPoint(cursor);
- if(!ret){
- this->interactiveCountDec(); //this was in original gesture nav. Not sure what is it needed for --DeepSOIC
- Base::Console().Log(
- "No object under cursor! Can't set new center of rotation.\n");
- }
-
-}
-
void GestureNavigationStyle::EventQueue::post(const NS::Event& ev)
{
ev.flags->processed = true;
diff --git a/src/Gui/GestureNavigationStyle.h b/src/Gui/GestureNavigationStyle.h
index 4ced3048ad..3b8886799b 100644
--- a/src/Gui/GestureNavigationStyle.h
+++ b/src/Gui/GestureNavigationStyle.h
@@ -107,8 +107,6 @@ public: //gesture reactions
///Roll gesture is like: press LMB, press RMB, release LMB, release RMB.
/// This function is called by state machine whenever it picks up roll gesture.
void onRollGesture(int direction);
- ///Called by state machine, when set-rotation-center gesture is detected (MMB click, or H key)
- void onSetRotationCenter(SbVec2s cursor);
};
}
diff --git a/src/Gui/InventorNavigationStyle.cpp b/src/Gui/InventorNavigationStyle.cpp
index 3d553f78ff..6eae6323fc 100644
--- a/src/Gui/InventorNavigationStyle.cpp
+++ b/src/Gui/InventorNavigationStyle.cpp
@@ -126,9 +126,7 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev)
if (press && ev->wasShiftDown() &&
(this->currentmode != NavigationStyle::SELECTION)) {
this->centerTime = ev->getTime();
- float ratio = vp.getViewportAspectRatio();
- SbViewVolume vv = viewer->getSoRenderManager()->getCamera()->getViewVolume(ratio);
- this->panningplane = vv.getPlane(viewer->getSoRenderManager()->getCamera()->focalDistance.getValue());
+ setupPanningPlane(getCamera());
this->lockrecenter = false;
}
else if (!press && ev->wasShiftDown() &&
@@ -137,10 +135,7 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev)
float dci = (float)QApplication::doubleClickInterval()/1000.0f;
// is it just a left click?
if (tmp.getValue() < dci && !this->lockrecenter) {
- if (!this->lookAtPoint(pos)) {
- panToCenter(panningplane, posn);
- this->interactiveCountDec();
- }
+ lookAtPoint(pos);
processed = true;
}
}
@@ -191,9 +186,7 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev)
case SoMouseButtonEvent::BUTTON3:
if (press) {
this->centerTime = ev->getTime();
- float ratio = vp.getViewportAspectRatio();
- SbViewVolume vv = viewer->getSoRenderManager()->getCamera()->getViewVolume(ratio);
- this->panningplane = vv.getPlane(viewer->getSoRenderManager()->getCamera()->focalDistance.getValue());
+ setupPanningPlane(getCamera());
this->lockrecenter = false;
}
else {
@@ -201,10 +194,7 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev)
float dci = (float)QApplication::doubleClickInterval()/1000.0f;
// is it just a middle click?
if (tmp.getValue() < dci && !this->lockrecenter) {
- if (!this->lookAtPoint(pos)) {
- panToCenter(panningplane, posn);
- this->interactiveCountDec();
- }
+ lookAtPoint(pos);
processed = true;
}
}
diff --git a/src/Gui/Language/FreeCAD.ts b/src/Gui/Language/FreeCAD.ts
index 41fdd2fbcc..51ddcbd450 100644
--- a/src/Gui/Language/FreeCAD.ts
+++ b/src/Gui/Language/FreeCAD.ts
@@ -37,29 +37,29 @@
-
+ <empty>
-
-
+
+ Angle
-
-
+
+ Axis
-
+ Position
-
+ Enum
@@ -86,12 +86,12 @@
CmdViewMeasureClearAll
-
+ Clear measurement
-
+ Clear all visible measurements
@@ -99,12 +99,12 @@
CmdViewMeasureToggleAll
-
+ Toggle measurement
-
+ Turn on or off the display of all measurements
@@ -117,7 +117,7 @@
-
+ Import
@@ -210,17 +210,17 @@
-
+ Toggle visibility
-
+ Toggle transparency
-
+ Toggle selectability
@@ -2242,17 +2242,17 @@ Specify another directory, please.
Gui::Dialog::DlgPreferences
-
+ Preferences
-
+ Reset
-
+ Header
@@ -2967,51 +2967,56 @@ bounding box size of the 3D object that is currently displayed.
- Location:
+ Location (read-only):
-
+
+ Browse cache directory
+
+
+
+ Check periodically at program start:
-
+ Always
-
+ Daily
-
+ Weekly
-
+ Monthly
-
+ Yearly
-
+ Never
-
+ Cache size limit:
-
+ Check now...
@@ -3825,7 +3830,7 @@ You can also use the form: John Doe <john@doe.com>
Gui::Dialog::DlgSettingsNavigation
-
+ Navigation
@@ -3850,138 +3855,133 @@ You can also use the form: John Doe <john@doe.com>
-
+ Corner where navigation cube is shown
-
+ Top left
-
+ Top right
-
+ Bottom left
-
+ Bottom right
-
+ Rotates to nearest possible state when clicking a cube face
-
+ Rotate to nearest
-
- Font name:
-
-
-
-
+ Font name of the navigation cube
-
+ Default
-
+ Cube size
-
+ Size of the navigation cube
-
+ Opacity when inactive
-
+ Opacity of the navigation cube when not focused
-
+ Color
-
+ 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).
@@ -3989,141 +3989,146 @@ 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
-
+ Animations
-
+ Enable spinning animations that are used in some navigation styles after dragging
-
+ Enable spinning animations
-
+ Duration of navigation animations that have a fixed duration
-
+ Animation duration
-
+ The duration of navigation animations in milliseconds
-
+ Zoom step
-
+
+ Font name
+
+
+
+ Zoom operations will be performed at position of mouse pointer
-
+ Zoom at cursor
-
+ 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
@@ -6389,7 +6394,7 @@ How do you want to proceed?
Gui::PropertyEditor::LinkLabel
-
+ Change the linked object
@@ -6397,12 +6402,12 @@ How do you want to proceed?
Gui::PropertyEditor::LinkSelection
-
+ Error
-
+ Object not found
@@ -7725,35 +7730,35 @@ Do you want to specify another directory?
-
-
-
+
+
+ Unknown filetype
-
-
+
+ Cannot open unknown filetype: %1
-
+ Export failed
-
+ Cannot save to unknown filetype: %1
-
+ Workbench failure
-
+ %1
@@ -7901,81 +7906,81 @@ Be aware the point where you click matters.
-
-
+
+ Save views...
-
-
+
+ Load views...
-
-
+
+ Freeze view
-
-
+
+ Clear views
-
-
-
+
+
+ Restore view &%1
-
+ Save frozen views
-
-
+
+ Frozen views
-
-
+
+ Restore views
-
+ Importing the restored views would clear the already stored views.
Do you want to continue?
-
+ Restore frozen views
-
+ Cannot open file '%1'.
-
+ files
-
+ Save image
-
+ Choose an image file to open
@@ -8666,7 +8671,7 @@ the current copy will be lost.
-
+ Toggle floating window
@@ -8877,13 +8882,8 @@ the current copy will be lost.
-
- UnSuppress
-
-
-
-
- Suppress
+
+ Suppressed
@@ -8903,9 +8903,9 @@ the current copy will be lost.
StdBoxElementSelection
-
-
+
+ Box element selection
@@ -8913,13 +8913,13 @@ the current copy will be lost.
StdBoxSelection
-
+ Box selection
-
-
+
+ Activate the box selection tool
@@ -8997,13 +8997,13 @@ the current copy will be lost.
StdCmdAxisCross
-
+ Toggle axis cross
-
+ Turns on or off the axis cross at the origin
@@ -9109,13 +9109,13 @@ the current copy will be lost.
StdCmdDemoMode
-
+ View turntable...
-
-
+
+ View turntable
@@ -9245,13 +9245,13 @@ the current copy will be lost.
StdCmdDrawStyle
-
+ Draw style
-
+ Change the draw style of the objects
@@ -9438,13 +9438,13 @@ the current copy will be lost.
StdCmdFreezeViews
-
+ Freeze display
-
-
+
+ Freezes the current view position
@@ -9465,13 +9465,13 @@ the current copy will be lost.
StdCmdHideObjects
-
+ Hide all objects
-
+ Hide all objects in the document
@@ -9479,13 +9479,13 @@ the current copy will be lost.
StdCmdHideSelection
-
+ Hide selection
-
+ Hide all selected objects
@@ -9745,13 +9745,13 @@ the current copy will be lost.
StdCmdMeasureDistance
-
+ Measure distance
-
-
+
+ Activate the distance measurement tool
@@ -10150,13 +10150,13 @@ the current copy will be lost.
StdCmdSceneInspector
-
+ Scene inspector...
-
-
+
+ Scene inspector
@@ -10164,13 +10164,13 @@ the current copy will be lost.
StdCmdSelBoundingBox
-
+ &Bounding box
-
-
+
+ Show selection bounding box
@@ -10192,13 +10192,13 @@ the current copy will be lost.
StdCmdSelectVisibleObjects
-
+ Select visible objects
-
+ Select visible objects in the active document
@@ -10220,13 +10220,13 @@ the current copy will be lost.
StdCmdShowObjects
-
+ Show all objects
-
+ Show all objects in the document
@@ -10234,13 +10234,13 @@ the current copy will be lost.
StdCmdShowSelection
-
+ Show selection
-
+ Show all selected objects
@@ -10276,13 +10276,13 @@ the current copy will be lost.
StdCmdTextureMapping
-
+ Texture mapping...
-
-
+
+ Texture mapping
@@ -10318,13 +10318,13 @@ the current copy will be lost.
StdCmdToggleClipPlane
-
+ Clipping plane
-
-
+
+ Toggles clipping plane for active view
@@ -10332,13 +10332,13 @@ the current copy will be lost.
StdCmdToggleNavigation
-
+ Toggle navigation/Edit mode
-
+ Toggle between navigation and edit mode
@@ -10346,13 +10346,13 @@ the current copy will be lost.
StdCmdToggleObjects
-
+ Toggle all objects
-
+ Toggles visibility of all objects in the active document
@@ -10360,13 +10360,13 @@ the current copy will be lost.
StdCmdToggleSelectability
-
+ Toggle selectability
-
+ Toggles the property of the objects to get selected in the 3D-View
@@ -10374,13 +10374,13 @@ the current copy will be lost.
StdCmdToggleVisibility
-
+ Toggle visibility
-
+ Toggles visibility
@@ -10430,13 +10430,13 @@ the current copy will be lost.
StdCmdTreeCollapse
-
+ Collapse selected item
-
-
+
+ Collapse currently selected tree items
@@ -10444,13 +10444,13 @@ the current copy will be lost.
StdCmdTreeExpand
-
+ Expand selected item
-
-
+
+ Expand currently selected tree items
@@ -10458,13 +10458,13 @@ the current copy will be lost.
StdCmdTreeSelectAllInstances
-
+ Select all instances
-
-
+
+ Select all instances of the current selected object
@@ -10472,13 +10472,13 @@ the current copy will be lost.
StdCmdTreeViewActions
-
+ TreeView actions
-
-
+
+ TreeView behavior options and actions
@@ -10542,13 +10542,13 @@ the current copy will be lost.
StdCmdViewBottom
-
+ Bottom
-
-
+
+ Set to bottom view
@@ -10556,13 +10556,13 @@ the current copy will be lost.
StdCmdViewCreate
-
+ Create new view
-
-
+
+ Creates a new view window for the active document
@@ -10570,13 +10570,13 @@ the current copy will be lost.
StdCmdViewDimetric
-
+ Dimetric
-
-
+
+ Set to dimetric view
@@ -10584,13 +10584,13 @@ the current copy will be lost.
StdCmdViewExample1
-
+ Inventor example #1
-
-
+
+ Shows a 3D texture with manipulator
@@ -10598,13 +10598,13 @@ the current copy will be lost.
StdCmdViewExample2
-
+ Inventor example #2
-
-
+
+ Shows spheres and drag-lights
@@ -10612,13 +10612,13 @@ the current copy will be lost.
StdCmdViewExample3
-
+ Inventor example #3
-
-
+
+ Shows a animated texture
@@ -10626,13 +10626,13 @@ the current copy will be lost.
StdCmdViewFitAll
-
+ Fit all
-
-
+
+ Fits the whole content on the screen
@@ -10640,13 +10640,13 @@ the current copy will be lost.
StdCmdViewFitSelection
-
+ Fit selection
-
-
+
+ Fits the selected content on the screen
@@ -10654,13 +10654,13 @@ the current copy will be lost.
StdCmdViewFront
-
+ Front
-
-
+
+ Set to front view
@@ -10668,13 +10668,13 @@ the current copy will be lost.
StdCmdViewHome
-
+ Home
-
-
+
+ Set to default home view
@@ -10682,13 +10682,13 @@ the current copy will be lost.
StdCmdViewIsometric
-
+ Isometric
-
-
+
+ Set to isometric view
@@ -10696,13 +10696,13 @@ the current copy will be lost.
StdCmdViewIvIssueCamPos
-
+ Issue camera position
-
-
+
+ Issue the camera position to the console and to a macro, to easily recall this position
@@ -10710,13 +10710,13 @@ the current copy will be lost.
StdCmdViewIvStereoInterleavedColumns
-
+ Stereo Interleaved Columns
-
-
+
+ Switch stereo viewing to Interleaved Columns
@@ -10724,13 +10724,13 @@ the current copy will be lost.
StdCmdViewIvStereoInterleavedRows
-
+ Stereo Interleaved Rows
-
-
+
+ Switch stereo viewing to Interleaved Rows
@@ -10738,13 +10738,13 @@ the current copy will be lost.
StdCmdViewIvStereoOff
-
+ Stereo Off
-
-
+
+ Switch stereo viewing off
@@ -10752,13 +10752,13 @@ the current copy will be lost.
StdCmdViewIvStereoQuadBuff
-
+ Stereo quad buffer
-
-
+
+ Switch stereo viewing to quad buffer
@@ -10766,13 +10766,13 @@ the current copy will be lost.
StdCmdViewIvStereoRedGreen
-
+ Stereo red/cyan
-
-
+
+ Switch stereo viewing to red/cyan
@@ -10780,13 +10780,13 @@ the current copy will be lost.
StdCmdViewLeft
-
+ Left
-
-
+
+ Set to left view
@@ -10794,13 +10794,13 @@ the current copy will be lost.
StdCmdViewRear
-
+ Rear
-
-
+
+ Set to rear view
@@ -10808,13 +10808,13 @@ the current copy will be lost.
StdCmdViewRestoreCamera
-
+ Restore saved camera
-
+ Restore saved camera settings
@@ -10822,13 +10822,13 @@ the current copy will be lost.
StdCmdViewRight
-
+ Right
-
-
+
+ Set to right view
@@ -10836,13 +10836,13 @@ the current copy will be lost.
StdCmdViewRotateLeft
-
+ Rotate Left
-
-
+
+ Rotate the view by 90° counter-clockwise
@@ -10850,13 +10850,13 @@ the current copy will be lost.
StdCmdViewRotateRight
-
+ Rotate Right
-
-
+
+ Rotate the view by 90° clockwise
@@ -10864,13 +10864,13 @@ the current copy will be lost.
StdCmdViewSaveCamera
-
+ Save current camera
-
+ Save current camera settings
@@ -10878,13 +10878,13 @@ the current copy will be lost.
StdCmdViewTop
-
+ Top
-
-
+
+ Set to top view
@@ -10892,13 +10892,13 @@ the current copy will be lost.
StdCmdViewTrimetric
-
+ Trimetric
-
-
+
+ Set to trimetric view
@@ -10906,13 +10906,13 @@ the current copy will be lost.
StdCmdViewVR
-
+ FreeCAD-VR
-
-
+
+ Extend the FreeCAD 3D Window to a Oculus Rift
@@ -10976,13 +10976,13 @@ the current copy will be lost.
StdMainFullscreen
-
+ Fullscreen
-
-
+
+ Display the main window in fullscreen mode
@@ -10990,13 +10990,13 @@ the current copy will be lost.
StdOrthographicCamera
-
+ Orthographic view
-
-
+
+ Switches to orthographic view mode
@@ -11004,13 +11004,13 @@ the current copy will be lost.
StdPerspectiveCamera
-
+ Perspective view
-
-
+
+ Switches to perspective view mode
@@ -11018,13 +11018,13 @@ the current copy will be lost.
StdRecallWorkingView
-
+ Recall working view
-
-
+
+ Recall previously stored temporary working view
@@ -11032,13 +11032,13 @@ the current copy will be lost.
StdStoreWorkingView
-
+ Store working view
-
-
+
+ Store a document-specific temporary working view
@@ -11046,13 +11046,13 @@ the current copy will be lost.
StdTreeCollapseDocument
-
+ Collapse/Expand
-
-
+
+ Expand active document and collapse all others
@@ -11060,12 +11060,12 @@ the current copy will be lost.
StdTreeDrag
-
+ Initiate dragging
-
+ Initiate dragging of current selected tree items
@@ -11073,13 +11073,13 @@ the current copy will be lost.
StdTreeMultiDocument
-
+ Multi document
-
-
+
+ Display all documents in the tree view
@@ -11087,12 +11087,12 @@ the current copy will be lost.
StdTreePreSelection
-
+ Pre-selection
-
+ Preselect the object in 3D view when mouse over the tree item
@@ -11100,12 +11100,12 @@ the current copy will be lost.
StdTreeRecordSelection
-
+ Record selection
-
+ Record selection in tree view in order to go back/forward using navigation button
@@ -11113,13 +11113,13 @@ the current copy will be lost.
StdTreeSelection
-
+ Go to selection
-
-
+
+ Scroll to first selected item
@@ -11127,13 +11127,13 @@ the current copy will be lost.
StdTreeSingleDocument
-
+ Single document
-
-
+
+ Only display the active document in the tree view
@@ -11141,12 +11141,12 @@ the current copy will be lost.
StdTreeSyncPlacement
-
+ Sync placement
-
+ Auto adjust placement on drag and drop objects across coordinate systems
@@ -11154,12 +11154,12 @@ the current copy will be lost.
StdTreeSyncSelection
-
+ Sync selection
-
+ Auto expand tree item when the corresponding object is selected in 3D view
@@ -11167,12 +11167,12 @@ the current copy will be lost.
StdTreeSyncView
-
+ Sync view
-
+ Auto switch to the 3D view containing the selected item
@@ -11180,13 +11180,13 @@ the current copy will be lost.
StdViewBoxZoom
-
+ Box zoom
-
-
+
+ Activate the box zoom tool
@@ -11194,13 +11194,13 @@ the current copy will be lost.
StdViewDock
-
+ Docked
-
-
+
+ Display the active view either in fullscreen, in undocked or docked mode
@@ -11208,13 +11208,13 @@ the current copy will be lost.
StdViewDockUndockFullscreen
-
+ Document window
-
-
+
+ Display the active view either in fullscreen, in undocked or docked mode
@@ -11222,13 +11222,13 @@ the current copy will be lost.
StdViewFullscreen
-
+ Fullscreen
-
-
+
+ Display the active view either in fullscreen, in undocked or docked mode
@@ -11236,13 +11236,13 @@ the current copy will be lost.
StdViewScreenShot
-
+ Save image...
-
-
+
+ Creates a screenshot of the active view
@@ -11250,13 +11250,13 @@ the current copy will be lost.
StdViewUndock
-
+ Undocked
-
-
+
+ Display the active view either in fullscreen, in undocked or docked mode
@@ -11264,13 +11264,13 @@ the current copy will be lost.
StdViewZoomIn
-
+ Zoom In
-
-
+
+ Increase the zoom factor by a fixed amount
@@ -11278,13 +11278,13 @@ the current copy will be lost.
StdViewZoomOut
-
+ Zoom Out
-
-
+
+ Decrease the zoom factor by a fixed amount
@@ -11316,72 +11316,72 @@ Are you sure you want to continue?
Std_DrawStyle
-
+ As is
-
+ Normal mode
-
+ Points
-
+ Points mode
-
+ Wireframe
-
+ Wireframe mode
-
+ Hidden line
-
+ Hidden line mode
-
+ No shading
-
+ No shading mode
-
+ Shaded
-
+ Shaded mode
-
+ Flat lines
-
+ Flat lines mode
@@ -12133,13 +12133,13 @@ after FreeCAD launches
StdViewLoadImage
-
+ Load image...
-
-
+
+ Loads an image
@@ -12952,12 +12952,12 @@ from Python console to Report view panel
StdCmdSelBack
-
+ Selection back
-
+ Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on.
@@ -12965,12 +12965,12 @@ from Python console to Report view panel
StdCmdSelForward
-
+ Selection forward
-
+ Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on.
@@ -13006,12 +13006,12 @@ from Python console to Report view panel
StdCmdToggleTransparency
-
+ Toggle transparency
-
+ Toggles transparency of the selected objects. You can also fine tune transparency value in the Appearance taskbox (right click an object in the tree, Appearance).
@@ -13019,12 +13019,12 @@ from Python console to Report view panel
StdCmdDockOverlayAll
-
+ Toggle overlay for all
-
+ Toggle overlay mode for all docked windows
@@ -13032,12 +13032,12 @@ from Python console to Report view panel
StdCmdDockOverlayTransparentAll
-
+ Toggle transparent for all
-
+ Toggle transparent mode for all docked overlay windows.
This makes the docked windows stay transparent at all times.
@@ -13046,12 +13046,12 @@ This makes the docked windows stay transparent at all times.
StdCmdDockOverlayToggle
-
+ Toggle overlay
-
+ Toggle overlay mode for the docked window under the cursor
@@ -13059,12 +13059,12 @@ This makes the docked windows stay transparent at all times.
StdCmdDockOverlayToggleTransparent
-
+ Toggle transparent
-
+ Toggle transparent mode for the docked window under cursor.
This makes the docked window stay transparent at all times.
@@ -13073,12 +13073,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayToggleLeft
-
+ Toggle left
-
+ Show/hide left overlay panel
@@ -13086,12 +13086,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayToggleRight
-
+ Toggle right
-
+ Show/hide right overlay panel
@@ -13099,12 +13099,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayToggleTop
-
+ Toggle top
-
+ Show/hide top overlay panel
@@ -13112,12 +13112,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayToggleBottom
-
+ Toggle bottom
-
+ Show/hide bottom overlay panel
@@ -13125,12 +13125,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayMouseTransparent
-
+ Bypass mouse events in docked overlay windows
-
+ Bypass all mouse events in docked overlay windows
@@ -13138,12 +13138,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlay
-
+ Dock window overlay
-
+ Setting docked window overlay mode
@@ -13352,7 +13352,7 @@ the region are non-opaque.
Gui::OverlayTitleBar
-
+ Mouse pass through, ESC to stop
@@ -13428,29 +13428,60 @@ the region are non-opaque.
StdCmdViewGroup
-
+ Standard views
-
+ Change to a standard viewGui::WorkbenchTabWidget
-
-
-
- More
-
- Preferences
+
+ StdCmdMeasure
+
+
+ &Measure
+
+
+
+
+
+ Measure a feature
+
+
+
+
+ Gui::TaskMeasure
+
+
+ Measurement
+
+
+
+
+ Annotate
+
+
+
+
+ Press the Annotate button to add measurement to the document.
+
+
+
+
+ Press the Close button to exit.
+
+
+
diff --git a/src/Gui/Language/FreeCAD_be.ts b/src/Gui/Language/FreeCAD_be.ts
index 2532191cdc..ad2616ec8d 100644
--- a/src/Gui/Language/FreeCAD_be.ts
+++ b/src/Gui/Language/FreeCAD_be.ts
@@ -37,29 +37,29 @@
Візуальны памер аб'екта
-
+ <empty><пусты>
-
-
+
+ AngleВугал
-
-
+
+ AxisВось
-
+ PositionСтановішча
-
+ EnumПералічэнне
@@ -86,12 +86,12 @@
CmdViewMeasureClearAll
-
+ Clear measurementАчысціць замер
-
+ Clear all visible measurementsАчысціць усе бачныя вымярэнні
@@ -99,12 +99,12 @@
CmdViewMeasureToggleAll
-
+ Toggle measurementПераключыць вымярэнне
-
+ Turn on or off the display of all measurementsУключэнне ці выключэнне адлюстравання ўсіх вымярэнняў
@@ -117,7 +117,7 @@
Змяніць
-
+ ImportІмпарт
@@ -210,17 +210,17 @@
Вымярэнне адлегласці
-
+ Toggle visibilityПераключыць бачнасць
-
+ Toggle transparencyПераключыць празрыстасць
-
+ Toggle selectabilityПераключыць магчымасць выбару
@@ -238,7 +238,7 @@
Toggle freeze
- Пераключыць блакаванне
+ Пераключыць замарозку
@@ -2258,17 +2258,17 @@ Specify another directory, please.
Gui::Dialog::DlgPreferences
-
+ PreferencesПеравагі
-
+ ResetСкінуць
-
+ HeaderЗагаловак
@@ -2995,51 +2995,56 @@ bounding box size of the 3D object that is currently displayed.
- Location:
- Месцазнаходжанне:
+ Location (read-only):
+ Location (read-only):
-
+
+ Browse cache directory
+ Browse cache directory
+
+
+ Check periodically at program start:Перыядычна правяраць пры запуску праграмы:
-
+ AlwaysЗаўсёды
-
+ DailyШтодзень
-
+ WeeklyШтотыдзень
-
+ MonthlyШтомесяц
-
+ YearlyШтогод
-
+ NeverНіколі
-
+ Cache size limit:Абмежаванне памеру кэшавання:
-
+ Check now...Праверыць зараз...
@@ -3863,7 +3868,7 @@ You can also use the form: John Doe <john@doe.com>
Gui::Dialog::DlgSettingsNavigation
-
+ NavigationНавігацыя
@@ -3888,139 +3893,134 @@ You can also use the form: John Doe <john@doe.com>
Кут
-
+ Corner where navigation cube is shownКут, у якім паказаны куб навігацыі
-
+ Top leftЗверху злева
-
+ Top rightЗверху справа
-
+ Bottom leftЗнізу злева
-
+ Bottom rightЗнізу справа
-
+ Rotates to nearest possible state when clicking a cube faceПавярнуць да бліжэйшага магчымага стану, калі пстрыкнуць па грані куба
-
+ Rotate to nearestПавярнуць да бліжэйшага
-
- Font name:
- Назва шрыфту:
-
-
-
+ Font name of the navigation cubeНазва шрыфту куба навігацыі
-
+ DefaultПершапачаткова
-
+ Cube sizeПамер куба
-
+ Size of the navigation cubeПамер куба навігацыі
-
+ Opacity when inactiveПразрыстасць, калі стан неактыўны
-
+ Opacity of the navigation cube when not focusedПразрыстасць куб навігацыі, калі ён не сфакусаваны
-
+ ColorКолер
-
+ 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).
@@ -4031,136 +4031,141 @@ 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мм
-
+ AnimationsАнімацыі
-
+ Enable spinning animations that are used in some navigation styles after draggingУключыце анімацыю вярчэння, якая ўжываецца ў некаторых стылях навігацыі пасля перацягвання
-
+ Enable spinning animationsУключыць анімацыю вярчэння
-
+ Duration of navigation animations that have a fixed durationПрацягласць анімацыі навігацыі, якае мае фіксаваную працягласць
-
+ Animation durationПрацягласць анімацыі
-
+ The duration of navigation animations in millisecondsПрацягласць анімацыі навігацыі (у мілісекундах)
-
+ Zoom stepКрок маштабавання
-
+
+ Font name
+ Назва шрыфту
+
+
+ Zoom operations will be performed at position of mouse pointerАперацыі маштабавання будуць выконвацца ў становішчы паказальніка мышы
-
+ Zoom at cursorМаштаб на паказальніку
-
+ 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.
@@ -4169,7 +4174,7 @@ Mouse tilting is not disabled by this setting.
Нахіл мышы гэтай наладай не адключаны.
-
+ Disable touchscreen tilt gestureАдключыць жэст нахілу для сэнсарнага экрану
@@ -6458,7 +6463,7 @@ How do you want to proceed?
Gui::PropertyEditor::LinkLabel
-
+ Change the linked objectЗмяніць звязаны аб'ект
@@ -6466,12 +6471,12 @@ How do you want to proceed?
Gui::PropertyEditor::LinkSelection
-
+ ErrorПамылка
-
+ Object not foundАб'ект не знойдзены
@@ -6872,7 +6877,7 @@ Do you want to specify another directory?
Position
- Становішча
+ Position
@@ -7304,7 +7309,7 @@ Do you want to specify another directory?
Danish
- Danish
+ Дацкая
@@ -7800,35 +7805,35 @@ Do you want to specify another directory?
Python
-
-
-
+
+
+ Unknown filetypeНевядомы тып файла
-
-
+
+ Cannot open unknown filetype: %1Не атрмылася адчыніць невядомы тып файла: %1
-
+ Export failedЭкспартаваць не атрымалася
-
+ Cannot save to unknown filetype: %1Не атрымалася захаваць у невядомым тыпе файла: %1
-
+ Workbench failureПамылка загрузкі варштату
-
+ %1%1
@@ -7981,82 +7986,82 @@ Be aware the point where you click matters.
Памятайце, што кропка, куды вы націскаеце, мае значэнне.
-
-
+
+ Save views...Захаваць выгляды...
-
-
+
+ Load views...Загрузіць выгляды...
-
-
+
+ Freeze viewЗамарозіць выгляд
-
-
+
+ Clear viewsАчысціць выгляды
-
-
-
+
+
+ Restore view &%1Аднавіць выгляд &%1
-
+ Save frozen viewsЗахаваць замарожаныя выгляды
-
-
+
+ Frozen viewsЗамарожаныя выгляды
-
-
+
+ Restore viewsАднавіць выгляды
-
+ Importing the restored views would clear the already stored views.
Do you want to continue?Імпартаванне адноўленых выглядаў прывядзе да ачыстцы ўжо захаваных выглядаў.
Ці жадаеце вы працягнуць?
-
+ Restore frozen viewsАднавіць замарожаныя выгляды
-
+ Cannot open file '%1'.Не атрымалася адчыніць файл '%1'.
-
+ filesфайлы
-
+ Save imageЗахаваць выяву
-
+ Choose an image file to openАбраць файл выявы, каб адчыніць
@@ -8761,7 +8766,7 @@ the current copy will be lost.
-
+ Toggle floating windowПераключыць акно, якое плавае
@@ -8972,14 +8977,9 @@ the current copy will be lost.
Бягучы аб'ект
-
- UnSuppress
- Не хаваць
-
-
-
- Suppress
- Хаваць
+
+ Suppressed
+ Suppressed
@@ -8998,9 +8998,9 @@ the current copy will be lost.
StdBoxElementSelection
-
-
+
+ Box element selectionВобласць выбару элементаў
@@ -9008,13 +9008,13 @@ the current copy will be lost.
StdBoxSelection
-
+ Box selectionВылучыць вобласць
-
-
+
+ Activate the box selection toolЗадзейнічаць інструмент выбару вобласці
@@ -9092,13 +9092,13 @@ the current copy will be lost.
StdCmdAxisCross
-
+ Toggle axis crossПераключыць бачнасць восей каардынат
-
+ Turns on or off the axis cross at the originУключае ці выключае скрыжаванне восей у пачатку каардынат
@@ -9204,13 +9204,13 @@ the current copy will be lost.
StdCmdDemoMode
-
+ View turntable...Паваротны выгляд...
-
-
+
+ View turntableПаваротны выгляд
@@ -9340,13 +9340,13 @@ the current copy will be lost.
StdCmdDrawStyle
-
+ Draw styleСтыль прадстаўлення
-
+ Change the draw style of the objectsЗмяняе стыль прадстаўлення аб'ектаў
@@ -9533,15 +9533,15 @@ the current copy will be lost.
StdCmdFreezeViews
-
+ Freeze display
- Запомніць выгляд
+ Замарозіць выгляд
-
-
+
+ Freezes the current view position
- Запомніць бягучае становішча выгляду
+ Замарозіць бягучае становішча выгляду
@@ -9561,13 +9561,13 @@ the current copy will be lost.
StdCmdHideObjects
-
+ Hide all objectsСхаваць усе аб'екты
-
+ Hide all objects in the documentХавае ўсе аб'екты ў дакуменце
@@ -9575,13 +9575,13 @@ the current copy will be lost.
StdCmdHideSelection
-
+ Hide selectionСхаваць абранае
-
+ Hide all selected objectsХавае ўсе абраныя аб'екты
@@ -9842,13 +9842,13 @@ the current copy will be lost.
StdCmdMeasureDistance
-
+ Measure distanceВымярэнне адлегласці
-
-
+
+ Activate the distance measurement toolЗадзейнічаць інструмент вымярэння адлегласці
@@ -10248,13 +10248,13 @@ the current copy will be lost.
StdCmdSceneInspector
-
+ Scene inspector...Інспектар сцэны...
-
-
+
+ Scene inspectorІнспектар сцэны
@@ -10262,13 +10262,13 @@ the current copy will be lost.
StdCmdSelBoundingBox
-
+ &Bounding box&Габарыты
-
-
+
+ Show selection bounding boxПаказаць габарыты абранага
@@ -10290,13 +10290,13 @@ the current copy will be lost.
StdCmdSelectVisibleObjects
-
+ Select visible objectsАбраць бачныя аб'екты
-
+ Select visible objects in the active documentАбірае бачныя аб'екты ў бягучым дакуменце
@@ -10318,13 +10318,13 @@ the current copy will be lost.
StdCmdShowObjects
-
+ Show all objectsПаказаць усе аб'екты
-
+ Show all objects in the documentПаказвае ўсе аб'екты ў дакуменце
@@ -10332,13 +10332,13 @@ the current copy will be lost.
StdCmdShowSelection
-
+ Show selectionПаказаць абранае
-
+ Show all selected objectsПаказвае ўсе абраныя аб'екты
@@ -10374,13 +10374,13 @@ the current copy will be lost.
StdCmdTextureMapping
-
+ Texture mapping...Супастаўленне тэкстуры...
-
-
+
+ Texture mappingСупастаўленне тэкстуры
@@ -10416,13 +10416,13 @@ the current copy will be lost.
StdCmdToggleClipPlane
-
+ Clipping planeПлоскасць перасеку
-
-
+
+ Toggles clipping plane for active viewПераключыць плоскасць перасеку для бягучага выгляду
@@ -10430,13 +10430,13 @@ the current copy will be lost.
StdCmdToggleNavigation
-
+ Toggle navigation/Edit modeПераключыць навігацыю/рэжым праўкі
-
+ Toggle between navigation and edit modeПераключае паміж навігацыяй і рэжымам праўкі
@@ -10444,13 +10444,13 @@ the current copy will be lost.
StdCmdToggleObjects
-
+ Toggle all objectsПераключыць усе аб'екты
-
+ Toggles visibility of all objects in the active documentПераключае бачнасць усіх аб'ектаў у бягучым дакуменце
@@ -10458,13 +10458,13 @@ the current copy will be lost.
StdCmdToggleSelectability
-
+ Toggle selectabilityПераключыць магчымасць выбару
-
+ Toggles the property of the objects to get selected in the 3D-ViewПераключае ўласцівасць аб'ектаў, якія будуць абраныя ў трохмерным прадстаўленні
@@ -10472,13 +10472,13 @@ the current copy will be lost.
StdCmdToggleVisibility
-
+ Toggle visibilityПераключыць бачнасць
-
+ Toggles visibilityПераключае бачнасць
@@ -10528,13 +10528,13 @@ the current copy will be lost.
StdCmdTreeCollapse
-
+ Collapse selected itemЗгарнуць абраны элемент
-
-
+
+ Collapse currently selected tree itemsЗгортвае бягучыя абраныя элементы дрэва
@@ -10542,13 +10542,13 @@ the current copy will be lost.
StdCmdTreeExpand
-
+ Expand selected itemРазгарнуць абраны элемент
-
-
+
+ Expand currently selected tree itemsРазгортвае бягучыя абраныя элементы дрэва
@@ -10556,13 +10556,13 @@ the current copy will be lost.
StdCmdTreeSelectAllInstances
-
+ Select all instancesАбраць усе асобнікі
-
-
+
+ Select all instances of the current selected objectАбірае ўсе асобнікі бягучага абранага аб'екту
@@ -10570,13 +10570,13 @@ the current copy will be lost.
StdCmdTreeViewActions
-
+ TreeView actionsДзеянні з дрэвам
-
-
+
+ TreeView behavior options and actionsНалады і дзеянні паводзін дрэва
@@ -10640,13 +10640,13 @@ the current copy will be lost.
StdCmdViewBottom
-
+ BottomЗнізу
-
-
+
+ Set to bottom viewЗадаць выгляд знізу
@@ -10654,13 +10654,13 @@ the current copy will be lost.
StdCmdViewCreate
-
+ Create new viewСтварыць новы выгляд
-
-
+
+ Creates a new view window for the active documentСтварае новае акно выгляду для бягучага дакументу
@@ -10668,13 +10668,13 @@ the current copy will be lost.
StdCmdViewDimetric
-
+ DimetricДыметрычны
-
-
+
+ Set to dimetric viewЗадаць дыметрычны выгляд
@@ -10682,13 +10682,13 @@ the current copy will be lost.
StdCmdViewExample1
-
+ Inventor example #1Прыклад Inventor #1
-
-
+
+ Shows a 3D texture with manipulatorПаказвае трохмерную тэкстуру з дапамогай маніпулятара
@@ -10696,13 +10696,13 @@ the current copy will be lost.
StdCmdViewExample2
-
+ Inventor example #2Прыклад Inventor #2
-
-
+
+ Shows spheres and drag-lightsПаказвае сферы і крыніцы свету, якія перацягваюцца
@@ -10710,13 +10710,13 @@ the current copy will be lost.
StdCmdViewExample3
-
+ Inventor example #3Прыклад Inventor #3
-
-
+
+ Shows a animated textureПаказвае анімаваныя тэкстуры
@@ -10724,13 +10724,13 @@ the current copy will be lost.
StdCmdViewFitAll
-
+ Fit allЗапоўніць усё
-
-
+
+ Fits the whole content on the screenЗапаўняе ўвесь змест на экране
@@ -10738,13 +10738,13 @@ the current copy will be lost.
StdCmdViewFitSelection
-
+ Fit selectionЗапоўніць абранае
-
-
+
+ Fits the selected content on the screenЗапаўняе абраны змест на экране
@@ -10752,13 +10752,13 @@ the current copy will be lost.
StdCmdViewFront
-
+ FrontСпераду
-
-
+
+ Set to front viewЗадаць выгляд спераду
@@ -10766,13 +10766,13 @@ the current copy will be lost.
StdCmdViewHome
-
+ HomeПершапачатковы
-
-
+
+ Set to default home viewЗадае першапачатковы выгляд
@@ -10780,13 +10780,13 @@ the current copy will be lost.
StdCmdViewIsometric
-
+ IsometricІзаметрычны
-
-
+
+ Set to isometric viewЗадаць ізаметрычны выгляд
@@ -10794,13 +10794,13 @@ the current copy will be lost.
StdCmdViewIvIssueCamPos
-
+ Issue camera positionВывадзіць становішча камеры
-
-
+
+ Issue the camera position to the console and to a macro, to easily recall this positionВывядзенне становішча камеры на кансоль і ў макрас для лёгкага выкліку становішча
@@ -10808,13 +10808,13 @@ the current copy will be lost.
StdCmdViewIvStereoInterleavedColumns
-
+ Stereo Interleaved ColumnsСтэрэа слупкоў з чаргаваннем
-
-
+
+ Switch stereo viewing to Interleaved ColumnsПераключае стэрэаскапічны выгляд на выгляд слупкоў з чаргаваннем
@@ -10822,13 +10822,13 @@ the current copy will be lost.
StdCmdViewIvStereoInterleavedRows
-
+ Stereo Interleaved RowsСтэрэа радкоў з чаргаваннем
-
-
+
+ Switch stereo viewing to Interleaved RowsПераключае стэрэаскапічны выгляд на выгляд радкоў з чаргаваннем
@@ -10836,13 +10836,13 @@ the current copy will be lost.
StdCmdViewIvStereoOff
-
+ Stereo OffВыключыць стэрэа
-
-
+
+ Switch stereo viewing offВыключае стэрэаскапічны выгляд
@@ -10850,13 +10850,13 @@ the current copy will be lost.
StdCmdViewIvStereoQuadBuff
-
+ Stereo quad bufferЧацвярны буфер стэрэа
-
-
+
+ Switch stereo viewing to quad bufferПераключае стэрэаскапічны выгляд на чацвярны буфер
@@ -10864,13 +10864,13 @@ the current copy will be lost.
StdCmdViewIvStereoRedGreen
-
+ Stereo red/cyanСтэрэа чырвоны/блакітны
-
-
+
+ Switch stereo viewing to red/cyanПераключае стэрэаскапічны выгляд на чырвоны/блакітны рэжым
@@ -10878,13 +10878,13 @@ the current copy will be lost.
StdCmdViewLeft
-
+ LeftЗлева
-
-
+
+ Set to left viewЗадаць выгляд злева
@@ -10892,13 +10892,13 @@ the current copy will be lost.
StdCmdViewRear
-
+ RearЗзаду
-
-
+
+ Set to rear viewЗадаць выгляд сзаду
@@ -10906,13 +10906,13 @@ the current copy will be lost.
StdCmdViewRestoreCamera
-
+ Restore saved cameraАднавіць захаваную камеру
-
+ Restore saved camera settingsАднаўляе захаваныя налады камеры
@@ -10920,13 +10920,13 @@ the current copy will be lost.
StdCmdViewRight
-
+ RightСправа
-
-
+
+ Set to right viewЗадаць выгляд справа
@@ -10934,13 +10934,13 @@ the current copy will be lost.
StdCmdViewRotateLeft
-
+ Rotate LeftПавярнуць улева
-
-
+
+ Rotate the view by 90° counter-clockwiseПавярнуць выгляд на 90 градусаў супраць гадзінніка
@@ -10948,13 +10948,13 @@ the current copy will be lost.
StdCmdViewRotateRight
-
+ Rotate RightПавярнуць управа
-
-
+
+ Rotate the view by 90° clockwiseПавярнуць выгляд на 90 градусаў па гадзінніку
@@ -10962,13 +10962,13 @@ the current copy will be lost.
StdCmdViewSaveCamera
-
+ Save current cameraЗахаваць бягучую камеру
-
+ Save current camera settingsЗахаваць налады бягучай камеры
@@ -10976,13 +10976,13 @@ the current copy will be lost.
StdCmdViewTop
-
+ TopЗверху
-
-
+
+ Set to top viewЗадаць выгляд зверху
@@ -10990,13 +10990,13 @@ the current copy will be lost.
StdCmdViewTrimetric
-
+ TrimetricТрыметрычны
-
-
+
+ Set to trimetric viewЗадаць трыметрычны выгляд
@@ -11004,13 +11004,13 @@ the current copy will be lost.
StdCmdViewVR
-
+ FreeCAD-VRFreeCAD-VR
-
-
+
+ Extend the FreeCAD 3D Window to a Oculus RiftПашырае трохмернае акно FreeCAD у Oculus Rift
@@ -11074,13 +11074,13 @@ the current copy will be lost.
StdMainFullscreen
-
+ FullscreenПоўнаэкранны
-
-
+
+ Display the main window in fullscreen modeАдлюстраваць галоўнае акно ў поўнаэкранным рэжыме
@@ -11088,13 +11088,13 @@ the current copy will be lost.
StdOrthographicCamera
-
+ Orthographic viewАртаганальны выгляд
-
-
+
+ Switches to orthographic view modeПераключае ў рэжыма артаганальнага выгляду
@@ -11102,13 +11102,13 @@ the current copy will be lost.
StdPerspectiveCamera
-
+ Perspective viewПерспектыўны выгляд
-
-
+
+ Switches to perspective view modeПераключае ў перспектыўны выгляд
@@ -11116,13 +11116,13 @@ the current copy will be lost.
StdRecallWorkingView
-
+ Recall working viewВыклікаць працоўны выгляд
-
-
+
+ Recall previously stored temporary working viewВыклікае раней захаваны часовы працоўны выгляд
@@ -11130,13 +11130,13 @@ the current copy will be lost.
StdStoreWorkingView
-
+ Store working viewЗапомніць працоўны выгляд
-
-
+
+ Store a document-specific temporary working viewЗапамінае часовы працоўны выгляд для дакумента
@@ -11144,13 +11144,13 @@ the current copy will be lost.
StdTreeCollapseDocument
-
+ Collapse/ExpandЗгарнуць/Разгарнуць
-
-
+
+ Expand active document and collapse all othersРазгортвае бягучы дакумент і згортвае ўсе астатнія
@@ -11158,12 +11158,12 @@ the current copy will be lost.
StdTreeDrag
-
+ Initiate draggingРаспачаць перацягванне
-
+ Initiate dragging of current selected tree itemsРаспачынае перацягвання бягучых абраных элементаў дрэва
@@ -11171,13 +11171,13 @@ the current copy will be lost.
StdTreeMultiDocument
-
+ Multi documentШматкампанентны дакумент
-
-
+
+ Display all documents in the tree viewАдлюстраваць усе дакументы ў праглядзе дрэва
@@ -11185,12 +11185,12 @@ the current copy will be lost.
StdTreePreSelection
-
+ Pre-selectionПапярэдні выбар
-
+ Preselect the object in 3D view when mouse over the tree itemПапярэдне абраць аб'ект у трохмерным прадстаўленні, калі паказальнік мышы наведзены на элемент дрэва
@@ -11198,12 +11198,12 @@ the current copy will be lost.
StdTreeRecordSelection
-
+ Record selectionЗапісаць абранае
-
+ Record selection in tree view in order to go back/forward using navigation buttonВыбар запісу ў праглядзе дрэва, для пераходу назад/уперад з дапамогай кнопкі навігацыі
@@ -11211,13 +11211,13 @@ the current copy will be lost.
StdTreeSelection
-
+ Go to selectionІсці да выбару
-
-
+
+ Scroll to first selected itemПракруціць да першага абранага элемента
@@ -11225,13 +11225,13 @@ the current copy will be lost.
StdTreeSingleDocument
-
+ Single documentАдзінкавы дакумент
-
-
+
+ Only display the active document in the tree viewАдлюстраваць толькі бягучы дакумент у праглядзе дрэва
@@ -11239,12 +11239,12 @@ the current copy will be lost.
StdTreeSyncPlacement
-
+ Sync placementСінхранізаваць размяшчэнне
-
+ Auto adjust placement on drag and drop objects across coordinate systemsАўтаматычная налада размяшчэння пры перацягванні аб'ектаў у розных сістэмах каардынатаў
@@ -11252,12 +11252,12 @@ the current copy will be lost.
StdTreeSyncSelection
-
+ Sync selectionСінхранізаваць абранае
-
+ Auto expand tree item when the corresponding object is selected in 3D viewАўтаматычнае разгортванне элемента дрэва, калі абраны адпаведны аб'ект у трохмерным прадстаўленні
@@ -11265,12 +11265,12 @@ the current copy will be lost.
StdTreeSyncView
-
+ Sync viewСінхранізаваць выгляд
-
+ Auto switch to the 3D view containing the selected itemАўтаматычнае пераключэнне на трохмернае прадстаўленне, якое змяшчае абраны элемент
@@ -11278,13 +11278,13 @@ the current copy will be lost.
StdViewBoxZoom
-
+ Box zoomПавялічыць вобласць
-
-
+
+ Activate the box zoom toolЗадзейнічаць інструмент выбару маштабавання
@@ -11292,13 +11292,13 @@ the current copy will be lost.
StdViewDock
-
+ DockedПрымацаваны
-
-
+
+ Display the active view either in fullscreen, in undocked or docked modeАдлюстроўваць бягучы выгляд альбо ў поўнаэкранным рэжыме, альбо ў адмацаваным ці прымацаваным рэжыме
@@ -11306,13 +11306,13 @@ the current copy will be lost.
StdViewDockUndockFullscreen
-
+ Document windowАкно дакумента
-
-
+
+ Display the active view either in fullscreen, in undocked or docked modeАдлюстроўваць бягучы выгляд альбо ў поўнаэкранным рэжыме, альбо ў адмацаваным ці прымацаваным рэжыме
@@ -11320,13 +11320,13 @@ the current copy will be lost.
StdViewFullscreen
-
+ FullscreenПоўнаэкранны
-
-
+
+ Display the active view either in fullscreen, in undocked or docked modeАдлюстроўваць бягучы выгляд альбо ў поўнаэкранным рэжыме, альбо ў адмацаваным ці прымацаваным рэжыме
@@ -11334,13 +11334,13 @@ the current copy will be lost.
StdViewScreenShot
-
+ Save image...Захаваць выяву...
-
-
+
+ Creates a screenshot of the active viewСтварае здымак экрана бягучага выгляду
@@ -11348,13 +11348,13 @@ the current copy will be lost.
StdViewUndock
-
+ UndockedАдмацаваны
-
-
+
+ Display the active view either in fullscreen, in undocked or docked modeАдлюстроўваць бягучы выгляд альбо ў поўнаэкранным рэжыме, альбо ў адмацаваным ці прымацаваным рэжыме
@@ -11362,13 +11362,13 @@ the current copy will be lost.
StdViewZoomIn
-
+ Zoom InПавялічыць
-
-
+
+ Increase the zoom factor by a fixed amountПавялічыць каэфіцыент маштабавання на фіксаваную велічыню
@@ -11376,13 +11376,13 @@ the current copy will be lost.
StdViewZoomOut
-
+ Zoom OutПаменшыць
-
-
+
+ Decrease the zoom factor by a fixed amountПаменшыць каэфіцыент маштабавання на фіксаваную велічыню
@@ -11417,72 +11417,72 @@ Are you sure you want to continue?
Std_DrawStyle
-
+ As isЯк ёсць
-
+ Normal modeЗвычайны рэжым
-
+ PointsКропкі
-
+ Points modeКропкавы рэжым
-
+ WireframeКаркас
-
+ Wireframe modeКаркасны рэжым
-
+ Hidden lineСхаваныя лініі
-
+ Hidden line modeРэжым схаваных ліній
-
+ No shadingБез зацянення
-
+ No shading modeРэжым без зацянення
-
+ ShadedЗаценены
-
+ Shaded modeРэжым заценены
-
+ Flat linesПлоскія лініі
-
+ Flat lines modeРэжым плоскіх ліній
@@ -12244,13 +12244,13 @@ after FreeCAD launches
StdViewLoadImage
-
+ Load image...Загрузіць выяву...
-
-
+
+ Loads an imageЗагрузка выявы
@@ -13079,12 +13079,12 @@ from Python console to Report view panel
StdCmdSelBack
-
+ Selection backАдмяніць выбар
-
+ Restore the previous Tree view selection. Only works if Tree RecordSelection mode is switched on.Аднавіць папярэдні выбар у праглядзе дрэва.
Працуе толькі калі ўключаны рэжым захавання выбару ў дрэве.
@@ -13093,12 +13093,12 @@ from Python console to Report view panel
StdCmdSelForward
-
+ Selection forwardПаўтарыць выбар
-
+ Restore the next Tree view selection. Only works if Tree RecordSelection mode is switched on.Аднавіць наступны выбар у праглядзе дрэва.
Працуе толькі калі ўключаны рэжым захавання выбару ў дрэве.
@@ -13135,12 +13135,12 @@ from Python console to Report view panel
StdCmdToggleTransparency
-
+ Toggle transparencyПераключыць празрыстасць
-
+ Toggles transparency of the selected objects. You can also fine tune transparency value in the Appearance taskbox (right click an object in the tree, Appearance).Пераключыць празрыстасць абраных аб'ектаў.
Вы таксама можаце дакладна наладзіць значэнне празрыстасці ў панэлі задач Знешні выгляд (пстрыкніце <правай кнопкай мышы> па аб'екту ў дрэве Знешні выгляд).
@@ -13149,12 +13149,12 @@ from Python console to Report view panel
StdCmdDockOverlayAll
-
+ Toggle overlay for allПераключыць накладанне для ўсіх
-
+ Toggle overlay mode for all docked windowsПераключыць рэжым накладання для ўсіх прымацаваных вокнаў
@@ -13162,12 +13162,12 @@ from Python console to Report view panel
StdCmdDockOverlayTransparentAll
-
+ Toggle transparent for allПераключыць празрыстасць для ўсіх
-
+ Toggle transparent mode for all docked overlay windows.
This makes the docked windows stay transparent at all times.Пераключыць рэжым празрыстасці для ўсіх прымацаваных вокнаў накладання.
@@ -13177,12 +13177,12 @@ This makes the docked windows stay transparent at all times.
StdCmdDockOverlayToggle
-
+ Toggle overlayПераключыць накладанне
-
+ Toggle overlay mode for the docked window under the cursorПераключыць рэжым накладання для прымацаванага акна пад курсорам
@@ -13190,12 +13190,12 @@ This makes the docked windows stay transparent at all times.
StdCmdDockOverlayToggleTransparent
-
+ Toggle transparentПераключыць празрыстасць
-
+ Toggle transparent mode for the docked window under cursor.
This makes the docked window stay transparent at all times.Пераключыць рэжым празрыстасці для прымацаванага акна пад курсорам.
@@ -13205,12 +13205,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayToggleLeft
-
+ Toggle leftПераключыць злева
-
+ Show/hide left overlay panelПаказаць / схаваць панэль накладання злева
@@ -13218,12 +13218,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayToggleRight
-
+ Toggle rightПераключыць справа
-
+ Show/hide right overlay panelПаказаць / схаваць панэль накладання справа
@@ -13231,12 +13231,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayToggleTop
-
+ Toggle topПераключыць зверху
-
+ Show/hide top overlay panelПаказаць / схаваць панэль накладання зверху
@@ -13244,12 +13244,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayToggleBottom
-
+ Toggle bottomПераключыць знізу
-
+ Show/hide bottom overlay panelПаказаць / схаваць панэль накладання знізу
@@ -13257,12 +13257,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlayMouseTransparent
-
+ Bypass mouse events in docked overlay windowsАбыход падзей мышы ў прымацаваных вокнах накладання
-
+ Bypass all mouse events in docked overlay windowsАбыход усіх падзей мышы ў прымацаваных вокнах накладання
@@ -13270,12 +13270,12 @@ This makes the docked window stay transparent at all times.
StdCmdDockOverlay
-
+ Dock window overlayНакладанне прымацаванага акна
-
+ Setting docked window overlay modeЗадаць рэжым накладання прымацаванага акна
@@ -13491,7 +13491,7 @@ the region are non-opaque.
Gui::OverlayTitleBar
-
+ Mouse pass through, ESC to stopМыш пераходзіць, <Esc> каб спыніць
@@ -13556,40 +13556,72 @@ the region are non-opaque.
Toggle freeze
- Пераключыць блакаванне
+ Пераключыць замарозкуToggles freeze state of the selected objects. A frozen object is not recomputed when its parents change.
- Toggles freeze state of the selected objects. A frozen object is not recomputed when its parents change.
+ Перамыкае стан замарозкі абраных аб'ектаў.
+Замарожаны аб'ект не пералічваецца пры змене яго бацькоўскіх аб'ектаў.StdCmdViewGroup
-
+ Standard viewsСтандартныя выгляды
-
+ Change to a standard viewЗмяніць на стандартны выглядGui::WorkbenchTabWidget
-
-
-
- More
- Яшчэ
- PreferencesПеравагі
+
+ StdCmdMeasure
+
+
+ &Measure
+ &Measure
+
+
+
+
+ Measure a feature
+ Measure a feature
+
+
+
+ Gui::TaskMeasure
+
+
+ Measurement
+ Measurement
+
+
+
+ Annotate
+ Annotate
+
+
+
+ Press the Annotate button to add measurement to the document.
+ Press the Annotate button to add measurement to the document.
+
+
+
+ Press the Close button to exit.
+ Press the Close button to exit.
+
+
diff --git a/src/Gui/Language/FreeCAD_ca.ts b/src/Gui/Language/FreeCAD_ca.ts
index 331f28793b..1fbc0f9180 100644
--- a/src/Gui/Language/FreeCAD_ca.ts
+++ b/src/Gui/Language/FreeCAD_ca.ts
@@ -37,29 +37,29 @@
Mida visual de la característica
-
+ <empty><buit>
-
-
+
+ AngleAngle
-
-
+
+ AxisEix
-
+ PositionPosition
-
+ EnumEnum
@@ -86,12 +86,12 @@
CmdViewMeasureClearAll
-
+ Clear measurementEsborra la mesura
-
+ Clear all visible measurementsEsborra tots els mesuraments visibles
@@ -99,12 +99,12 @@
CmdViewMeasureToggleAll
-
+ Toggle measurementCommuta el mesurament
-
+ Turn on or off the display of all measurementsConnecta o desconnecta la pantalla de tots els mesuraments
@@ -117,7 +117,7 @@
Edita
-
+ ImportImporta
@@ -210,17 +210,17 @@
Mesura la distància
-
+ Toggle visibilityCommuta la visibilitat
-
+ Toggle transparencyToggle transparency
-
+ Toggle selectabilityCommuta la selectivitat
@@ -2254,17 +2254,17 @@ Specify another directory, please.
Gui::Dialog::DlgPreferences
-
+ PreferencesPreferències
-
+ ResetReinicia
-
+ HeaderEncapçalament
@@ -3000,51 +3000,56 @@ mida de la caixa contenidora de l'objecte 3D que es mostra actualment.
- Location:
- Ubicació:
+ Location (read-only):
+ Location (read-only):
-
+
+ Browse cache directory
+ Browse cache directory
+
+
+ Check periodically at program start:Comprova periòdicament a l'inici del programa:
-
+ AlwaysSempre
-
+ DailyDiàriament
-
+ WeeklySetmanalment
-
+ MonthlyMensualment
-
+ YearlyAnualment
-
+ NeverMai
-
+ Cache size limit:Límit de la mida de la memòria cau:
-
+ Check now...Comprova ara...
@@ -3873,7 +3878,7 @@ També podeu utilitzar la forma: Joan Peris <joan@peris.com>
Gui::Dialog::DlgSettingsNavigation
-
+ NavigationNavegació
@@ -3898,139 +3903,134 @@ També podeu utilitzar la forma: Joan Peris <joan@peris.com>
Cantonada
-
+ Corner where navigation cube is shownCantonada on es mostra el cub de navegació
-
+ Top leftSuperior esquerra
-
+ Top rightSuperior dreta
-
+ Bottom leftInferior esquerra
-
+ Bottom rightInferior dreta
-
+ Rotates to nearest possible state when clicking a cube faceGira a l'estat més proper possible quan es fa clic en una cara del cub
-
+ Rotate to nearestRotar fins al més proper
-
- Font name:
- Nom del tipus de lletra:
-
-
-
+ Font name of the navigation cubeNom de la font del cub de navegació
-
+ DefaultPer defecte
-
+ Cube sizeMida del cub
-
+ Size of the navigation cubeMida del cub de navegació
-
+ Opacity when inactiveOpacity when inactive
-
+ Opacity of the navigation cube when not focusedOpacity of the navigation cube when not focused
-
+ ColorColor
-
+ Base color for all elementsColor base per tots els elements
-
+ Rotation center indicatorRotation center indicator
-
+ Sphere sizeSphere size
-
+ Color and transparencyColor and transparency
-
+ The size of the rotation center indicatorThe size of the rotation center indicator
-
+ The color of the rotation center indicatorThe color of the rotation center indicator
-
+ 3D NavigationNavegació 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 setConjunt de configuracions de navegació
-
+ Orbit styleEstil 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).
@@ -4041,143 +4041,148 @@ 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.
-
+ TurntableTorn
-
+ TrackballRatolí de bola
-
+ Free TurntablePlataforma giratòria lliure
-
+ Rotation modeMode de rotació
-
+ Rotations in 3D will use current cursor position as center for rotationLes rotacions en 3D utilitzaran la posició actual del cursor com a centre de rotació
-
+ Window centerCentre de la finestra
-
+ Drag at cursorArrossega al cursor
-
+ Object centerCentre de l'objecte
-
+ Default camera orientationOrientació de la càmera per defecte
-
+ Default camera orientation when creating a new document or selecting the home viewOrientació de la càmera per defecte en crear un nou document o en seleccionar la vista inicial
-
+ Camera zoomZoom 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.
-
+ mmmm
-
+ AnimationsAnimations
-
+ Enable spinning animations that are used in some navigation styles after draggingEnable spinning animations that are used in some navigation styles after dragging
-
+ Enable spinning animationsEnable spinning animations
-
+ Duration of navigation animations that have a fixed durationDuration of navigation animations that have a fixed duration
-
+ Animation durationAnimation duration
-
+ The duration of navigation animations in millisecondsThe duration of navigation animations in milliseconds
-
+ Zoom stepZoom step
-
+
+ Font name
+ Nom del tipus de lletra
+
+
+ Zoom operations will be performed at position of mouse pointerLes operacions del zoom es realitzaran en la posició del punter del ratolí
-
+ Zoom at cursorZoom al cursor
-
+ 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 invertedLa direcció de les operacions de zoom s’invertirà
-
+ Invert zoomInvertix 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 gestureDesactiva el gest d'inclinació de la pantalla tàctil
@@ -6452,7 +6457,7 @@ How do you want to proceed?
Gui::PropertyEditor::LinkLabel
-
+ Change the linked objectCanvia l'objecte enllaçat
@@ -6460,12 +6465,12 @@ How do you want to proceed?
Gui::PropertyEditor::LinkSelection
-
+ ErrorError
-
+ Object not foundNo s'ha trobat l'objecte.
@@ -7789,35 +7794,35 @@ Do you want to specify another directory?
Python
-
-
-
+
+
+ Unknown filetypeEl tipus de fitxer és desconegut.
-
-
+
+ Cannot open unknown filetype: %1No es pot obrir el tipus de fitxer desconegut: %1
-
+ Export failedExportació fallida
-
+ Cannot save to unknown filetype: %1No es pot desar el tipus de fitxer desconegut: %1
-
+ Workbench failureFallada del banc de treball
-
+ %1%1
@@ -7966,81 +7971,81 @@ Be aware the point where you click matters.
Seleccioneu dos objectes. Tingueu en compte el punt on cliqueu.
-
-
+
+ Save views...Desa les visualitzacions...
-
-
+
+ Load views...Carrega les visualitzacions...
-
-
+
+ Freeze viewCongela les visualitzacions
-
-
+
+ Clear viewsNeteja les visualitzacions
-
-
-
+
+
+ Restore view &%1Restaura la visualització &%1
-
+ Save frozen viewsDesa les visualitzacions congelades
-
-
+
+ Frozen viewsVisualitzacions congelades
-
-
+
+ Restore viewsRestaura les visualitzacions
-
+ Importing the restored views would clear the already stored views.
Do you want to continue?La importació de les visualitzacions restaurades netejarà les visualitzacions ja emmagatzemades. Voleu continuar?
-
+ Restore frozen viewsRestaura les visualitzacions congelades
-
+ Cannot open file '%1'.No es pot obrir el fitxer '%1'.
-
+ filesfitxers
-
+ Save imageDesa imatge
-
+ Choose an image file to openTrieu un fitxer d'imatge per obrir
@@ -8746,7 +8751,7 @@ la còpia actual es perdrà.
-
+ Toggle floating windowToggle floating window
@@ -8957,14 +8962,9 @@ la còpia actual es perdrà.
Active object
-
- UnSuppress
- UnSuppress
-
-
-
- Suppress
- Suppress
+
+ Suppressed
+ Suppressed
@@ -8983,9 +8983,9 @@ la còpia actual es perdrà.
StdBoxElementSelection
-
-
+
+ Box element selectionSelecció d'elements de la caixa
@@ -8993,13 +8993,13 @@ la còpia actual es perdrà.
StdBoxSelection
-
+ Box selectionQuadre de selecció
-
-
+
+ Activate the box selection toolActiva l'eina de selecció de caixa
@@ -9077,13 +9077,13 @@ la còpia actual es perdrà.
StdCmdAxisCross
-
+ Toggle axis crossActiva/desactiva els eixos de coordenades
-
+ Turns on or off the axis cross at the originCommuta actiu o no actiu la creu d'eixos a l'origen
@@ -9189,13 +9189,13 @@ la còpia actual es perdrà.
StdCmdDemoMode
-
+ View turntable...Visualitza en rotació...
-
-
+
+ View turntableVisualitza en rotació
@@ -9325,13 +9325,13 @@ la còpia actual es perdrà.
StdCmdDrawStyle
-
+ Draw styleEstil de dibuix
-
+ Change the draw style of the objectsCanviar estil de dibuix dels objectes
@@ -9518,13 +9518,13 @@ la còpia actual es perdrà.
StdCmdFreezeViews
-
+ Freeze displayCongela la visualització
-
-
+
+ Freezes the current view positionCongela la posició de la vista actual
@@ -9545,13 +9545,13 @@ la còpia actual es perdrà.
StdCmdHideObjects
-
+ Hide all objectsOculta tots els objectes
-
+ Hide all objects in the documentOculta tots els objectes en el document
@@ -9559,13 +9559,13 @@ la còpia actual es perdrà.
StdCmdHideSelection
-
+ Hide selectionOculta la selecció
-
+ Hide all selected objectsOculta tots els objectes seleccionats
@@ -9825,13 +9825,13 @@ la còpia actual es perdrà.
StdCmdMeasureDistance
-
+ Measure distanceMesura la distància
-
-
+
+ Activate the distance measurement toolActiva l'eina de mesurament de distància
@@ -10230,13 +10230,13 @@ la còpia actual es perdrà.
StdCmdSceneInspector
-
+ Scene inspector...Inspector d'escena...
-
-
+
+ Scene inspectorInspector d'escena
@@ -10244,13 +10244,13 @@ la còpia actual es perdrà.
StdCmdSelBoundingBox
-
+ &Bounding box&Caixa contenidora
-
-
+
+ Show selection bounding boxMostra la caixa contenidora de la selecció
@@ -10272,13 +10272,13 @@ la còpia actual es perdrà.
StdCmdSelectVisibleObjects
-
+ Select visible objectsSeleccioneu objectes visibles
-
+ Select visible objects in the active documentSeleccioneu objectes visibles en el document actiu
@@ -10300,13 +10300,13 @@ la còpia actual es perdrà.
StdCmdShowObjects
-
+ Show all objectsMostra tots els objectes
-
+ Show all objects in the documentMostra tots els objectes en el document
@@ -10314,13 +10314,13 @@ la còpia actual es perdrà.
StdCmdShowSelection
-
+ Show selectionMostra la selecció
-
+ Show all selected objectsMostra tots els objectes seleccionats
@@ -10356,13 +10356,13 @@ la còpia actual es perdrà.
StdCmdTextureMapping
-
+ Texture mapping...Mapatge de textura...
-
-
+
+ Texture mappingMapatge de textura
@@ -10398,13 +10398,13 @@ la còpia actual es perdrà.
StdCmdToggleClipPlane
-
+ Clipping planePla de retallada
-
-
+
+ Toggles clipping plane for active viewCommuta el pla de retallada per a la vista activa
@@ -10412,13 +10412,13 @@ la còpia actual es perdrà.
StdCmdToggleNavigation
-
+ Toggle navigation/Edit modeCommuta el mode navegació i edició
-
+ Toggle between navigation and edit modeCommuta entre el mode de navegació i d'edició
@@ -10426,13 +10426,13 @@ la còpia actual es perdrà.
StdCmdToggleObjects
-
+ Toggle all objectsCommuta tots els objectes
-
+ Toggles visibility of all objects in the active documentCommuta la visibilitat de tots els objectes en el document actiu
@@ -10440,13 +10440,13 @@ la còpia actual es perdrà.
StdCmdToggleSelectability
-
+ Toggle selectabilityCommuta la selectivitat
-
+ Toggles the property of the objects to get selected in the 3D-ViewCommuta la propietat dels objectes de ser seleccionats en la vista 3D
@@ -10454,13 +10454,13 @@ la còpia actual es perdrà.
StdCmdToggleVisibility
-
+ Toggle visibilityCommuta la visibilitat
-
+ Toggles visibilityCommuta la visibilitat
@@ -10510,13 +10510,13 @@ la còpia actual es perdrà.
StdCmdTreeCollapse
-
+ Collapse selected itemContrau l'element seleccionat
-
-
+
+ Collapse currently selected tree itemsContrau els elements d'arbre seleccionats actualment
@@ -10524,13 +10524,13 @@ la còpia actual es perdrà.
StdCmdTreeExpand
-
+ Expand selected itemExpandeix l'element seleccionat
-
-
+
+ Expand currently selected tree itemsExpandeix els elements d'arbre seleccionats actualment
@@ -10538,13 +10538,13 @@ la còpia actual es perdrà.
StdCmdTreeSelectAllInstances
-
+ Select all instancesSelecciona totes les instàncies
-
-
+
+ Select all instances of the current selected objectSelecciona totes les instàncies de l'objecte seleccionat actualment
@@ -10552,13 +10552,13 @@ la còpia actual es perdrà.
StdCmdTreeViewActions
-
+ TreeView actionsAccions de la vista d'arbre
-
-
+
+ TreeView behavior options and actionsOpcions i accions del comportament de la vista d'arbre
@@ -10622,13 +10622,13 @@ la còpia actual es perdrà.
StdCmdViewBottom
-
+ BottomInferior
-
-
+
+ Set to bottom viewEstableix la vista inferior
@@ -10636,13 +10636,13 @@ la còpia actual es perdrà.
StdCmdViewCreate
-
+ Create new viewCrea una visualització nova
-
-
+
+ Creates a new view window for the active documentCrea una nova finestra de visualització per al document actiu
@@ -10650,13 +10650,13 @@ la còpia actual es perdrà.
StdCmdViewDimetric
-
+ DimetricDimètric
-
-
+
+ Set to dimetric viewEstableix la vista dimètrica
@@ -10664,13 +10664,13 @@ la còpia actual es perdrà.
StdCmdViewExample1
-
+ Inventor example #1Inventor exemple #1
-
-
+
+ Shows a 3D texture with manipulatorMostra una textura 3D amb manipulació
@@ -10678,13 +10678,13 @@ la còpia actual es perdrà.
StdCmdViewExample2
-
+ Inventor example #2Inventor exemple #2
-
-
+
+ Shows spheres and drag-lightsMostra esferes i llums desplaçables
@@ -10692,13 +10692,13 @@ la còpia actual es perdrà.
StdCmdViewExample3
-
+ Inventor example #3Inventor exemple #3
-
-
+
+ Shows a animated textureMostra una textura animada
@@ -10706,13 +10706,13 @@ la còpia actual es perdrà.
StdCmdViewFitAll
-
+ Fit allAjusta-ho tot
-
-
+
+ Fits the whole content on the screenAjusta el contingut complet a la pantalla
@@ -10720,13 +10720,13 @@ la còpia actual es perdrà.
StdCmdViewFitSelection
-
+ Fit selectionAjusta la selecció
-
-
+
+ Fits the selected content on the screenAjusta el contingut seleccionat a la pantalla
@@ -10734,13 +10734,13 @@ la còpia actual es perdrà.
StdCmdViewFront
-
+ FrontAlçat
-
-
+
+ Set to front viewEstableix la vista en alçat
@@ -10748,13 +10748,13 @@ la còpia actual es perdrà.
StdCmdViewHome
-