6155 Commits

Author SHA1 Message Date
Diego Prado Gesto
06b9e5240e Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-24 12:43:49 +02:00
Diego Prado Gesto
0fa4df4193 Adjust Spanish and French translations to correctly fit in the space for
the compatibility message.

Contributes to CURA-5166.
2018-04-24 12:42:12 +02:00
Lipu Fei
9b77484e96 Translate adhesion sheet warning text
CURA-5166
2018-04-24 11:59:43 +02:00
LukeChen-Ultimaker
10616bd4a0
Chinese translation for one string 2018-04-24 11:58:48 +02:00
Diego Prado Gesto
d6dcb995bf Add Spanish and Italian translations to a string added after the string
freeze.

Contributes to issue CURA-5166.
2018-04-24 11:35:21 +02:00
Ghostkeeper
fad7885ba7
Add Dutch, German and French translations of string that broke freeze
These are the languages other than English that I trust myself to translate properly...

Contributes to issue CURA-5166.
2018-04-24 11:01:38 +02:00
Ghostkeeper
403051e0b2
Merge branch 'CURA-5143_3.3_send_gz' into 3.3 2018-04-24 10:48:31 +02:00
Lipu Fei
0852cd2c20 WIP: Fix hanging upon send gz 2018-04-24 10:34:08 +02:00
Ghostkeeper
55e3c5c6d2
Update template with string break
This new string broke the string freeze. We'll translate it for our most commonly used languages.
2018-04-24 10:22:53 +02:00
Diego Prado Gesto
609d51e52e CURA-5250 Remove buildplate menu entry temporary. Add back when the
whole feature is back again.
2018-04-23 14:41:43 +02:00
Lipu Fei
0a1fd51b2f Prefer gcode for UM3
CURA-5143
2018-04-23 13:40:19 +02:00
Lipu Fei
4c61e190ae Add exclude materials for UMO, UM2, and UM2+
CURA-5271
2018-04-23 12:51:06 +02:00
Ghostkeeper
7c3fe6ac93
Publish Tough PLA profiles
The Tough PLA material is now published, so we can publish these files too.

Contributes to issue CURA-5272.
2018-04-23 11:28:33 +02:00
Ghostkeeper
aec2b9dafe
Add Ultimaker S5 resources
The Ultimaker S5 has now been published, so these files may be published as well.

Contributes to issue CURA-5272.
2018-04-23 11:27:13 +02:00
Ghostkeeper
d857541677
Update PO headers
We're releasing 3.3 now.
2018-04-23 10:29:59 +02:00
Cláudio Sampaio (Patola)
b4ddeab47e updated pt-br translations 2018-04-21 21:16:03 -03:00
Diego Prado Gesto
dbd30abd86 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-20 17:06:09 +02:00
Diego Prado Gesto
b8a26f3187 CURA-5218 Disable the Activate and Duplicate button in the management
page if the selected profile is not supported
2018-04-20 17:04:51 +02:00
Ghostkeeper
f675b0b858
Fix 'Setting up scene...' translation
This was replaced with its English term, even though it's not really an industry term or anything.

Contributes to issue CURA-5166.
2018-04-20 15:33:48 +02:00
Ghostkeeper
74016f0fb3
Merge branch 'jbkim-3.3' into 3.3 2018-04-20 14:19:03 +02:00
Ghostkeeper
132efba272
Undo some of the changes that we thought were wrong
In these cases we trust the original translation of Bothof better.

