Skip to content

Commit

Permalink
fix #29341, at least partial
Browse files Browse the repository at this point in the history 
but I think an update to/from Transifex is needed to make it work
  • Loading branch information
@Jojo-Schmitz
Jojo-Schmitz committed Aug 11, 2014
1 parent 0c44719 commit 1b996da
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 46 deletions.
64 changes: 31 additions & 33 deletions libmscore/accidental.cpp
View file
Expand Up @@ -36,41 +36,39 @@ struct Acc {
: tag(t), name(n), offset(o), centOffset(o2), sym(s) {}
};

#define TRA(x) QT_TRANSLATE_NOOP("accidental", x)
static Acc accList[] = {
Acc("none", TRA("none"), AccidentalVal::NATURAL, 0, SymId::noSym),
Acc("sharp", TRA("sharp"), AccidentalVal::SHARP, 0, SymId::accidentalSharp),
Acc("flat", TRA("flat"), AccidentalVal::FLAT, 0, SymId::accidentalFlat),
Acc("double sharp", TRA("double sharp"), AccidentalVal::SHARP2, 0, SymId::accidentalDoubleSharp),
Acc("double flat", TRA("double flat"), AccidentalVal::FLAT2, 0, SymId::accidentalDoubleFlat),
Acc("natural", TRA("natural"), AccidentalVal::NATURAL, 0, SymId::accidentalNatural),

Acc("flat-slash", TRA("flat-slash"), AccidentalVal::NATURAL, -50, SymId::accidentalBakiyeFlat),
Acc("flat-slash2", TRA("flat-slash2"), AccidentalVal::NATURAL, 0, SymId::accidentalBuyukMucennebFlat),
Acc("mirrored-flat2", TRA("mirrored-flat2"), AccidentalVal::NATURAL, -150, SymId::accidentalThreeQuarterTonesFlatZimmermann),
Acc("mirrored-flat", TRA("mirrored-flat"), AccidentalVal::NATURAL, -50, SymId::accidentalQuarterToneFlatStein),
Acc("mirrored-flat-slash", TRA("mirrored-flat-slash"), AccidentalVal::NATURAL, 0, SymId::noSym), //TODO-smufl
Acc("flat-flat-slash", TRA("flat-flat-slash"), AccidentalVal::NATURAL, -150, SymId::noSym), //TODO-smufl

Acc("sharp-slash", TRA("sharp-slash"), AccidentalVal::NATURAL, 50, SymId::accidentalQuarterToneSharpStein),
Acc("sharp-slash2", TRA("sharp-slash2"), AccidentalVal::NATURAL, 0, SymId::accidentalBuyukMucennebSharp),
Acc("sharp-slash3", TRA("sharp-slash3"), AccidentalVal::NATURAL, 0, SymId::accidentalKucukMucennebSharp),
Acc("sharp-slash4", TRA("sharp-slash4"), AccidentalVal::NATURAL, 150, SymId::accidentalThreeQuarterTonesSharpStein),

Acc("sharp arrow up", TRA("sharp arrow up"), AccidentalVal::NATURAL, 150, SymId::accidentalThreeQuarterTonesSharpArrowUp),
Acc("sharp arrow down", TRA("sharp arrow down"), AccidentalVal::NATURAL, 50, SymId::accidentalQuarterToneSharpArrowDown),
Acc("sharp arrow both", TRA("sharp arrow both"), AccidentalVal::NATURAL, 0, SymId::noSym), //TODO-smufl
Acc("flat arrow up", TRA("flat arrow up"), AccidentalVal::NATURAL, -50, SymId::accidentalQuarterToneFlatArrowUp),
Acc("flat arrow down", TRA("flat arrow down"), AccidentalVal::NATURAL, -150, SymId::accidentalThreeQuarterTonesFlatArrowDown),
Acc("flat arrow both", TRA("flat arrow both"), AccidentalVal::NATURAL, 0, SymId::noSym), //TODO-smufl
Acc("natural arrow up", TRA("natural arrow up"), AccidentalVal::NATURAL, 50, SymId::accidentalQuarterToneSharpNaturalArrowUp),
Acc("natural arrow down", TRA("natural arrow down"), AccidentalVal::NATURAL, -50, SymId::accidentalQuarterToneFlatNaturalArrowDown),
Acc("natural arrow both", TRA("natural arrow both"), AccidentalVal::NATURAL, 0, SymId::noSym), //TODO-smufl

Acc("sori", TRA("sori"), AccidentalVal::NATURAL, 50, SymId::accidentalSori),
Acc("koron", TRA("koron"), AccidentalVal::NATURAL, -50, SymId::accidentalKoron)
Acc("none", QT_TRANSLATE_NOOP("accidental", "none"), AccidentalVal::NATURAL, 0, SymId::noSym),
Acc("sharp", QT_TRANSLATE_NOOP("accidental", "sharp"), AccidentalVal::SHARP, 0, SymId::accidentalSharp),
Acc("flat", QT_TRANSLATE_NOOP("accidental", "flat"), AccidentalVal::FLAT, 0, SymId::accidentalFlat),
Acc("double sharp", QT_TRANSLATE_NOOP("accidental", "double sharp"), AccidentalVal::SHARP2, 0, SymId::accidentalDoubleSharp),
Acc("double flat", QT_TRANSLATE_NOOP("accidental", "double flat"), AccidentalVal::FLAT2, 0, SymId::accidentalDoubleFlat),
Acc("natural", QT_TRANSLATE_NOOP("accidental", "natural"), AccidentalVal::NATURAL, 0, SymId::accidentalNatural),

Acc("flat-slash", QT_TRANSLATE_NOOP("accidental", "flat-slash"), AccidentalVal::NATURAL, -50, SymId::accidentalBakiyeFlat),
Acc("flat-slash2", QT_TRANSLATE_NOOP("accidental", "flat-slash2"), AccidentalVal::NATURAL, 0, SymId::accidentalBuyukMucennebFlat),
Acc("mirrored-flat2", QT_TRANSLATE_NOOP("accidental", "mirrored-flat2"), AccidentalVal::NATURAL, -150, SymId::accidentalThreeQuarterTonesFlatZimmermann),
Acc("mirrored-flat", QT_TRANSLATE_NOOP("accidental", "mirrored-flat"), AccidentalVal::NATURAL, -50, SymId::accidentalQuarterToneFlatStein),
Acc("mirrored-flat-slash", QT_TRANSLATE_NOOP("accidental", "mirrored-flat-slash"), AccidentalVal::NATURAL, 0, SymId::noSym), //TODO-smufl
Acc("flat-flat-slash", QT_TRANSLATE_NOOP("accidental", "flat-flat-slash"), AccidentalVal::NATURAL, -150, SymId::noSym), //TODO-smufl

Acc("sharp-slash", QT_TRANSLATE_NOOP("accidental", "sharp-slash"), AccidentalVal::NATURAL, 50, SymId::accidentalQuarterToneSharpStein),
Acc("sharp-slash2", QT_TRANSLATE_NOOP("accidental", "sharp-slash2"), AccidentalVal::NATURAL, 0, SymId::accidentalBuyukMucennebSharp),
Acc("sharp-slash3", QT_TRANSLATE_NOOP("accidental", "sharp-slash3"), AccidentalVal::NATURAL, 0, SymId::accidentalKucukMucennebSharp),
Acc("sharp-slash4", QT_TRANSLATE_NOOP("accidental", "sharp-slash4"), AccidentalVal::NATURAL, 150, SymId::accidentalThreeQuarterTonesSharpStein),

Acc("sharp arrow up", QT_TRANSLATE_NOOP("accidental", "sharp arrow up"), AccidentalVal::NATURAL, 150, SymId::accidentalThreeQuarterTonesSharpArrowUp),
Acc("sharp arrow down", QT_TRANSLATE_NOOP("accidental", "sharp arrow down"), AccidentalVal::NATURAL, 50, SymId::accidentalQuarterToneSharpArrowDown),
Acc("sharp arrow both", QT_TRANSLATE_NOOP("accidental", "sharp arrow both"), AccidentalVal::NATURAL, 0, SymId::noSym), //TODO-smufl
Acc("flat arrow up", QT_TRANSLATE_NOOP("accidental", "flat arrow up"), AccidentalVal::NATURAL, -50, SymId::accidentalQuarterToneFlatArrowUp),
Acc("flat arrow down", QT_TRANSLATE_NOOP("accidental", "flat arrow down"), AccidentalVal::NATURAL, -150, SymId::accidentalThreeQuarterTonesFlatArrowDown),
Acc("flat arrow both", QT_TRANSLATE_NOOP("accidental", "flat arrow both"), AccidentalVal::NATURAL, 0, SymId::noSym), //TODO-smufl
Acc("natural arrow up", QT_TRANSLATE_NOOP("accidental", "natural arrow up"), AccidentalVal::NATURAL, 50, SymId::accidentalQuarterToneSharpNaturalArrowUp),
Acc("natural arrow down", QT_TRANSLATE_NOOP("accidental", "natural arrow down"), AccidentalVal::NATURAL, -50, SymId::accidentalQuarterToneFlatNaturalArrowDown),
Acc("natural arrow both", QT_TRANSLATE_NOOP("accidental", "natural arrow both"), AccidentalVal::NATURAL, 0, SymId::noSym), //TODO-smufl

Acc("sori", QT_TRANSLATE_NOOP("accidental", "sori"), AccidentalVal::NATURAL, 50, SymId::accidentalSori),
Acc("koron", QT_TRANSLATE_NOOP("accidental", "koron"), AccidentalVal::NATURAL, -50, SymId::accidentalKoron)
};
#undef TRA

