Commit graph

4934 commits

Author SHA1 Message Date
Lipu Fei
a835ffa54a Merge pull request #2561 from Ultimaker/FixGridShaderForOlderOpenGLVersions
Fix the OpenGL shader for older (legacy?) OpenGL.
2017-10-11 15:03:12 +02:00
ChrisTerBeke
551adc058f Merge branch '3.0' 2017-10-11 14:54:30 +02:00
ChrisTerBeke
331574eec0 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-11 14:53:59 +02:00
Mark
00205996da Change Text to Label and cast all sizes to int
CURA-4437
2017-10-11 14:53:46 +02:00
Ghostkeeper
be268a88dc
Fix order of commented-out translations
Apparently it's not allowed to put a comment halfway through a translation item.

Contributes to issue CURA-4341.
2017-10-11 14:53:18 +02:00
ChrisTerBeke
3db5787d5d Code cleanup for infill slider value binding - CURA-4438 2017-10-11 14:41:13 +02:00
Ghostkeeper
e4580b6cd2
Delete unused cura.po file
To crevent ponfusion.

Contributes to issue CURA-4341.
2017-10-11 14:39:50 +02:00
Ghostkeeper
92e931e02e
Add translations out-of-band for string freeze violations
These texts were added after the string freeze. Bad! We've now translated half of these with a native speaker in the office, and the other half via Google and some clever copying from existing translations.

Contributes to issue CURA-4341.
2017-10-11 14:35:05 +02:00
ChrisTerBeke
e97bdc526b Merge branch '3.0' 2017-10-11 14:13:57 +02:00
Lipu Fei
bb476752a4 Fix infill density binding in Recommended mode
CURA-4438

Infill density in Recommended mode should be bound to the correct stack
when the infill extruder is/is not set to a specific extruder.
2017-10-11 14:05:56 +02:00
ChrisTerBeke
23d0201f6b Merge branch 'fix_garbled_fonts_part_2' 2017-10-11 13:41:33 +02:00
Lipu Fei
4927a639cd Always update the job name with the loaded project
CURA-4348
2017-10-11 12:49:22 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int
CURA-4437
2017-10-11 12:48:42 +02:00
Ghostkeeper
cadfa14fb4
Fix mistake in verb vs. noun of 'Print'
The translator misunderstood this. It's not 'to print the details', but 'details of the print'.

Contributes to issue CURA-4341.
2017-10-11 11:22:08 +02:00
Ghostkeeper
69f6a7de73
Fix mistaken negation
The translator read this one wrong.

Contributes to issue CURA-4341.
2017-10-11 11:16:59 +02:00
Ghostkeeper
d3853815ea
Add missing strings for broken string freeze
Bad. Bad!

Contributes to issue CURA-4341.
2017-10-11 11:10:42 +02:00
ChrisTerBeke
30c9ccfb7f Merge branch '3.0' 2017-10-10 16:31:29 +02:00
ChrisTerBeke
fc1282773a Merge branch 'thopiekar-remove-cura-under-cura-logo' 2017-10-10 15:43:21 +02:00
Lipu Fei
c7ccc3c1b8 Fix long text display in mode toggle buttons
CURA-4341
2017-10-10 14:47:13 +02:00
Ghostkeeper
d962ffb8d8
Merge branch '3.0' 2017-10-10 14:36:38 +02:00
Lipu Fei
444204f6a1 Fix "Print Speed" text width for some translations
CURA-4341
2017-10-10 14:35:07 +02:00
Lipu Fei
0e45ec1197 Fix auto-adjust for "Print Setup" text
CURA-4341
2017-10-10 14:26:55 +02:00
Ghostkeeper
b86f98c444
Remove mistakenly translated setting labels
Not all labels were translated so it looked very inconsistent.
Using a bunch of fun regular expressions, I filtered out all translations that were actually translated and left them in but commented out. There were also a lot that were exactly the same as the original English, so I've just emptied those translations.

