mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 10:06:07 +08:00
Merge branch '3.3'
This commit is contained in:
commit
e13c3b1f13
@ -337,7 +337,7 @@ class PrintInformation(QObject):
|
|||||||
if is_gcode or is_project_file or (is_empty or (self._base_name == "" and self._base_name != name)):
|
if is_gcode or is_project_file or (is_empty or (self._base_name == "" and self._base_name != name)):
|
||||||
# Only take the file name part
|
# Only take the file name part
|
||||||
self._base_name = filename_parts[0]
|
self._base_name = filename_parts[0]
|
||||||
self._updateJobName()
|
self._updateJobName()
|
||||||
|
|
||||||
@pyqtProperty(str, fset = setBaseName, notify = baseNameChanged)
|
@pyqtProperty(str, fset = setBaseName, notify = baseNameChanged)
|
||||||
def baseName(self):
|
def baseName(self):
|
||||||
|
@ -1433,7 +1433,7 @@ msgstr "기기로드 중 ..."
|
|||||||
#: /home/ruben/Projects/Cura/cura/CuraApplication.py:712
|
#: /home/ruben/Projects/Cura/cura/CuraApplication.py:712
|
||||||
msgctxt "@info:progress"
|
msgctxt "@info:progress"
|
||||||
msgid "Setting up scene..."
|
msgid "Setting up scene..."
|
||||||
msgstr "Setting up scene..."
|
msgstr "장면 설정 중..."
|
||||||
|
|
||||||
#: /home/ruben/Projects/Cura/cura/CuraApplication.py:751
|
#: /home/ruben/Projects/Cura/cura/CuraApplication.py:751
|
||||||
msgctxt "@info:progress"
|
msgctxt "@info:progress"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user