fix #276425: Spurious characters in Begin/End hook's dropdown

and Staff text change text's Notehead scheme drop down
musescore · Sep 23, 2018 · 6d7667d · 6d7667d
1 parent 38887a7
commit 6d7667d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libmscore/stafftype.cpp b/libmscore/stafftype.cpp
@@ -1346,8 +1346,8 @@ static NoteHeadSchemeName noteHeadSchemeNames[] = {
       {"normal",              QT_TRANSLATE_NOOP("noteheadschemes", "Normal") },
       {"name-pitch",          QT_TRANSLATE_NOOP("noteheadschemes", "Pitch Name") },
       {"name-pitch-german",   QT_TRANSLATE_NOOP("noteheadschemes", "German Pitch Name") },
-      {"solfege-movable",     QT_TRANSLATE_NOOP("noteheadschemes", "Solfège Movable Do") },
-      {"solfege-fixed",       QT_TRANSLATE_NOOP("noteheadschemes", "Solfège Fixed Do") },
+      {"solfege-movable",     QT_TRANSLATE_NOOP("noteheadschemes", "Solf\u00e8ge Movable Do") }, // &egrave;
+      {"solfege-fixed",       QT_TRANSLATE_NOOP("noteheadschemes", "Solf\u00e8ge Fixed Do") },   // &egrave;
       {"shape-4",             QT_TRANSLATE_NOOP("noteheadschemes", "4-shape (Walker)") },
       {"shape-7-aikin",       QT_TRANSLATE_NOOP("noteheadschemes", "7-shape (Aikin)") },
       {"shape-7-funk",        QT_TRANSLATE_NOOP("noteheadschemes", "7-shape (Funk)") },

diff --git a/mscore/inspector/inspectorTextLineBase.cpp b/mscore/inspector/inspectorTextLineBase.cpp
@@ -25,9 +25,9 @@ void populateHookType(QComboBox* b)
       {
       b->clear();
       b->addItem(b->QObject::tr("None"), int(HookType::NONE));
-      b->addItem(b->QObject::tr("90°"), int(HookType::HOOK_90));
-      b->addItem(b->QObject::tr("45°"), int(HookType::HOOK_45));
-      b->addItem(b->QObject::tr("90° centered"), int(HookType::HOOK_90T));
+      b->addItem(b->QObject::tr("90\u00b0"), int(HookType::HOOK_90)); // &deg;
+      b->addItem(b->QObject::tr("45\u00b0"), int(HookType::HOOK_45)); // &deg;
+      b->addItem(b->QObject::tr("90\u00b0 centered"), int(HookType::HOOK_90T)); // &deg;
       }
 
 //---------------------------------------------------------