Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix translatable texts #6369

Merged
merged 1 commit into from
Aug 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libmscore/note.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3157,8 +3157,8 @@ QString Note::accessibleInfo() const
pitchName = qApp->translate("drumset", drumset->name(pitch()).toUtf8().constData());
} else if (staff()->isTabStaff(tick())) {
pitchName
= QObject::tr("%1; String %2; Fret %3").arg(tpcUserName(false)).arg(QString::number(string() + 1)).arg(QString::number(
fret()));
= QObject::tr("%1; String: %2; Fret: %3").arg(tpcUserName(false)).arg(QString::number(string() + 1)).arg(QString::number(
fret()));
} else {
pitchName = tpcUserName(false);
}
Expand Down Expand Up @@ -3190,8 +3190,8 @@ QString Note::screenReaderInfo() const
} else if (staff()->isDrumStaff(tick()) && drumset) {
pitchName = qApp->translate("drumset", drumset->name(pitch()).toUtf8().constData());
} else if (staff()->isTabStaff(tick())) {
pitchName = QObject::tr("%1 String %2 Fret %3").arg(tpcUserName(true)).arg(QString::number(string() + 1)).arg(QString::number(
fret()));
pitchName = QObject::tr("%1 String: %2 Fret: %3").arg(tpcUserName(true)).arg(QString::number(string() + 1)).arg(QString::number(
fret()));
} else {
pitchName = tpcUserName(true);
}
Expand Down
12 changes: 6 additions & 6 deletions mscore/editstyle.ui
Original file line number Diff line number Diff line change
Expand Up @@ -4285,7 +4285,7 @@
<item row="1" column="5">
<widget class="QToolButton" name="resetMMRestNumberMaskHBar">
<property name="text">
<string>...</string>
<string notr="true">…</string>
</property>
<property name="icon">
<iconset>
Expand Down Expand Up @@ -4316,7 +4316,7 @@
<item row="2" column="2">
<widget class="QToolButton" name="resetMMRestHBarThickness">
<property name="text">
<string notr="true">...</string>
<string notr="true"></string>
</property>
<property name="icon">
<iconset>
Expand Down Expand Up @@ -4387,7 +4387,7 @@
<item row="3" column="2">
<widget class="QToolButton" name="resetMMRestHBarVStrokeThickness">
<property name="text">
<string>...</string>
<string notr="true">…</string>
</property>
<property name="icon">
<iconset>
Expand Down Expand Up @@ -4418,7 +4418,7 @@
<item row="3" column="5">
<widget class="QToolButton" name="resetMMRestHBarVStrokeHeight">
<property name="text">
<string>...</string>
<string notr="true">…</string>
</property>
<property name="icon">
<iconset>
Expand Down Expand Up @@ -4461,7 +4461,7 @@
<item row="0" column="2">
<widget class="QToolButton" name="resetMMRestOldStyleMaxMeasures">
<property name="text">
<string>...</string>
<string notr="true">…</string>
</property>
<property name="icon">
<iconset>
Expand Down Expand Up @@ -4495,7 +4495,7 @@
<item row="1" column="2">
<widget class="QToolButton" name="resetMMRestOldStyleSpacing">
<property name="text">
<string>...</string>
<string notr="true">…</string>
</property>
<property name="icon">
<iconset>
Expand Down
2 changes: 1 addition & 1 deletion mscore/mixer/mixerdetails.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ void MixerDetails::updateFromTrack()
tb->setText(QString("%1").arg(voice + 1));
tb->setCheckable(true);
tb->setChecked(!staff->playbackVoice(voice));
tb->setToolTip(QString(tr("Staff #%1")).arg(staffIdx + 1));
tb->setToolTip(QString(tr("Staff %1")).arg(staffIdx + 1));

mutePerVoiceGrid->addWidget(tb, staffIdx, voice);
MixerDetailsVoiceButtonHandler* handler
Expand Down
2 changes: 1 addition & 1 deletion mscore/scoreaccessibility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ void ScoreAccessibility::currentInfoChanged()
QString optimizedStaff = "";
if (e->staffIdx() + 1) {
_oldStaff = e->staffIdx();
staff = tr("Staff %1").arg(QString::number(e->staffIdx() + 1));
staff = tr("Staff: %1").arg(QString::number(e->staffIdx() + 1));
QString staffName = e->staff()->part()->longName(e->tick());
if (staffName.isEmpty()) {
staffName = e->staff()->partName();
Expand Down