//---------------------------------------------------------
// Accidental
Expand Down
10 changes: 5 additions & 5 deletions libmscore/articulation.cpp
View file
Expand Up @@ -55,9 +55,9 @@ ArticulationInfo Articulation::articulationList[int(ArticulationType::ARTICULATI
1.0, ArticulationShowIn::PITCHED_STAFF | ArticulationShowIn::TABLATURE
},
// <> not available in smufl?
// { esprSym, esprSym ,
// { SymId::esprSym, SymId::esprSym ,
// "espressivo", QT_TRANSLATE_NOOP("articulation", "espressivo"),
// 1.0,ArticulationShowIn::PITCHED_STAFF | ArticulationShowIn::TABLATURE
// 1.0, ArticulationShowIn::PITCHED_STAFF | ArticulationShowIn::TABLATURE
// },
{ SymId::articStaccatoAbove, SymId::articStaccatoBelow,
"staccato", QT_TRANSLATE_NOOP("articulation", "staccato"),
Expand Down Expand Up @@ -169,15 +169,15 @@ ArticulationInfo Articulation::articulationList[int(ArticulationType::ARTICULATI
},

#if 0
{ letterTSym, letterTSym,
{ SymId::letterTSym, SymId::letterTSym,
"tapping", QT_TRANSLATE_NOOP("articulation", "tapping"),
1.0, ArticulationShowIn::TABLATURE
},
{ letterSSym, letterSSym,
{ SymId::letterSSym, SymId::letterSSym,
"slapping", QT_TRANSLATE_NOOP("articulation", "slapping"),
1.0, ArticulationShowIn::TABLATURE
},
{ letterPSym, letterPSym,
{ SymId::letterPSym, SymId::letterPSym,
"popping", QT_TRANSLATE_NOOP("articulation", "popping"),
1.0, ArticulationShowIn::TABLATURE
},
Expand Down
1 change: 0 additions & 1 deletion libmscore/clef.cpp
View file
Expand Up @@ -54,7 +54,6 @@ const ClefInfo ClefInfo::clefTable[] = {
{ "PERC2","percussion",2, 0, 45, { 0, 3,-1, 2, 5, 1, 4, 4, 1, 5, 2, 6, 3, 7 }, QT_TRANSLATE_NOOP("clefTable", "Percussion"), StaffGroup::PERCUSSION}, // PERC2 placeholder
{ "TAB2", "TAB", 5, 0, 0, { 0, 3,-1, 2, 5, 1, 4, 4, 1, 5, 2, 6, 3, 7 }, QT_TRANSLATE_NOOP("clefTable", "Tablature2"), StaffGroup::TAB },
};
#undef TR

//---------------------------------------------------------
// tag2type
Expand Down
2 changes: 1 addition & 1 deletion libmscore/tremolo.cpp
View file
Expand Up @@ -339,7 +339,7 @@ Fraction Tremolo::tremoloLen() const

QString Tremolo::subtypeName() const
{
return tr(tremoloName[subtype() - int(TremoloType::R8)]);
return tremoloName[subtype() - int(TremoloType::R8)];
}

}
Expand Down
12 changes: 6 additions & 6 deletions mscore/menus.cpp
View file
Expand Up @@ -221,16 +221,16 @@ Palette* MuseScore::newKeySigPalette()
for (int i = 0; i < 7; ++i) {
KeySig* k = new KeySig(gscore);
k->setKey(Key(i + 1));
sp->append(k, keyNames[i*2]);
sp->append(k, qApp->translate("MuseScore", keyNames[i*2]));
}
for (int i = -7; i < 0; ++i) {
KeySig* k = new KeySig(gscore);
k->setKey(Key(i));
sp->append(k, keyNames[(7 + i) * 2 + 1]);
sp->append(k, qApp->translate("MuseScore", keyNames[(7 + i) * 2 + 1]));
}
KeySig* k = new KeySig(gscore);
k->setKey(Key::C);
sp->append(k, keyNames[14]);
sp->append(k, qApp->translate("MuseScore", keyNames[14]));
return sp;
}

Expand All @@ -257,15 +257,15 @@ Palette* MuseScore::newAccidentalsPalette(bool basic)
for (auto i : types) {
Accidental* s = new Accidental(gscore);
s->setAccidentalType(Accidental::Type(i));
sp->append(s, s->subtypeUserName());
sp->append(s, qApp->translate("accidental", s->subtypeUserName()));
}
}
else {
for (int i = int(Accidental::Type::SHARP); i < int(Accidental::Type::END); ++i) {
Accidental* s = new Accidental(gscore);
s->setAccidentalType(Accidental::Type(i));
if (s->symbol() != SymId::noSym)
sp->append(s, s->subtypeUserName());
sp->append(s, qApp->translate("accidental", s->subtypeUserName()));
else
delete s;
}
Expand Down Expand Up @@ -487,7 +487,7 @@ Palette* MuseScore::newTremoloPalette()
for (int i = int(TremoloType::R8); i <= int(TremoloType::C64); ++i) {
Tremolo* tremolo = new Tremolo(gscore);
tremolo->setTremoloType(TremoloType(i));
sp->append(tremolo, tremolo->subtypeName());
sp->append(tremolo, qApp->translate("Tremolo", qPrintable(tremolo->subtypeName())));
}
return sp;
}
Expand Down

0 comments on commit 1b996da

Please sign in to comment.