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

Merge branch '4.12'

Browse source 
Conflicts:
	resources/i18n/de_DE/fdmprinter.def.json.po -> German translations got some fixes in master while we also updated the new translations for 4.12.
This commit is contained in:
Ghostkeeper 2021-11-08 13:55:09 +01:00
commit dcf78b4885
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
28 changed files with 1135 additions and 1782 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Preferences/GeneralPage.qml
View file

@ -162,7 +162,7 @@ UM.PreferencesPage
Component.onCompleted:
{
append({ text: "English", code: "en_US" })
append({ text: "Čeština", code: "cs_CZ" })
// append({ text: "Čeština", code: "cs_CZ" })
append({ text: "Deutsch", code: "de_DE" })
append({ text: "Español", code: "es_ES" })
//Finnish is disabled for being incomplete: append({ text: "Suomi", code: "fi_FI" })