Merge branch '3.3'

This commit is contained in:
Ghostkeeper 2018-04-20 15:34:06 +02:00
commit e13c3b1f13
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
2 changed files with 2 additions and 2 deletions

View File

@ -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)):
# Only take the file name part
self._base_name = filename_parts[0]
self._updateJobName()
self._updateJobName()
@pyqtProperty(str, fset = setBaseName, notify = baseNameChanged)
def baseName(self):

View File

@ -1433,7 +1433,7 @@ msgstr "기기로드 중 ..."
#: /home/ruben/Projects/Cura/cura/CuraApplication.py:712
msgctxt "@info:progress"
msgid "Setting up scene..."
msgstr "Setting up scene..."
msgstr "장면 설정 중..."
#: /home/ruben/Projects/Cura/cura/CuraApplication.py:751
msgctxt "@info:progress"