mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 23:17:32 -06:00
Fix merge conflicts with master
This commit is contained in:
commit
94e89ad4ac
89 changed files with 1283 additions and 928 deletions
|
@ -128,7 +128,7 @@ Item
|
|||
TableViewColumn
|
||||
{
|
||||
role: "print_core"
|
||||
title: catalog.i18nc("@label:table_header", "Print Core")
|
||||
title: "Print Core" //This term should not be translated.
|
||||
width: Math.floor(table.width * 0.2)
|
||||
}
|
||||
TableViewColumn
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue