Skip to content

Commit

Permalink
Merge pull request #5309 from Jojo-Schmitz/symUserNames
Browse files Browse the repository at this point in the history 
fix #294125: symUserNames and symNames out of sync
  • Loading branch information
@anatoly-os
anatoly-os committed Sep 7, 2019
2 parents 436ec48 + 10b9628 commit e36df56
Showing 1 changed file with 39 additions and 39 deletions.
78 changes: 39 additions & 39 deletions libmscore/sym.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3342,7 +3342,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
QT_TRANSLATE_NOOP("symUserNames", "Breath mark (upbow-like)"),
"Bridge clef",
"Buzz roll",
"C clef",
QT_TRANSLATE_NOOP("symUserNames", "C clef"),
"C clef ottava bassa",
"C clef, arrow down",
"C clef, arrow up",
Expand Down Expand Up @@ -3424,8 +3424,8 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"15 for clefs",
"8 for clefs",
"Combining clef change",
"Coda",
"Square coda",
QT_TRANSLATE_NOOP("symUserNames", "Coda"),
QT_TRANSLATE_NOOP("symUserNames", "Square coda"),
"Beat 2, compound time",
"Beat 2, simple time",
"Beat 3, compound time",
Expand Down Expand Up @@ -3487,7 +3487,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"ffff",
"fffff",
"ffffff",
"Forte",
QT_TRANSLATE_NOOP("symUserNames", "Forte"),
"Forte-piano",
"Forzando",
"Left bracket (for hairpins)",
Expand All @@ -3497,27 +3497,27 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"mf",
"mp",
"Messa di voce",
"Mezzo",
"Niente",
QT_TRANSLATE_NOOP("symUserNames", "Mezzo"),
QT_TRANSLATE_NOOP("symUserNames", "Niente"),
"Niente (for hairpins)",
"pf",
"pp",
"ppp",
"pppp",
"ppppp",
"pppppp",
"Piano",
"Rinforzando",
QT_TRANSLATE_NOOP("symUserNames", "Piano"),
QT_TRANSLATE_NOOP("symUserNames", "Rinforzando"),
"Rinforzando 1",
"Rinforzando 2",
"Sforzando",
QT_TRANSLATE_NOOP("symUserNames", "Sforzando"),
"Sforzando 1",
"Sforzando-pianissimo",
"Sforzando-piano",
"Sforzato",
"Sforzatissimo",
"Sforzato-piano",
"Z",
QT_TRANSLATE_NOOP("symUserNames", "Z"),
"Eight channels (7.1 surround)",
"Five channels",
"Four channels",
Expand Down Expand Up @@ -3583,7 +3583,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Volume level 40%",
"Volume level 60%",
"Volume level 80%",
"F clef",
QT_TRANSLATE_NOOP("symUserNames", "F clef"),
"F clef quindicesima alta",
"F clef quindicesima bassa",
"F clef ottava alta",
Expand Down Expand Up @@ -3741,7 +3741,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Function theory v",
"Function theory V",
"Function theory 0",
"G clef",
QT_TRANSLATE_NOOP("symUserNames", "G clef"),
"G clef quindicesima alta",
"G clef quindicesima bassa",
"G clef ottava alta",
Expand Down Expand Up @@ -4002,9 +4002,9 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Lute tablature staff, 6 courses",
"Lute tablature staff, 6 courses (narrow)",
"Lute tablature staff, 6 courses (wide)",
"Elision",
"Narrow elision",
"Wide elision",
QT_TRANSLATE_NOOP("symUserNames", "Elision"),
QT_TRANSLATE_NOOP("symUserNames", "Narrow elision"),
QT_TRANSLATE_NOOP("symUserNames", "Wide elision"),
"Baseline hyphen",
"Non-breaking baseline hyphen",
"Flat, hard b (mi)",
Expand Down Expand Up @@ -4163,30 +4163,30 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"White mensural maxima",
"White mensural minima",
"White mensural semiminima",
"Augmentation dot",
QT_TRANSLATE_NOOP("symUserNames", "Augmentation dot"),
"1024th note (semihemidemisemihemidemisemiquaver) stem down",
"1024th note (semihemidemisemihemidemisemiquaver) stem up",
"128th note (semihemidemisemiquaver) stem down",
"128th note (semihemidemisemiquaver) stem up",
QT_TRANSLATE_NOOP("symUserNames", "128th note (semihemidemisemiquaver) stem up"),
"16th note (semiquaver) stem down",
"16th note (semiquaver) stem up",
QT_TRANSLATE_NOOP("symUserNames", "16th note (semiquaver) stem up"),
"256th note (demisemihemidemisemiquaver) stem down",
"256th note (demisemihemidemisemiquaver) stem up",
"32nd note (demisemiquaver) stem down",
"32nd note (demisemiquaver) stem up",
QT_TRANSLATE_NOOP("symUserNames", "32nd note (demisemiquaver) stem up"),
"512th note (hemidemisemihemidemisemiquaver) stem down",
"512th note (hemidemisemihemidemisemiquaver) stem up",
"64th note (hemidemisemiquaver) stem down",
"64th note (hemidemisemiquaver) stem up",
QT_TRANSLATE_NOOP("symUserNames", "64th note (hemidemisemiquaver) stem up"),
"Eighth note (quaver) stem down",
"Eighth note (quaver) stem up",
QT_TRANSLATE_NOOP("symUserNames", "Eighth note (quaver) stem up"),
"Double whole note (breve)",
"Double whole note (square)",
"Half note (minim) stem down",
"Half note (minim) stem up",
QT_TRANSLATE_NOOP("symUserNames", "Half note (minim) stem up"),
"Quarter note (crotchet) stem down",
"Quarter note (crotchet) stem up",
"Whole note (semibreve)",
QT_TRANSLATE_NOOP("symUserNames", "Quarter note (crotchet) stem up"),
QT_TRANSLATE_NOOP("symUserNames", "Whole note (semibreve)"),
"Left-pointing arrow for metric modulation",
"Right-pointing arrow for metric modulation",
"Do not copy",
Expand Down Expand Up @@ -4903,37 +4903,37 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Quindicesima alta",
"Quindicesima bassa",
"Quindicesima bassa (mb)",
"Repeat last bar",
"Repeat last two bars",
"Repeat last four bars",
QT_TRANSLATE_NOOP("symUserNames", "Repeat last bar"),
QT_TRANSLATE_NOOP("symUserNames", "Repeat last two bars"),
QT_TRANSLATE_NOOP("symUserNames", "Repeat last four bars"),
"Single repeat dot",
"Repeat dots",
"Left (start) repeat sign",
"Right (end) repeat sign",
"Right and left repeat sign",
"1024th rest",
"128th (semihemidemisemiquaver) rest",
"16th (semiquaver) rest",
QT_TRANSLATE_NOOP("symUserNames", "128th (semihemidemisemiquaver) rest"),
QT_TRANSLATE_NOOP("symUserNames", "16th (semiquaver) rest"),
"256th rest",
"32nd (demisemiquaver) rest",
QT_TRANSLATE_NOOP("symUserNames", "32nd (demisemiquaver) rest"),
"512th rest",
"64th (hemidemisemiquaver) rest",
"Eighth (quaver) rest",
QT_TRANSLATE_NOOP("symUserNames", "64th (hemidemisemiquaver) rest"),
QT_TRANSLATE_NOOP("symUserNames", "Eighth (quaver) rest"),
"Double whole (breve) rest",
"Double whole rest on leger lines",
"Multiple measure rest",
"H-bar, left half",
"H-bar, middle",
"H-bar, right half",
"Half (minim) rest",
"Half rest on leger line",
QT_TRANSLATE_NOOP("symUserNames", "Half rest on leger line"),
"Longa rest",
"Maxima rest",
"Quarter (crotchet) rest",
QT_TRANSLATE_NOOP("symUserNames", "Quarter (crotchet) rest"),
"Old-style quarter (crotchet) rest",
"Z-style quarter (crotchet) rest",
"Whole (semibreve) rest",
"Whole rest on leger line",
QT_TRANSLATE_NOOP("symUserNames", "Whole rest on leger line"),
"Reversed brace",
"Reversed bracket bottom",
"Reversed bracket top",
Expand All @@ -4942,8 +4942,8 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Sch\u00e4ffer F clef to G clef change",
"Sch\u00e4ffer G clef to F clef change",
"Sch\u00e4ffer previous clef",
"Segno",
"Segno (serpent)",
QT_TRANSLATE_NOOP("symUserNames", "Segno"),
QT_TRANSLATE_NOOP("symUserNames", "Segno (serpent)"),
"Segno (serpent with vertical lines)",
"Semi-pitched percussion clef 1",
"Semi-pitched percussion clef 2",
Expand Down Expand Up @@ -5299,7 +5299,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
QT_TRANSLATE_NOOP("symUserNames", "Up prall"),
QT_TRANSLATE_NOOP("symUserNames", "Up mordent"),
QT_TRANSLATE_NOOP("symUserNames", "Prall down"),
QT_TRANSLATE_NOOP("symUserNames", "Down prall"),
// QT_TRANSLATE_NOOP("symUserNames", "Down prall"),
QT_TRANSLATE_NOOP("symUserNames", "Down mordent"),
QT_TRANSLATE_NOOP("symUserNames", "Prall up"),
QT_TRANSLATE_NOOP("symUserNames", "Line prall"),
Expand All @@ -5310,7 +5310,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"noteLongaDown",
"noteLongaSquareUp",
"noteLongaSquareDown",
"Space"
QT_TRANSLATE_NOOP("symUserNames", "Space")
} };

//---------------------------------------------------------
Expand Down

0 comments on commit e36df56

Please sign in to comment.