Contributes to issue CURA-4341.
2017-10-10 14:19:46 +02:00
Ghostkeeper
a74dfafdd1
Remove unused .po file
The Korean translation only translates the setting descriptions, so there is no data here. Let's remove it to avoid confusion.
2017-10-10 14:16:52 +02:00
Ghostkeeper
ab2e761423
Remove unused .po file
The Japanese translation only translates the setting descriptions, so there is no data here. Let's remove it to avoid confusion.
2017-10-10 14:16:46 +02:00
ChrisTerBeke
641b3c21f7 fix merge conflicts 2017-10-10 09:21:31 +02:00
Lipu Fei
7b6faf0030 Adjust column width for Materials "Print Settings" page
CURA-4428
2017-10-10 08:03:08 +02:00
Ghostkeeper
65b92ca0e7
Merge branch '3.0' 2017-10-06 17:35:43 +02:00
Ghostkeeper
d3b1563369
Add out-of-band translations
These strings were added too late, after the string freeze. Now I have to figure out the translations from a secondary source...

Contributes to issue CURA-4341.
2017-10-06 17:35:12 +02:00
Ghostkeeper
e5df65ed88
Update Polish translations
I removed a double space somewhere but otherwise it was excellent.

Contributes to issue CURA-4341.
2017-10-06 17:32:40 +02:00
Ghostkeeper
23042a458b
Add out-of-band translations for too late strings
These strings were added after the string freeze. We obtained them from a different translator.

Contributes to issue CURA-4341.
2017-10-06 17:23:57 +02:00
Ghostkeeper
a0f7800a0d
Merge branch '3.0' 2017-10-06 17:17:30 +02:00
Ghostkeeper
47582195f1
Fix headers of Portuguese translation files
The language and country codes are not in the file format specification.

Contributes to issue CURA-4341.
2017-10-06 17:13:37 +02:00
Ghostkeeper
009f41e2ed
Merge branch '3.0' of https://github.com/Patola/Cura into Patola-3.0 2017-10-06 17:11:58 +02:00
Ghostkeeper
bc419370d0
Merge branch '3.0' 2017-10-06 16:02:13 +02:00
Ghostkeeper
b9045f6b24
Give warning if using some patterns with gradual
Cross, Cross 3D, Concentric and Concentric 3D don't work well with Gradual Infill. Lines and zigzag don't work well with Gradual Support Infill (in addition to the previously mentioned patterns) since they aren't alternating in support.

Contributes to issue CURA-4095.
2017-10-06 16:01:53 +02:00
daid
1313e01f04 Fix the OpenGL shader for older (legacy?) OpenGL. As the grid shader was no longer working. 2017-10-06 15:44:10 +02:00
Cláudio Sampaio (Patola)
8bbdd9cca1 Updated brazilian portuguese strings 2017-10-06 10:10:23 -03:00
Lipu Fei
ba12d9dff8 Move robot to the left
CURA-4416
2017-10-06 12:03:37 +02:00
Lipu Fei
c76b35ce3a Update splash screen
CURA-4416
2017-10-06 11:11:44 +02:00
ChrisTerBeke
35dae000a0 Merge branch '3.0' 2017-10-06 10:45:42 +02:00
ChrisTerBeke
9f0b85952a Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-06 10:45:25 +02:00
ChrisTerBeke
798649bce8 Merge branch 'TheAssasin-master' into 3.0 2017-10-06 10:40:34 +02:00
Ghostkeeper
7e00914e38
Merge branch '3.0' 2017-10-06 10:00:19 +02:00
Ghostkeeper
5a3677688f
Fix top/bottom speed for CPE+ faster profiles
I think these were some typos or mistakes in someone's spreadsheet.
2017-10-06 09:59:17 +02:00
ChrisTerBeke
ed551cdc2b Merge branch 'gradual_infill' into 3.0 2017-10-05 18:09:17 +02:00
ChrisTerBeke
874b08eb07 Fixes for infill slider gradual reset - CURA-4397 2017-10-05 18:08:52 +02:00
Lipu Fei
185c350a19 Merge remote-tracking branch 'upstream/3.0' 2017-10-05 15:49:18 +02:00
Diego Prado Gesto
17183316db Gradual infill stepping 1 by 1 and remembering previous value - CURA-4397 2017-10-05 15:22:39 +02:00
Lipu Fei
5e970fa5a5 Use more descriptive function name
CURA-4411
2017-10-05 15:08:08 +02:00