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

Merge branch 'master' into replace_controls_1_for_controls_2

Browse source 
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
This commit is contained in:
Ghostkeeper 2022-01-18 17:17:10 +01:00
commit e0a6cb3383
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
50 changed files with 1911 additions and 3002 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// Copyright (c) 2020 Ultimaker B.V.
// Copyright (c) 2022 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -16,6 +16,8 @@ UM.PreferencesPage
title: catalog.i18nc("@title:tab", "General")
id: generalPreferencesPage
width: parent.width
function setDefaultLanguage(languageCode)
{
//loops through the languageList and sets the language using the languageCode
@ -127,14 +129,14 @@ UM.PreferencesPage
ScrollView
{
id: preferencesScrollView
width: parent.width
height: parent.height
Column
{
//: Language selection label
UM.I18nCatalog{id: catalog; name: "cura"}
width: preferencesScrollView.viewport.width
Label
{
@ -161,7 +163,7 @@ UM.PreferencesPage
Component.onCompleted:
{
append({ text: "English", code: "en_US" })
// append({ text: "Čeština", code: "cs_CZ" })
append({ text: "Čeština", 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" })
@ -211,7 +213,7 @@ UM.PreferencesPage
Label
{
id: currencyLabel
text: catalog.i18nc("@label","Currency:")
text: catalog.i18nc("@label", "Currency:")
}
TextField