Skip to content

Commit ad4a4d2

Browse files
committed
Fix #321767: Delete/rename/move/clarify the "Open" column of "String Data"
and some fixes for translatable texts as well as a minor and non-consequential typo and code style issue
1 parent ffc2b9b commit ad4a4d2

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

mscore/editstringdata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, in
3737
_strings = strings;
3838
QStringList hdrLabels;
3939
int numOfStrings = _strings->size();
40-
hdrLabels << tr("Open", "string data") << tr("Pitch", "string data");
40+
hdrLabels << tr("Unfingered", "string data") << tr("Pitch", "string data");
4141
stringList->setHorizontalHeaderLabels(hdrLabels);
4242
stringList->setRowCount(numOfStrings);
4343
// if any string, insert into string list control and select the first one

mscore/editstringdata.ui

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,17 @@
2727
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0">
2828
<item>
2929
<widget class="QTableWidget" name="stringList">
30-
<attribute name="horizontalHeaderDefaultSectionSize">
31-
<number>50</number>
32-
</attribute>
3330
<attribute name="horizontalHeaderStretchLastSection">
3431
<bool>true</bool>
3532
</attribute>
3633
<column>
3734
<property name="text">
38-
<string>Open</string>
35+
<string notr="true">Unfingered</string>
3936
</property>
4037
</column>
4138
<column>
4239
<property name="text">
43-
<string>Pitch</string>
40+
<string notr="true">Pitch</string>
4441
</property>
4542
</column>
4643
</widget>

mscore/editstyle.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6565,7 +6565,7 @@ By default, they will be placed such as that their right end are at the same lev
65656565
<item row="3" column="0" colspan="3">
65666566
<widget class="QCheckBox" name="arpeggioHiddenInStdIfTab">
65676567
<property name="text">
6568-
<string>Do not show arpeggio in standard notation when displayed in tablature</string>
6568+
<string>Do not show arpeggios in standard notation when displayed in tablature</string>
65696569
</property>
65706570
</widget>
65716571
</item>

mscore/updatechecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ namespace Ms {
3434

3535
static int defaultPeriod()
3636
{
37-
int result = 24;
38-
if(qApp->applicationName() == "MuseScore2"){ //avoid nightly cymbals
37+
int result = 24; // hours
38+
if (qApp->applicationName() == "MuseScore3") { //avoid nightly cymbals
3939
if (MuseScore::unstable())
4040
result = 24;
4141
else

share/instruments/instruments.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6213,7 +6213,7 @@
62136213
<Instrument id="bass-drum">
62146214
<family>drums</family>
62156215
<longName>Concert Bass Drum</longName>
6216-
<shortName>Con. BD</shortName>
6216+
<shortName>Con. B.D.</shortName>
62176217
<description>Bass Drum</description>
62186218
<musicXMLid>drum.bass-drum</musicXMLid>
62196219
<clef>PERC</clef>

share/instruments/instrumentsxml.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ QT_TRANSLATE_NOOP3("InstrumentsXML", "D. Set", "Drumset"),
926926
QT_TRANSLATE_NOOP("InstrumentsXML", "Concert Snare Drum"),
927927
QT_TRANSLATE_NOOP3("InstrumentsXML", "Con. Sn.", "Concert Snare Drum"),
928928
QT_TRANSLATE_NOOP("InstrumentsXML", "Concert Bass Drum"),
929-
QT_TRANSLATE_NOOP3("InstrumentsXML", "Con. BD", "Concert Bass Drum"),
929+
QT_TRANSLATE_NOOP3("InstrumentsXML", "Con. B.D.", "Concert Bass Drum"),
930930
QT_TRANSLATE_NOOP("InstrumentsXML", "Piccolo Snare"),
931931
QT_TRANSLATE_NOOP3("InstrumentsXML", "Picc. Sn.", "Piccolo Snare"),
932932
QT_TRANSLATE_NOOP("InstrumentsXML", "Field Drum"),

0 commit comments

Comments
 (0)