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

Merge branch '2.7'

Browse source
This commit is contained in:
Ghostkeeper 2017-08-28 16:21:40 +02:00
commit 7a8956fd0e
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
10 changed files with 9171 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -161,6 +161,7 @@ UM.PreferencesPage
append({ text: "Português do Brasil", code: "ptbr" })
append({ text: "Русский", code: "ru" })
append({ text: "Türkçe", code: "tr" })
append({ text: "简体中文", code: "zh_CN" })
var date_object = new Date();
if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September.