3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '5.4'

Browse source 
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cs_CZ/fdmextruder.def.json.po
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/de_DE/fdmextruder.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/es_ES/fdmextruder.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmextruder.def.json.pot
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fi_FI/fdmextruder.def.json.po
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/fr_FR/fdmextruder.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/hu_HU/fdmextruder.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/it_IT/fdmextruder.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ja_JP/fdmextruder.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/ko_KR/fdmextruder.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/nl_NL/fdmextruder.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pl_PL/fdmextruder.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_BR/fdmextruder.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/pt_PT/fdmextruder.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/ru_RU/fdmextruder.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/tr_TR/fdmextruder.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_CN/fdmextruder.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/cura.po
#	resources/i18n/zh_TW/fdmextruder.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
This commit is contained in:
Jelle Spijker 2023-06-08 16:52:20 +02:00
commit 1cf10f06f3
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
55 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/update-translation.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
- name: Setup Python and pip
uses: actions/setup-python@v4
with:
python-version: 3.11.x
python-version: 3.10.x
cache: pip
cache-dependency-path: .github/workflows/requirements-conan-package.txt