GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 10:06:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4'

Browse Source
This commit is contained in:
Ghostkeeper 2017-01-07 19:20:22 +01:00
commit 6f7de84af0
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
5 changed files with 11360 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3546
resources/i18n/ru/cura.po Normal file
View File

File diff suppressed because it is too large Load Diff

2417
resources/i18n/ru/fdmextruder.def.json.po Normal file
View File

File diff suppressed because it is too large Load Diff

5395
resources/i18n/ru/fdmprinter.def.json.po Normal file
View File

File diff suppressed because it is too large Load Diff

1
resources/qml/Preferences/GeneralPage.qml
View File

@ -97,6 +97,7 @@ UM.PreferencesPage
append({ text: "Français", code: "fr" })
append({ text: "Italiano", code: "it" })
append({ text: "Nederlands", code: "nl" })
append({ text: "Русский", code: "ru" })
append({ text: "Türkçe", code: "tr" })
}
}

2
resources/qml/Settings/SettingView.qml
View File

@ -167,7 +167,7 @@ Item
id: definitionsModel;
containerId: Cura.MachineManager.activeDefinitionId
visibilityHandler: UM.SettingPreferenceVisibilityHandler { }
exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order"] // TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false.
exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order", "support_mesh", "anti_overhang_mesh"] // TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false.
expanded: Printer.expandedCategories
onExpandedChanged:
{