3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into xray_in_solid_view

Browse source
This commit is contained in:
Ghostkeeper 2020-03-24 21:45:48 +01:00
commit 0150f37937
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
315 changed files with 33845 additions and 1731 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/Preferences/GeneralPage.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2018 Ultimaker B.V.
// Copyright (c) 2020 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.1
@ -12,7 +12,7 @@ import Cura 1.0 as Cura
UM.PreferencesPage
{
//: General configuration page title
title: catalog.i18nc("@title:tab","General")
title: catalog.i18nc("@title:tab", "General")
id: generalPreferencesPage
function setDefaultLanguage(languageCode)
@ -131,7 +131,7 @@ UM.PreferencesPage
Label
{
font.bold: true
text: catalog.i18nc("@label","Interface")
text: catalog.i18nc("@label", "Interface")
}
GridLayout
@ -142,7 +142,7 @@ UM.PreferencesPage
Label
{
id: languageLabel
text: catalog.i18nc("@label","Language:")
text: "Language:" //Don't translate this, to make it easier to find the language drop-down if you can't read the current language.
}
ComboBox
@ -154,6 +154,7 @@ UM.PreferencesPage
Component.onCompleted: {
append({ text: "English", code: "en_US" })
append({ text: "Czech", code: "cs_CZ" })
append({ text: "Deutsch", code: "de_DE" })
append({ text: "Español", code: "es_ES" })
//Finnish is disabled for being incomplete: append({ text: "Suomi", code: "fi_FI" })