diff --git a/src/Mod/Arch/ArchMaterial.py b/src/Mod/Arch/ArchMaterial.py
index b7e6322c36..da2026b195 100644
--- a/src/Mod/Arch/ArchMaterial.py
+++ b/src/Mod/Arch/ArchMaterial.py
@@ -403,7 +403,7 @@ class _ViewProviderArchMaterial:
def claimChildren(self):
ch = []
if hasattr(self,"Object"):
- for o in FreeCAD.ActiveDocument.Objects:
+ for o in self.Object.Document.Objects:
if o.isDerivedFrom("App::MaterialObject"):
if o.Material:
if "Father" in o.Material:
diff --git a/src/Mod/Arch/ArchPanel.py b/src/Mod/Arch/ArchPanel.py
index ec124419d4..15e8da8e26 100644
--- a/src/Mod/Arch/ArchPanel.py
+++ b/src/Mod/Arch/ArchPanel.py
@@ -932,7 +932,7 @@ class PanelCut(Draft._DraftObject):
obj.addProperty("App::PropertyLength","TagSize","PanelCut",QT_TRANSLATE_NOOP("App::Property","The size of the tag text"))
obj.TagSize = 10
if not "TagPosition" in pl:
- obj.addProperty("App::PropertyVector","TagPosition","PanelCut",QT_TRANSLATE_NOOP("App::Property","The position of the tag text. Keep (0,0,0) for automatic center position"))
+ obj.addProperty("App::PropertyVector","TagPosition","PanelCut",QT_TRANSLATE_NOOP("App::Property","The position of the tag text. Keep (0,0,0) for center position"))
if not "TagRotation" in pl:
obj.addProperty("App::PropertyAngle","TagRotation","PanelCut",QT_TRANSLATE_NOOP("App::Property","The rotation of the tag text"))
if not "FontFile" in pl:
diff --git a/src/Mod/Arch/ArchStairs.py b/src/Mod/Arch/ArchStairs.py
index 8db4eaf11c..c050a44945 100644
--- a/src/Mod/Arch/ArchStairs.py
+++ b/src/Mod/Arch/ArchStairs.py
@@ -356,7 +356,7 @@ class _Stairs(ArchComponent.Component):
# TODO - To be combined into Width when PropertyLengthList is available
if not "WidthOfLanding" in pl:
- obj.addProperty("App::PropertyFloatList","WidthOfLanding","Stairs",QT_TRANSLATE_NOOP("App::Property","The width of a Landing (Second edge and after - First edge follows Width property"))
+ obj.addProperty("App::PropertyFloatList","WidthOfLanding","Stairs",QT_TRANSLATE_NOOP("App::Property","The width of a Landing (Second edge and after - First edge follows Width property)"))
# steps properties
if not "NumberOfSteps" in pl:
diff --git a/src/Mod/Arch/Resources/ui/DialogBimServerLogin.ui b/src/Mod/Arch/Resources/ui/DialogBimServerLogin.ui
index 42efe4aa54..a1676cacaf 100644
--- a/src/Mod/Arch/Resources/ui/DialogBimServerLogin.ui
+++ b/src/Mod/Arch/Resources/ui/DialogBimServerLogin.ui
@@ -19,7 +19,7 @@
-
- Bim server URL:
+ BimServer URL:
@@ -59,7 +59,7 @@
-
- Keep me logged across FreeCAD sessions
+ Keep me logged in across FreeCAD sessions
diff --git a/src/Mod/Start/Gui/DlgStartPreferences.ui b/src/Mod/Start/Gui/DlgStartPreferences.ui
index f429e074ce..171ce44857 100644
--- a/src/Mod/Start/Gui/DlgStartPreferences.ui
+++ b/src/Mod/Start/Gui/DlgStartPreferences.ui
@@ -607,7 +607,7 @@
-
- Close & switch on file open
+ Close & switch on opening file
diff --git a/src/Mod/Start/StartPage/TranslationTexts.py b/src/Mod/Start/StartPage/TranslationTexts.py
index e7f5a3ae9b..20adb74090 100644
--- a/src/Mod/Start/StartPage/TranslationTexts.py
+++ b/src/Mod/Start/StartPage/TranslationTexts.py
@@ -69,7 +69,7 @@ T_OFFLINEPLACEHOLDER = translate("StartPage", "Cannot fetch information from Git
T_RECENTCOMMITS = translate("StartPage", "Recent commits")
T_DESCR_RECENTCOMMITS = translate("StartPage", "Below are the latest changes added to the FreeCAD source code. These changes might not reflect yet in the FreeCAD version that you are currently running. Check the available options if you wish to obtain a development version.")
T_SEEONGITHUB = translate("StartPage", "See all commits on github")
-T_CUSTOM = translate("StartPage", "You can configure a custom folder to display here in menu Edit -> Preferences -> Start -> Custom folder")
+T_CUSTOM = translate("StartPage", "You can configure a custom folder to display here in menu Edit -> Preferences -> Start -> Show additional folder")
T_VERSION = translate("StartPage", "version")
T_BUILD = translate("StartPage", "build")
T_CREATENEW = translate("StartPage", "Create new...")
diff --git a/src/Mod/Web/Gui/Resources/Web.qrc b/src/Mod/Web/Gui/Resources/Web.qrc
index 325bc3ebae..893129d736 100644
--- a/src/Mod/Web/Gui/Resources/Web.qrc
+++ b/src/Mod/Web/Gui/Resources/Web.qrc
@@ -10,8 +10,6 @@
icons/actions/web-zoom-out.svg
icons/actions/web-sketchfab.svg
icons/WebWorkbench.svg
- icons/Sketchfab.svg
- ui/TaskDlgSketchfab.ui
translations/Web_de.qm
translations/Web_af.qm
translations/Web_zh-CN.qm
diff --git a/src/Mod/Web/Gui/Resources/icons/Sketchfab.svg b/src/Mod/Web/Gui/Resources/icons/Sketchfab.svg
deleted file mode 100644
index 52ec0b2508..0000000000
--- a/src/Mod/Web/Gui/Resources/icons/Sketchfab.svg
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/Mod/Web/Gui/Resources/ui/TaskDlgSketchfab.ui b/src/Mod/Web/Gui/Resources/ui/TaskDlgSketchfab.ui
deleted file mode 100644
index df4df05fdf..0000000000
--- a/src/Mod/Web/Gui/Resources/ui/TaskDlgSketchfab.ui
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 218
- 548
-
-
-
- Sketchfab exporter
-
-
- -
-
-
-
- 200
- 43
-
-
-
-
-
-
- :/icons/Sketchfab.svg
-
-
- true
-
-
-
- -
-
-
- What to upload?
-
-
-
- -
-
-
- Selection
-
-
- true
-
-
-
- -
-
-
- All visible objects
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 20
- 20
-
-
-
-
- -
-
-
-
-
-
- Model name
-
-
-
- -
-
-
- Private
-
-
-
-
-
- -
-
-
- -
-
-
- Description
-
-
-
- -
-
-
- -
-
-
- Tags (separated by commas)
-
-
-
- -
-
-
-
-
-
- FreeCAD,
-
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
- Format
-
-
-
- -
-
-
-
-
- OBJ + MTL (Arch exporter)
-
-
- -
-
- OBJ (standard Mesh exporter)
-
-
- -
-
- DAE (Collada)
-
-
- -
-
- STL
-
-
- -
-
- IGES (shapes only)
-
-
- -
-
- IV (Inventor)
-
-
-
-
- -
-
-
- Sketchfab API token
-
-
-
- -
-
-
-
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- Obtain
-
-
-
-
-
- -
-
-
- Upload
-
-
-
- -
-
-
- 25
-
-
- uploading
-
-
-
- -
-
-
- Success! View uploaded online
-
-
-
-
-
-
-
-
-
-