Commit graph

12848 commits

Author SHA1 Message Date
fieldOfView
d30f8322ba Make material profiles have values for the same settings 2016-02-08 09:18:34 +01:00
fieldOfView
57046a43e8 Rename material profiles for consistency 2016-02-08 09:18:34 +01:00
fieldOfView
a53b898670 Rename [profile] to [settings] in material profiles 2016-02-08 09:18:34 +01:00
fieldOfView
277dd71759 Align variant naming in profiles and machine definitions 2016-02-08 09:18:33 +01:00
fieldOfView
f97e2fa6aa Prepare "Add profile" dialog 2016-02-08 09:18:33 +01:00
fieldOfView
bfa45245cc machine_type is a reference to the id, not the name 2016-02-08 09:18:33 +01:00
fieldOfView
9bd13cf9a7 Add JARJAR machine definitions from cura-private-data 2016-02-08 09:18:32 +01:00
fieldOfView
747f5fbd55 Add converted UM2+ profiles (variant/material specific) 2016-02-08 09:18:32 +01:00
fieldOfView
cbbc6d1a18 Add converted material profiles 2016-02-08 09:18:31 +01:00
fieldOfView
ce562713c3 Reimport default profiles from 15.04.04 2016-02-08 09:18:31 +01:00
fieldOfView
3d85646d07 Move general profiles into profiles/general 2016-02-08 09:18:31 +01:00
fieldOfView
faefbb6b8e Rename materials model to MachineMaterialsModel 2016-02-08 09:18:30 +01:00
fieldOfView
47d299b8c3 Add material profile selection to sidebar 2016-02-08 09:18:30 +01:00
Thomas-Karl Pietrowski
dd95ea71cf i18n: de: Moving the name of the removable drive to the right position
In my point of view this is the most locial order of it.
For the future we should think about putting the name of the removable drive into quotation marks,
so it will output: "Auf Wechseldatenträger 'Your SD card' gespeichert als 'Your Code.gcode'".
2016-02-07 16:02:03 +01:00
Thomas-Karl Pietrowski
e3163155bd Merge remote-tracking branch 'upstream/2.1' into 2.1-i18n-de-spelling 2016-02-07 11:20:16 +01:00
Ghostkeeper
bdfdc1191c Move Uranium's translation to Uranium repository
Sorry, that was wrong. Also, why am I not doing this in a feature branch? Sorry.

Contributes to issue CURA-526.
2016-02-05 10:51:27 +01:00
Thomas-Karl Pietrowski
6d475ce08c i18n: de: Better translation for "Print Job"
The old translation is actually "Printer Job". Correcting this to "Druckauftrag".
2016-02-04 22:09:48 +01:00
Thomas-Karl Pietrowski
14f0998904 i18n: de: Improve translation of spitted string
I don't know where "Ready to " also appears, but after loading an object I just found this mixed translation.
"Bereit Auf Wechseldatenträger speichern" -> "Bereit zum Speichern auf Wechseldatenträger"
2016-02-04 22:04:08 +01:00
Tim Kuipers
682ef482af JSON: feat: modifier mesh setting (83
CURA-833)
2016-02-04 20:20:45 +01:00
Jaime van Kessel
5cb27c5589 Updates list of languages in interface
CURA-526
2016-02-04 12:00:20 +01:00
Ghostkeeper
a539d50830 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-03 17:39:17 +01:00
Ghostkeeper
234b5ce545 Add Castilian, Italian and Dutch translations
These have been checked and corrected by me. In the case of Dutch, extensively!

