From 1b996da850741819b85c52d25df9e9bc1bcdec71 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Mon, 11 Aug 2014 15:30:54 +0200 Subject: [PATCH] fix #29341, at least partial but I think an update to/from Transifex is needed to make it work --- libmscore/accidental.cpp | 64 ++++++++++++++++++-------------------- libmscore/articulation.cpp | 10 +++--- libmscore/clef.cpp | 1 - libmscore/tremolo.cpp | 2 +- mscore/menus.cpp | 12 +++---- 5 files changed, 43 insertions(+), 46 deletions(-) diff --git a/libmscore/accidental.cpp b/libmscore/accidental.cpp index f5fe1d6ed519..05da6e0edd04 100644 --- a/libmscore/accidental.cpp +++ b/libmscore/accidental.cpp @@ -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 diff --git a/libmscore/articulation.cpp b/libmscore/articulation.cpp index 66fa8a8807cc..6e7f074818ec 100644 --- a/libmscore/articulation.cpp +++ b/libmscore/articulation.cpp @@ -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"), @@ -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 }, diff --git a/libmscore/clef.cpp b/libmscore/clef.cpp index c579d97f4d90..ff5cd4f9a186 100644 --- a/libmscore/clef.cpp +++ b/libmscore/clef.cpp @@ -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 diff --git a/libmscore/tremolo.cpp b/libmscore/tremolo.cpp index 12a7236f11f2..1b83ccee33ca 100644 --- a/libmscore/tremolo.cpp +++ b/libmscore/tremolo.cpp @@ -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)]; } } diff --git a/mscore/menus.cpp b/mscore/menus.cpp index 5284d6c941b7..5d54205b6424 100644 --- a/mscore/menus.cpp +++ b/mscore/menus.cpp @@ -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; } @@ -257,7 +257,7 @@ 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 { @@ -265,7 +265,7 @@ Palette* MuseScore::newAccidentalsPalette(bool basic) 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; } @@ -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; }