Merge branch '5.5' of github.com:Ultimaker/Cura

Ultimaker · Oct 11, 2023 · 9f1be53 · 9f1be53
2 parents e627a41 + 6f82397
commit 9f1be53
Show file tree

Hide file tree

Showing 42 changed files with 52,099 additions and 59,759 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -398,10 +398,10 @@ def generate(self):
                 vb = VirtualBuildEnv(self)
                 vb.generate()
 
-                # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
-                cpp_info = self.dependencies["gettext"].cpp_info
-                pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0])
-                pot.generate()
+                # # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
+                # cpp_info = self.dependencies["gettext"].cpp_info
+                # pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0])
+                # pot.generate()
 
     def build(self):
         if self.options.devtools:

diff --git a/cura/BackendPlugin.py b/cura/BackendPlugin.py
@@ -7,7 +7,7 @@
 
 from UM.Logger import Logger
 from UM.Message import Message
-from UM.Settings.AdditionalSettingDefinitionAppender import AdditionalSettingDefinitionsAppender
+from UM.Settings.AdditionalSettingDefinitionsAppender import AdditionalSettingDefinitionsAppender
 from UM.PluginObject import PluginObject
 from UM.i18n import i18nCatalog
 from UM.Platform import Platform
@@ -16,9 +16,10 @@
 
 class BackendPlugin(AdditionalSettingDefinitionsAppender, PluginObject):
     catalog = i18nCatalog("cura")
+    settings_catalog = i18nCatalog("fdmprinter.def.json")
 
     def __init__(self) -> None:
-        super().__init__()
+        super().__init__(self.settings_catalog)
         self.__port: int = 0
         self._plugin_address: str = "127.0.0.1"
         self._plugin_command: Optional[List[str]] = None

diff --git a/packaging/AppImage-builder/AppImageBuilder.yml.jinja b/packaging/AppImage-builder/AppImageBuilder.yml.jinja
@@ -47,54 +47,7 @@ AppDir:
     - sourceline: deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie
         main
     include:
-      - libc6:amd64
       - xdg-desktop-portal-kde:amd64
-      - libcap2:amd64
-      - libcom-err2:amd64
-      - libdbus-1-3:amd64
-      - libgpg-error0:amd64
-      - libgtk-3-common
-      - libkeyutils1:amd64
-      - libllvm13
-      - liblzma5:amd64
-      - libpcre3:amd64
-      - libqt6gui6
-      - libqt6qml6
-      - libqt6qmlworkerscript6
-      - libqt6quick6
-      - libselinux1:amd64
-      - libtinfo6:amd64
-      - qml6-module-qtqml-workerscript:amd64
-      - qml6-module-qtquick:amd64
-      - qt6-gtk-platformtheme:amd64
-      - qt6-qpa-plugins:amd64
-        # x11
-      - libx11-6
-      - libx11-xcb1
-      - libxcb1
-      - libxcb-render0
-      - libxcb-xfixes0
-      - libxcb-shape0
-      - libxcb-dri2-0
-      - libxcb-shm0
-      - libxcb-glx0
-      - libxcb-present0
-      - libxcb-dri3-0
-        # graphic libraries interface (safe graphics bundle including drivers, acceleration may not work in some systems)
-      - libglvnd0
-      - libglx0
-      - libglapi-mesa
-      - libgl1
-      - libegl1
-      - libgbm1
-      - libdrm2
-      - libglx-mesa0
-      - libgl1-amber-dri
-      - libgl1-mesa-dri
-      - mesa-utils
-      - libgl1-mesa-glx
-      - libdrm-amdgpu1
-      - libdrm-nouveau2
     exclude:
       - hicolor-icon-theme
       - adwaita-icon-theme

diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"