Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""

This reverts commit e07e7bc9e7.

Contributes to issue CURA-4414.
This commit is contained in:
Ghostkeeper 2017-10-05 10:58:49 +02:00
parent ff41b043b1
commit d458fcde5c
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
12 changed files with 75 additions and 13 deletions

View file

@ -378,7 +378,7 @@ Cura.MachineAction
},
Button {
id: btnOk
text: catalog.i18nc("@action:button", "Ok")
text: catalog.i18nc("@action:button", "OK")
onClicked:
{
manualPrinterDialog.accept()