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

Merge pull request #3986 from fieldOfView/fix_always_ask

Browse Source 
Clarify Profile Override preference options
This commit is contained in:
Mark 2018-07-02 16:43:20 +02:00 committed by GitHub
commit f3d92ecdbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -570,7 +570,7 @@ UM.PreferencesPage
Component.onCompleted: Component.onCompleted:
{ {
append({ text: catalog.i18nc("@option:openProject", "Always ask"), code: "always_ask" }) append({ text: catalog.i18nc("@option:openProject", "Always ask me this"), code: "always_ask" })
append({ text: catalog.i18nc("@option:openProject", "Always open as a project"), code: "open_as_project" }) append({ text: catalog.i18nc("@option:openProject", "Always open as a project"), code: "open_as_project" })
append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" }) append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" })
} }
@ -617,7 +617,12 @@ UM.PreferencesPage
Label Label
{ {
font.bold: true font.bold: true
text: catalog.i18nc("@label", "Override Profile") text: catalog.i18nc("@label", "Profiles")
}
Label
{
text: catalog.i18nc("@window:text", "Default behavior for changed setting values when switching to a different profile: ")
} }
ComboBox ComboBox
@ -632,8 +637,8 @@ UM.PreferencesPage
Component.onCompleted: Component.onCompleted:
{ {
append({ text: catalog.i18nc("@option:discardOrKeep", "Always ask me this"), code: "always_ask" }) append({ text: catalog.i18nc("@option:discardOrKeep", "Always ask me this"), code: "always_ask" })
append({ text: catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"), code: "always_discard" }) append({ text: catalog.i18nc("@option:discardOrKeep", "Always discard changed settings"), code: "always_discard" })
append({ text: catalog.i18nc("@option:discardOrKeep", "Keep and never ask again"), code: "always_keep" }) append({ text: catalog.i18nc("@option:discardOrKeep", "Always transfer changed settings to new profile"), code: "always_keep" })
} }
} }