Fix GH#19153: Differentiating the meanings os "Minor" and "Major"

See https://musescore.org/en/node/353937 and musescore#19153
Jojo-Schmitz · Aug 25, 2023 · 9c26fb4 · 9c26fb4
1 parent 9c1926a
commit 9c26fb4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/keysignatures/KeySignatureSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/keysignatures/KeySignatureSettings.qml
@@ -65,8 +65,10 @@ Column {
         model: [
             { text: qsTrc("inspector", "Unknown"), value: KeySignatureTypes.MODE_UNKNOWN },
             { text: qsTrc("inspector", "None"), value: KeySignatureTypes.MODE_NONE },
-            { text: qsTrc("inspector", "Major"), value: KeySignatureTypes.MODE_MAJOR },
-            { text: qsTrc("inspector", "Minor"), value: KeySignatureTypes.MODE_MINOR },
+            //: mode of a key signature, not an interval
+            { text: qsTrc("inspector", "Major", "key signature mode"), value: KeySignatureTypes.MODE_MAJOR },
+            //: mode of a key signature, not an interval
+            { text: qsTrc("inspector", "Minor", "key signature mode"), value: KeySignatureTypes.MODE_MINOR },
             { text: qsTrc("inspector", "Dorian"), value: KeySignatureTypes.MODE_DORIAN },
             { text: qsTrc("inspector", "Phrygian"), value: KeySignatureTypes.MODE_PHRYGIAN },
             { text: qsTrc("inspector", "Lydian"), value: KeySignatureTypes.MODE_LYDIAN },

diff --git a/src/inspector/view/qml/MuseScore/Inspector/notation/ornaments/OrnamentSettings.qml b/src/inspector/view/qml/MuseScore/Inspector/notation/ornaments/OrnamentSettings.qml
@@ -124,8 +124,10 @@ Column {
                 ] : [
                     { text: qsTrc("inspector", "Auto (diatonic)"), value: OrnamentTypes.TYPE_AUTO},
                     { text: qsTrc("inspector", "Augmented"), value: OrnamentTypes.TYPE_AUGMENTED},
-                    { text: qsTrc("inspector", "Major"), value: OrnamentTypes.TYPE_MAJOR},
-                    { text: qsTrc("inspector", "Minor"), value: OrnamentTypes.TYPE_MINOR},
+                    //: Interval, not the mode of a key signature
+                    { text: qsTrc("inspector", "Major", "interval quality"), value: OrnamentTypes.TYPE_MAJOR},
+                    //: Interval, not the mode of a key signature
+                    { text: qsTrc("inspector", "Minor", "interval quality"), value: OrnamentTypes.TYPE_MINOR},
                     { text: qsTrc("inspector", "Diminished"), value: OrnamentTypes.TYPE_DIMINISHED},
                 ]
 

diff --git a/src/project/qml/MuseScore/Project/internal/NewScore/KeySignatureSettings.qml b/src/project/qml/MuseScore/Project/internal/NewScore/KeySignatureSettings.qml
@@ -97,15 +97,17 @@ FlatButton {
 
                 StyledTabButton {
                     id: majorTab
-                    text: qsTrc("project/newscore", "Major")
+                    //: mode of a key signature, not an interval
+                    text: qsTrc("project/newscore", "Major", "key signature mode")
 
                     navigation.name: "MajorTab"
                     navigation.panel: bar.navigationPanel
                     navigation.column: 0
                 }
 
                 StyledTabButton {
-                    text: qsTrc("project/newscore", "Minor")
+                    //: mode of a key signature, not an interval
+                    text: qsTrc("project/newscore", "Minor", "key signature mode")
 
                     navigation.name: "MinorTab"
                     navigation.panel: bar.navigationPanel