4347 Commits

Author	SHA1	Message	Date
Lipu Fei	1c747a962f	Merge remote-tracking branch 'CURA-4032'	2017-08-15 16:11:44 +02:00
Ghostkeeper	ddf35826dc	Merge branch '2.7'	2017-08-15 15:32:39 +02:00
Ghostkeeper	17a615d30c	Don't translate HTML tags and variable names ... It says so in the context of the build dimensions translation. Not yet in the context of the HTML tags with <filename> and such, but it will do that for the next translation round properly. Contributes to issue CURA-4113.	2017-08-15 15:32:23 +02:00
Ghostkeeper	31757f4ce1	Merge branch '2.7' of https://github.com/Patola/Cura into Patola-2.7	2017-08-15 15:29:24 +02:00
alekseisasin	3116ff829c	Merge pull request #2200 from fieldOfView/fix_monitoritem_size ... Adapt camera image to available space	2017-08-15 15:04:18 +02:00
alekseisasin	7ad7fb0a3c	Merge pull request #2200 from fieldOfView/fix_monitoritem_size ... Adapt camera image to available space	2017-08-15 14:45:34 +02:00
Ghostkeeper	72bf74e513	Merge branch '2.7'	2017-08-15 14:16:08 +02:00
Ghostkeeper	3110349f5e	Fix misunderstood translation ... Literally it should've been 'weergavenaam', but I'm now opting for a less literal translation because weergavenaam sounds so weird. Contributes to issue CURA-4113.	2017-08-15 14:15:51 +02:00
Cláudio Sampaio (Patola)	0449e4e63a	Updated brazilian portuguese translation	2017-08-15 09:06:50 -03:00
Ghostkeeper	59058ad77f	Merge branch '2.7'	2017-08-15 11:24:00 +02:00
Ghostkeeper	1f778e8d2f	Fix translated replacement strings ... Bad translators! Bad! It even says so in the context! Contributes to issue CURA-4113.	2017-08-15 11:13:48 +02:00
Ghostkeeper	8f46733dec	Correct whitespace of fatal exception text ... It's not salient for our translation files really, since it is displayed in QML in the end which removes those. It is salient for gettext though, which gives an error when one message ends in a newline and the other doesn't. Contributes to issue CURA-4113.	2017-08-15 11:05:50 +02:00
Ghostkeeper	cbc60c7689	Minor fixes for German translations ... Contributes to issue CURA-4113.	2017-08-15 09:58:42 +02:00
Ghostkeeper	262691c1ff	Update German translations ... These are the translations from Bothof. They look mostly correct. Contributes to issue CURA-4113.	2017-08-15 09:56:57 +02:00
Ghostkeeper	f6c84e054b	Fix HTML tags ... They shouldn't be translated. Bad translator! BAD! Contributes to issue CURA-4113.	2017-08-15 09:28:42 +02:00
Ghostkeeper	5ddbbd91db	Merge branch '2.7'	2017-08-14 17:30:45 +02:00
Ghostkeeper	4f471ea1a4	Update Spanish translations ... These are the updates from Bothof. I found some older mistakes here, which I'll solve next. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	1e1e6386fc	Update Finnish translation ... These are the translation files from Bothof. They are excellent as far as I could detect. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	22d7312265	Minor fixes to French translations ... These must've been in there for a while... Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	cd8b485e98	Update French translations ... These are the new translations from Bothof. I've found some mistakes in cura.po which I'll fix in the next commit to make it clear which changes are from me. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	50508baad7	Minor interpunction fixes for Italian translation ... The one with the href attribute is pretty serious. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	7c86e476c8	Update Italian translations ... These look almost correct. Just one mistake with an HTML tag. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	45673a3586	Fixes to Dutch translations ... Some consistency fixes and several places where they misunderstood the meaning of a text. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	92f5a4c392	Update Dutch translations ... There's several mistakes in these translations. I'm fixing those in the next commit to keep it separate. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	673e281e4d	Fix XML tags in Turkish translation ... Bad, BAD translator! Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	7682ffad08	Update Turkish translations ... Some of these are plain wrong. We'll fix those in the next commit. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Ghostkeeper	fa49c7a939	Update Japanese translations ... These are the new texts for 2.7. Contributes to issue CURA-4113.	2017-08-14 17:30:14 +02:00
Tim Kuipers	1d5cc92e47	Merge branch 'remove_some_zags'	2017-08-14 16:11:44 +02:00
Tim Kuipers	317de1c75d	update support_skip_zag_per_mm default value (CURA-3957)	2017-08-14 15:58:03 +02:00
Tim Kuipers	c2ac731324	update support_skip_zag_per_mm description and default value (CURA-3957)	2017-08-14 15:49:16 +02:00
Lipu Fei	67f820af04	Pass tray_icon_name to QtApplication ... CURA-4032	2017-08-14 15:26:17 +02:00
alekseisasin	bc4b1d9c4d	Merge remote-tracking branch 'origin/2.7'	2017-08-14 15:11:33 +02:00
alekseisasin	e88f74fe5a	Merge branch 'master' of github.com:Ultimaker/cura	2017-08-14 15:07:59 +02:00
alekseisasin	160f21cdac	Merge branch 'feature_move_printing_time'	2017-08-14 13:55:18 +02:00
Ghostkeeper	7ab6a551c1	Clarify that XML material tags don't get translated ... Some of the translators got this wrong last time. Let's see how good they read this next time... Contributes to issue CURA-4113.	2017-08-14 13:54:11 +02:00
Lipu Fei	2a695517f7	Remove wall_extruder_nr from fdmprinter ... CURA-4145 - Remove "wall_extruder_nr" - Remove all "limit_to_extruder" for all parent wall settings - Change settings that used to depend on the wall extruder to get value from the inner wall extruder	2017-08-14 13:21:26 +02:00
alekseisasin	a4ddd28e8f	Removed gap between material length and it's measuring unit ... feature_move_printing_time	2017-08-14 13:09:31 +02:00
Ghostkeeper	5866b759a8	Move material estimate properties to sidebar as well ... That's where they are used after all. Contributes to issue CURA-4149.	2017-08-14 12:06:03 +02:00
Ghostkeeper	5423228e02	Revert "Revert "Add settings for skipping some zags"" ... This reverts commit cc26d52af32d7917735387b10f89dc3bebbde281.	2017-08-14 11:09:14 +02:00
Ghostkeeper	f1322d1656	Merge branch '2.7'	2017-08-14 11:09:03 +02:00
Ghostkeeper	cc26d52af3	Revert "Add settings for skipping some zags" ... This reverts commit a0e59dd6aa88da5d2e73c5611421c7924e6209f9.	2017-08-14 11:08:28 +02:00
Ghostkeeper	019b5852ab	Merge branch '2.7'	2017-08-14 11:02:48 +02:00
Ghostkeeper	70a0a6ef1c	Fix infill before walls check ... This could be dependent on either the inner or the outer wall, depending on how many walls you have. However usually it will be the inner wall. Contributes to issue CURA-4145.	2017-08-14 11:02:32 +02:00
Ghostkeeper	6a4329c1a0	Align progress bar and save button better ... So that they don't overlap with the now larger fonts and such. Contributes to issue CURA-4149.	2017-08-14 10:36:39 +02:00
Ghostkeeper	addf6429e5	Adjust font sizes of time/material estimates ... Emphasize the time estimate. Contributes to issue CURA-4149.	2017-08-14 09:45:12 +02:00
Ghostkeeper	bff00d41d0	Add description for print time ... It looks a bit weird right below the print time but we'll discuss that later. Contributes to issue CURA-4149.	2017-08-14 09:42:46 +02:00
Ghostkeeper	454293f926	Remove superfluous rectangles ... There's only one item in there. It makes no sense to group them by rows and that only makes the bindings more complicated. Contributes to issue CURA-4149.	2017-08-14 09:38:40 +02:00
Ghostkeeper	e514a9f474	Fix some binding loops ... Contributes to issue CURA-4149.	2017-08-14 09:34:52 +02:00
Ghostkeeper	c4305c7b1e	Rearrange and align time/material estimates ... They look correct now but the log says there is a binding loop in here. We'll fix that next. Contributes to issue CURA-4149.	2017-08-14 09:23:56 +02:00
Ghostkeeper	fb3a0b701c	Remove superfluous item ... This item was just transparently being the same size as its parent, no ID or nothing. We can just remove it. Contributes to issue CURA-4149.	2017-08-14 09:12:21 +02:00