LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #23366

Browse source 
Yet another and probably still not the last...
This commit is contained in:
Joachim Schmitz 2013-11-11 11:31:25 +01:00
parent c9a9817b4b
commit a9afd48d2a
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/element.cpp
View file

@ -131,7 +131,7 @@ static const ElementName elementNames[] = {
ElementName("RehearsalMark", QT_TRANSLATE_NOOP("elementName", "Rehearsal Mark")),
ElementName("InstrumentChange", QT_TRANSLATE_NOOP("elementName", "Instrument Change")),
ElementName("Harmony", QT_TRANSLATE_NOOP("elementName", "Harmony")),
ElementName("FretDiagram", QT_TRANSLATE_NOOP("elementName", "Fret Diagram")),
ElementName("FretDiagram", QT_TRANSLATE_NOOP("elementName", "Fretboard Diagram")),
ElementName("Bend", QT_TRANSLATE_NOOP("elementName", "Bend")),
ElementName("TremoloBar", QT_TRANSLATE_NOOP("elementName", "TremoloBar")),
ElementName("Volta", QT_TRANSLATE_NOOP("elementName", "Volta")),

2
libmscore/harmony.cpp
View file

@ -307,7 +307,7 @@ void Harmony::read(XmlReader& e)
// TODO: now that we can render arbitrary chords,
// we could try to construct a full representation from a degree list.
// These will typically only exist for chords imported from MusicXML prior to MuseScore 2.0
// or constructed in the Chord Name Properties dialog.
// or constructed in the Chord Symbol Properties dialog.
if (_rootTpc != INVALID_TPC) {
if (_id > 0)

12
mscore/actions.cpp
View file

@ -1429,15 +1429,15 @@ Shortcut Shortcut::sc[] = {
STATE_NORMAL | STATE_NOTE_ENTRY,
0,
"chord-text",
QT_TRANSLATE_NOOP("action","Chord Name"),
QT_TRANSLATE_NOOP("action","Add chord name")
QT_TRANSLATE_NOOP("action","Chord Symbol"),
QT_TRANSLATE_NOOP("action","Add chord symbol")
),
Shortcut(
STATE_NORMAL | STATE_NOTE_ENTRY,
A_CMD,
"harmony-properties",
QT_TRANSLATE_NOOP("action","Chord Name Properties"),
QT_TRANSLATE_NOOP("action","Show properties for chord name")
QT_TRANSLATE_NOOP("action","Chord Symbol Properties"),
QT_TRANSLATE_NOOP("action","Show properties for chord symbol")
),
Shortcut(
STATE_NORMAL | STATE_NOTE_ENTRY,
@ -2458,13 +2458,13 @@ Shortcut Shortcut::sc[] = {
STATE_HARMONY_FIGBASS_EDIT,
0,
"prev-beat-TEXT",
QT_TRANSLATE_NOOP("action","Previous beat (Chord name)")
QT_TRANSLATE_NOOP("action","Previous beat (Chord symbol)")
),
Shortcut(
STATE_HARMONY_FIGBASS_EDIT,
0,
"next-beat-TEXT",
QT_TRANSLATE_NOOP("action","Next beat (Chord name)")
QT_TRANSLATE_NOOP("action","Next beat (Chord symbol)")
),
Shortcut(
STATE_NORMAL | STATE_NOTE_ENTRY,

2
mscore/chordedit.ui
View file

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>MuseScore: Chord Name Properties</string>
<string>MuseScore: Chord Symbol Properties</string>
</property>
<layout class="QGridLayout">
<item row="0" column="0" colspan="2">

6
mscore/menus.cpp
View file

@ -131,7 +131,7 @@ Palette* MuseScore::newBeamPalette()
Palette* MuseScore::newFramePalette()
{
Palette* sp = new Palette;
sp->setName(QT_TRANSLATE_NOOP("Palette", "Frames"));
sp->setName(QT_TRANSLATE_NOOP("Palette", "Frames && Measures"));
sp->setGrid(27, 40);
sp->setDrawGrid(true);
@ -493,7 +493,7 @@ Palette* MuseScore::newNoteHeadsPalette()
Palette* MuseScore::newArticulationsPalette()
{
Palette* sp = new Palette;
sp->setName(QT_TRANSLATE_NOOP("Palette", "Articulations"));
sp->setName(QT_TRANSLATE_NOOP("Palette", "Articulations && Ornaments"));
sp->setGrid(42, 25);
sp->setDrawGrid(true);
@ -939,7 +939,7 @@ Palette* MuseScore::newTextPalette()
Harmony* harmony = new Harmony(gscore);
harmony->setText("C7");
sp->append(harmony, tr("Chord Name"));
sp->append(harmony, tr("Chord Symbol"));
return sp;
}

2
mscore/propertymenu.cpp
View file

@ -299,7 +299,7 @@ void ScoreView::createElementPropertyMenu(Element* e, QMenu* popup)
else if (e->type() == Element::HARMONY) {
genPropertyMenu1(e, popup);
popup->addSeparator();
popup->addAction(tr("Chord Name Properties..."))->setData("ha-props");
popup->addAction(tr("Chord Symbol Properties..."))->setData("ha-props");
}
else if (e->type() == Element::INSTRUMENT_NAME) {
popup->addAction(tr("Staff Properties..."))->setData("staff-props");