Commit graph

6388 commits

Author SHA1 Message Date
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
b8920b290f
Merge branch '3.3' 2018-04-18 09:47:06 +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
Lipu Fei
35e7be1d41 Use pyqtSlot to show more info dialog
CURA-5204
2018-04-17 16:43:41 +02:00
Lipu Fei
0d5b21932e Use "More information" for button
CURA-5204
2018-04-17 16:13:13 +02:00
Ghostkeeper
c4b15b02d4
Merge branch '3.3' 2018-04-17 14:32:15 +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
e43e9ad117
Merge branch '3.3' 2018-04-17 13:56:46 +02:00
Ghostkeeper
b744302557
Merge branch 'M&P-Setting-Optimization' into 3.3 2018-04-17 13:56:11 +02:00
Ghostkeeper
d13fa3a6aa
Merge branch '3.3' 2018-04-17 11:40:29 +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
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Lipu Fei
c0db82e7a3 Merge remote-tracking branch 'origin/3.3' 2018-04-17 11:18:27 +02:00
Lipu Fei
a111dda82e Revert "Custom qualities are always checkable"
CURA-5218

This reverts commit fdd7807769.
2018-04-17 11:14:14 +02:00
DavidGergely
61eba07c50 PC profile adjustment
PC top bottom speed for the 0.4 printcore adjusted to have formula
2018-04-16 16:45:42 +02:00
DavidGergely
dd2d365884 Revert "PC top-bottom speed changed to function based"
This reverts commit cec7b8691d.
2018-04-16 16:40:35 +02:00
DavidGergely
cec7b8691d PC top-bottom speed changed to function based
PC top-bottom speed in all layer heights for the 0.4 mm printcore
changed to function based.
2018-04-16 16:39:34 +02:00
Ghostkeeper
455abb15bf
Consistently use capital letters for CLI settings too
They're not actually visible, but in case they are made visible by modifying the preferences file...
2018-04-16 12:36:17 +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
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02: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
Ghostkeeper
1488f965b7
Scale height of slider hover area with screenScaleFactor
This way it scales along with the high-resolution screen scaling for high-DPI screens.
2018-04-13 11:43:43 +02:00
Jaime van Kessel
5d1d426037 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-12 21:56:13 +02:00
Jaime van Kessel
dc935e2698 Added unit to adaptive layer height settings 2018-04-12 21:55:51 +02:00
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data
CURA-4644
2018-04-12 15:46:53 +02:00
Diego Prado Gesto
e2d6e18ac9 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-12 14:59:38 +02:00
Diego Prado Gesto
df521dcc93 Change description of a setting.
Contributes to CURA-5222.
2018-04-12 14:56:42 +02:00
Ghostkeeper
13f63a7051
Rename 'No Skin' to 'Not in Skin'
It's a bit more clear, as discussed in #3115. To actually change the functionality requires a bit more effort for which I'll need to make a ticket.
2018-04-12 14:39:46 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Lipu Fei
fdd7807769 Custom qualities are always checkable
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
406b64b331 Remove unneeded code
CURA-4644
2018-04-12 13:14:58 +02:00
Ghostkeeper
1be6e29494
Merge branch '3.3' 2018-04-11 16:57:49 +02:00
Ghostkeeper
b101ddcf8d
Re-do shortening of Wechseldatentrager to Datentrager
The translation update undid my changes there. That was basically a manual merge. We need to change this again now.

Contributes to issue CURA-5166.
2018-04-11 14:57:45 +02:00
Ghostkeeper
36eef6603f
Update and fix .po file headers
Lots of things out of sync again.

Contributes to issue CURA-5166.
2018-04-11 14:54:31 +02:00
Ghostkeeper
884227336f
Update translations from Bothof
These are the new translation files that the translation bureau sent to us. I've renamed them to fit in our architecture but for the rest they are unaltered.

Contributes to issue CURA-5166.
2018-04-11 14:53:05 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00
Lipu Fei
40eedbcf70 Add more info dialog
CURA-5204
2018-04-10 15:33:32 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93 Make it possible to skip project file check in readLocalFile()
CURA-5203
2018-04-10 11:40:47 +02:00