Contributes to issue CURA-5166.
2018-04-20 14:18:45 +02:00
Ghostkeeper
1578a76aa4
Merge branch '3.3' of https://github.com/jbkim/Cura into jbkim-3.3 2018-04-20 13:32:48 +02:00
Diego Prado Gesto
f003adeb1e CURA-5250 Add color to the text so it also works fine with other themes. 2018-04-20 10:19:25 +02:00
Diego Prado Gesto
5567d6f168 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-19 10:24:04 +02:00
Diego Prado Gesto
cdc297c87e CURA-5250 Temporary hide buildplate selector.
Put back again when the whole feature is ready.
2018-04-19 10:23:01 +02:00
Diego Prado Gesto
62b586a6ff CURA-5250 Add hint when the buildplate is just usable but not the
recommended.
2018-04-19 10:21:19 +02:00
Lipu Fei
aab87a5558
Merge pull request #3584 from ohrn/zyyx
Add ZYYX Agile printer.
2018-04-19 09:38:19 +02:00
Jinbuhm Kim
0a5f1878b7 Update Korean translation for Cura 3.3 2018-04-19 16:13:40 +09:00
Jinbuhm Kim
76211fc07b Fix and add Korean translation 2018-04-19 12:31:13 +09:00
Ghostkeeper
7ce7b53098
Merge branch '3.3' of https://github.com/jbkim/Cura into jbkim-3.3 2018-04-18 11:03:28 +02:00
Ghostkeeper
f19b717503
Corrections to Polish translations
One small correction that seems to have been a typo (and the header wasn't up to date yet).

Contributes to issue CURA-5166.
2018-04-18 10:40:49 +02:00
Ghostkeeper
921ef993c7
Update Polish translations for Cura 3.3
These are the translations received from Anraf1001, the unmodified files.

Contributes to issue CURA-5166.
2018-04-18 10:37:39 +02:00
Ghostkeeper
407b453ba5
Corrections to European Portuguese translation
These corrections are necessary to make the text fit better.
2018-04-18 09:41:54 +02:00
Ghostkeeper
d28c94a000
Make corrections from Utopica3D
Paulo made a bunch of corrections to our European Portuguese translation. These are his files.

Contributes to issue CURA-5166.
2018-04-18 09:40:23 +02:00
Ghostkeeper
1b173e8119
Correct translation of 'Affects'
Apparently 'touché' means something more like a human touching it, rather than something affecting something else.

Fixes #3489.
2018-04-17 14:32:02 +02:00
Ghostkeeper
0f39b36bd6
Correction to French translation of 'Hollow Out Objects'
Fixes #3489.
2018-04-17 14:30:08 +02:00
Ghostkeeper
b744302557
Merge branch 'M&P-Setting-Optimization' into 3.3 2018-04-17 13:56:11 +02:00
Ghostkeeper
4c75d78f26
Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-17 11:36:45 +02:00
Lipu Fei
a111dda82e Revert "Custom qualities are always checkable"
CURA-5218

This reverts commit fdd78077697f9e3ff9f0fe654eff8af36a1623d9.
2018-04-17 11:14:14 +02:00
Jinbuhm Kim
23fdd5f1e6 Fix and update Korean Translation 2018-04-16 17:27:33 +09:00
Unknown
42d3235e91 refine translation for 'overhang' 2018-04-13 22:27:21 +08:00
Unknown
172a197cbf update fdmprinter.def.json.po for cura 3.3 (2) 2018-04-13 22:27:12 +08:00
Unknown
6a233ccd41 refine translation of 'visibility' 2018-04-13 22:27:07 +08:00
Unknown
e944d5f78e update cura.po for cura 3.3 (2) 2018-04-13 22:27:03 +08:00
Unknown
003c4831ea update cura.po for cura 3.3 (1) 2018-04-13 22:26:51 +08:00
Unknown
929de409ce update fdmprinter.def.json.po for cura 3.3 (1) 2018-04-13 22:26:46 +08:00
Unknown
b4802fa3a1 update fdmextruder.def.json.po for cura 3.3 2018-04-13 22:26:41 +08:00
Unknown
c5c4ae093a refine old translation 2018-04-13 22:26:23 +08:00
Ghostkeeper
db09272b1e
Corrections for Bothof translations
These are corrections for the mistakes that we found in Bothof's translations.

Thanks to Vandrasc and Ellecross.

Contributes to issue CURA-5166.
2018-04-13 16:13:17 +02:00
Ghostkeeper
479e260833
Correct formatting of string starting with \n
Gettext doesn't accept this, even though it's correct.

Contributes to issue CURA-5166.
2018-04-13 15:28:53 +02:00