Merge branch '2.4'

2025-11-28 05:11:04 -07:00 · 2017-01-28 02:35:28 +01:00 · 2017-01-28 02:35:28 +01:00 · ee2076b407
commit ee2076b407
parent 35cbedc5fe d24f42444e
21 changed files with 21165 additions and 10822 deletions
--- a/resources/i18n/de/cura.po
+++ b/resources/i18n/de/cura.po
--- a/resources/i18n/de/fdmextruder.def.json.po
+++ b/resources/i18n/de/fdmextruder.def.json.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"
--- a/resources/i18n/de/fdmprinter.def.json.po
+++ b/resources/i18n/de/fdmprinter.def.json.po
--- a/resources/i18n/es/cura.po
+++ b/resources/i18n/es/cura.po
--- a/resources/i18n/es/fdmextruder.def.json.po
+++ b/resources/i18n/es/fdmextruder.def.json.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"
--- a/resources/i18n/es/fdmprinter.def.json.po
+++ b/resources/i18n/es/fdmprinter.def.json.po
--- a/resources/i18n/fi/cura.po
+++ b/resources/i18n/fi/cura.po
--- a/resources/i18n/fi/fdmextruder.def.json.po
+++ b/resources/i18n/fi/fdmextruder.def.json.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"
--- a/resources/i18n/fi/fdmprinter.def.json.po
+++ b/resources/i18n/fi/fdmprinter.def.json.po
--- a/resources/i18n/fr/cura.po
+++ b/resources/i18n/fr/cura.po
--- a/resources/i18n/fr/fdmextruder.def.json.po
+++ b/resources/i18n/fr/fdmextruder.def.json.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"
--- a/resources/i18n/fr/fdmprinter.def.json.po
+++ b/resources/i18n/fr/fdmprinter.def.json.po
--- a/resources/i18n/it/cura.po
+++ b/resources/i18n/it/cura.po
--- a/resources/i18n/it/fdmextruder.def.json.po
+++ b/resources/i18n/it/fdmextruder.def.json.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"
--- a/resources/i18n/it/fdmprinter.def.json.po
+++ b/resources/i18n/it/fdmprinter.def.json.po
--- a/resources/i18n/nl/cura.po
+++ b/resources/i18n/nl/cura.po
--- a/resources/i18n/nl/fdmextruder.def.json.po
+++ b/resources/i18n/nl/fdmextruder.def.json.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-10-11 16:05+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: Ruben Dulek <r.dulek@ultimaker.com>\n"
 "Language-Team: Ultimaker\n"
 "Language: \n"
--- a/resources/i18n/nl/fdmprinter.def.json.po
+++ b/resources/i18n/nl/fdmprinter.def.json.po
--- a/resources/i18n/tr/cura.po
+++ b/resources/i18n/tr/cura.po
--- a/resources/i18n/tr/fdmextruder.def.json.po
+++ b/resources/i18n/tr/fdmextruder.def.json.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"
--- a/resources/i18n/tr/fdmprinter.def.json.po
+++ b/resources/i18n/tr/fdmprinter.def.json.po