Fix merge conflicts with master

This commit is contained in:
Lipu Fei 2019-09-24 14:26:43 +02:00
commit 94e89ad4ac
89 changed files with 1283 additions and 928 deletions

View file

@ -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