Contributes to issue CURA-526.
2016-02-03 17:27:56 +01:00
Jaime van Kessel
2867f03840 Fixes rotation hint
CURA-816
2016-02-03 14:30:00 +01:00
Thomas-Karl Pietrowski
f9f4c50703 i18n: de: Comma will be overwritten, when value gets overwritten by the UI
As far as I understand the code Cura will replace "%1 Meter" with a string converted from a float.
In german it is correct so say "x,y Meter" where in english regions it would be called "x.y meter".
So what it needs in Cura is something like "[before_comma],[after_comma] Meter" to the character "." can be translated to ",".
As Cura isn't able (correct me if it can) to do this on it's own, so changing it back to "x.y Meter".
2016-02-01 18:48:53 +01:00
Thomas-Karl Pietrowski
d0247f350c i18n: de: Undoing my changes on "%1 Meter" 2016-02-01 18:47:57 +01:00
Thomas-Karl Pietrowski
1ae783897b i18n: de: Calling "Update" -> "Aktualisierung"
In my point of view this sounds better than using "Update" (anglicism)
2016-02-01 18:16:06 +01:00
Thomas-Karl Pietrowski
1e0eddbd32 i18n: de: another set of good translations 2016-02-01 18:14:40 +01:00
Thomas-Karl Pietrowski
5c9b2d81b9 i18n: de: Marking another good set of translations
No more left so say...
2016-02-01 17:58:02 +01:00
Thomas-Karl Pietrowski
9014c0422f i18n: de: Better calling Setup -> "Konfiguration"
The reason why I would rename it, is that you usually do a "Einrichtung" on the first time you run an application.
"Konfiguration" sounds here better, in my point of view, because you configure your slicing process for your loaded (difficult) object.
2016-02-01 17:50:12 +01:00
Thomas-Karl Pietrowski
7ed16b55bf i18n🇩🇪 Removing fuzzy tag from some good translations
Totally agree with these translations. So marked them as "non-fuzzy".
2016-02-01 17:48:03 +01:00
Thomas-Karl Pietrowski
e7769ae0a5 i18n: de: Generally call "removable drive" "Wechseldatenträger"
I don't know the name for "Wechsellaufwerk" in english, but these devices are not meant to be USB-sticks.
Some PC cases have the possibility to remove a CD drive and you can e.g. replace it with a HDD.
Such devices are really called "Wechsellaufwerk", but the meaning here is "Wechseldatenträger".
2016-02-01 17:40:40 +01:00
Thomas-Karl Pietrowski
eb1edd9a28 i18n: de: Revert translation on SI unit
Don't see a reason, why we should translate "m" > "meter" -> "Meter" here.
Additionally the tranlation for "0.0m" is untranslated while "m" is translated as "Meter".
So I reverted this here.
2016-02-01 17:33:48 +01:00
Thomas-Karl Pietrowski
81eccdba45 i18n: de: X-Ray -> Röntgen
Of course most people might now what the meaning of X-Ray is, but I would translate it, because first it sounds more professional than using anglicisms.
2016-02-01 17:28:33 +01:00
Tim Kuipers
fd5d029c4b infill overlap % ==> mm (CURA-786) 2016-02-01 11:53:19 +01:00
Jaime van Kessel
d68e17c9f5 Merge pull request #624 from Ultimaker/fast_advanced_switch
Fast Simple<->Advanced Switch
2016-02-01 10:48:27 +01:00
Thomas-Karl Pietrowski
a0c564c523 i18n: Revert translations on keywords
* Because these keywords got translated the code can't replace them with values.
* Basicly the idea having these keywords in translation files is just to change the order of them (according to the culture and the region, where another order would be expected).
-> So reverted the translated keywords for german and french.
2016-01-29 19:14:53 +01:00
Arjen Hiemstra
5d136a1da7 ActiveTool.properties now returns a ContainerProxy object 2016-01-29 15:18:19 +01:00
Arjen Hiemstra
edf2802099 Use a StackView and non-dynamic instantation for the sidebar modes
Improves performance at the cost of flexibility.
But we did not use that flexibility anyway.
2016-01-29 14:58:08 +01:00
Ghostkeeper
6271b4039b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-29 11:23:01 +01:00
Ghostkeeper
c53969f1bd Wait for FinishedSlicing message to mark slicing as finished
Instead of waiting until progress is more than 99%, wait for the dedicated FinishedSlicing message.

Contributes to issue CURA-427.
2016-01-29 11:22:04 +01:00
Tim Kuipers
319d8197ab fix: bq_hephestos profile syntax error 2016-01-28 15:29:20 +01:00
Tim Kuipers
8a48791a0b Merge branch '2.1' 2016-01-28 15:25:18 +01:00
Ghostkeeper
c3eb810aa2 Update DE, EN, FI and FR translations
These were given by our translators. They are checked for form errors by me.

Contributes to issue CURA-526.
2016-01-27 13:28:36 +01:00
Tim Kuipers
d6bd59da0e made some settings max value warning instead of impossible 2016-01-27 10:21:34 +01:00
Tim Kuipers
7c652ed069 JSON: refactor: moved draft shield options to Cooling category 2016-01-26 15:55:00 +01:00
fieldOfView
40bfd32f06 Update UM2+ backplate 2016-01-22 22:10:54 +01:00
Jaime van Kessel
3a32cb5f60 Merge pull request #606 from Ultimaker/fix_cura-623
Fix cura 623
2016-01-22 15:35:37 +01:00
Jaime van Kessel
6ce25a0369 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-22 11:38:07 +01:00
Jaime van Kessel
414be1f851 Added ultimaker2 plus definitions 2016-01-22 11:37:18 +01:00
Ghostkeeper
0a07449759 Realign BQ Hephestos 2 platform
Contributes to issue #595.
2016-01-22 10:57:15 +01:00