From 322d12a99e2cf9034f4ad4f6e864cdea306046e8 Mon Sep 17 00:00:00 2001
From: Casper Jeukendrup <48658420+cbjeukendrup@users.noreply.github.com>
Date: Tue, 19 Jul 2022 00:52:56 +0200
Subject: [PATCH] Improve some translatable strings in "engraving"
---
src/engraving/engravingerrors.h | 14 ++++++++------
src/engraving/libmscore/ambitus.cpp | 9 ++++-----
src/engraving/libmscore/barline.cpp | 4 ++--
src/engraving/libmscore/chordrest.cpp | 10 +++++-----
src/engraving/libmscore/engravingitem.cpp | 2 +-
src/engraving/libmscore/instrchange.cpp | 1 +
src/engraving/libmscore/note.cpp | 8 ++++----
src/engraving/libmscore/segment.cpp | 7 ++++---
8 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/engraving/engravingerrors.h b/src/engraving/engravingerrors.h
index cd6f19f78a..737a3a47eb 100644
--- a/src/engraving/engravingerrors.h
+++ b/src/engraving/engravingerrors.h
@@ -71,22 +71,24 @@ inline Ret make_ret(Err err, const io::path_t& filePath = "")
text = mtrc("engraving", "Unknown filetype");
break;
case Err::FileTooOld:
- text = mtrc("engraving", "It was last saved with a version older than 2.0.0.\n"
- "You can convert this score by opening and then\n"
- "saving with MuseScore version 2.x.\n"
+ //: The text between %1 and %2 will be a clickable link.
+ text = mtrc("engraving", "It was last saved with a version older than 2.0.0. "
+ "You can convert this score by opening and then "
+ "saving with MuseScore version 2.x. "
"Visit the %1MuseScore download page%2 to obtain such a 2.x version.")
.arg(u"", u"");
break;
case Err::FileTooNew:
- text = mtrc("engraving", "This score was saved using a newer version of MuseScore.\n "
+ //: The text between %1 and %2 will be a clickable link.
+ text = mtrc("engraving", "This score was saved using a newer version of MuseScore. "
"Visit the %1MuseScore website%2 to obtain the latest version.")
.arg(u"", u"");
break;
case Err::FileOld300Format:
- text = mtrc("engraving", "It was last saved with a developer version of 3.0.");
+ text = mtrc("engraving", "It was last saved with a development version of 3.0.");
break;
case Err::FileCorrupted:
- text = mtrc("engraving", "File \"%1\" corrupted.").arg(filePath.toString());
+ text = mtrc("engraving", "File \"%1\" is corrupted.").arg(filePath.toString());
break;
case Err::FileCriticalCorrupted:
text = mtrc("engraving", "File \"%1\" is critically corrupted and cannot be processed.").arg(filePath.toString());
diff --git a/src/engraving/libmscore/ambitus.cpp b/src/engraving/libmscore/ambitus.cpp
index 12ea41ca9f..9edf50109e 100644
--- a/src/engraving/libmscore/ambitus.cpp
+++ b/src/engraving/libmscore/ambitus.cpp
@@ -858,10 +858,9 @@ EngravingItem* Ambitus::prevSegmentElement()
String Ambitus::accessibleInfo() const
{
- return mtrc("engraving", "%1; Top pitch: %2%3; Bottom pitch: %4%5")
- .arg(EngravingItem::accessibleInfo(), tpc2name(topTpc(), NoteSpellingType::STANDARD, NoteCaseType::AUTO, false),
- String::number(topOctave()), tpc2name(bottomTpc(), NoteSpellingType::STANDARD, NoteCaseType::AUTO, false),
- String::number(bottomOctave())
- );
+ return EngravingItem::accessibleInfo() + u"; "
+ + mtrc("engraving", "Top pitch: %1; Bottom pitch: %2")
+ .arg(tpc2name(topTpc(), NoteSpellingType::STANDARD, NoteCaseType::AUTO, false) + String::number(topOctave()),
+ tpc2name(bottomTpc(), NoteSpellingType::STANDARD, NoteCaseType::AUTO, false) + String::number(bottomOctave()));
}
}
diff --git a/src/engraving/libmscore/barline.cpp b/src/engraving/libmscore/barline.cpp
index 377ac52c49..4204b15223 100644
--- a/src/engraving/libmscore/barline.cpp
+++ b/src/engraving/libmscore/barline.cpp
@@ -1658,10 +1658,10 @@ String BarLine::accessibleExtraInfo() const
}
if (s->type() == ElementType::VOLTA) {
if (s->tick() == tick) {
- rez = mtrc("engraving", "%1 Start of %2").arg(rez, s->screenReaderInfo());
+ rez += u"; " + mtrc("engraving", "Start of %1").arg(s->screenReaderInfo());
}
if (s->tick2() == tick) {
- rez = mtrc("engraving", "%1 End of %2").arg(rez, s->screenReaderInfo());
+ rez += u"; " + mtrc("engraving", "End of %1").arg(s->screenReaderInfo());
}
}
}
diff --git a/src/engraving/libmscore/chordrest.cpp b/src/engraving/libmscore/chordrest.cpp
index 07ac6dbf90..4cd9d04efd 100644
--- a/src/engraving/libmscore/chordrest.cpp
+++ b/src/engraving/libmscore/chordrest.cpp
@@ -1242,20 +1242,20 @@ String ChordRest::accessibleExtraInfo() const
if (s->type() == ElementType::SLUR) {
if (s->tick() == tick() && s->track() == track()) {
- rez = mtrc("engraving", "%1 Start of %2").arg(rez, s->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "Start of %1").arg(s->screenReaderInfo());
}
if (s->tick2() == tick() && s->track2() == track()) {
- rez = mtrc("engraving", "%1 End of %2").arg(rez, s->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "End of %1").arg(s->screenReaderInfo());
}
} else if (s->staffIdx() == staffIdx()) {
bool start = s->tick() == tick();
bool end = s->tick2() == tick() + ticks();
if (start && end) {
- rez = mtrc("engraving", "%1 Start and end of %2").arg(rez, s->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "Start and end of %1").arg(s->screenReaderInfo());
} else if (start) {
- rez = mtrc("engraving", "%1 Start of %2").arg(rez, s->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "Start of %1").arg(s->screenReaderInfo());
} else if (end) {
- rez = mtrc("engraving", "%1 End of %2").arg(rez, s->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "End of %1").arg(s->screenReaderInfo());
}
}
}
diff --git a/src/engraving/libmscore/engravingitem.cpp b/src/engraving/libmscore/engravingitem.cpp
index 52e08fb2cf..4e5e9aa882 100644
--- a/src/engraving/libmscore/engravingitem.cpp
+++ b/src/engraving/libmscore/engravingitem.cpp
@@ -2765,7 +2765,7 @@ String EngravingItem::formatBarsAndBeats() const
result = mtrc("engraving", "Measure: %1").arg(barbeat.first);
if (!RealIsNull(barbeat.second)) {
- result += mtrc("engraving", "; Beat: %1").arg(barbeat.second);
+ result += u"; " + mtrc("engraving", "Beat: %1").arg(barbeat.second);
}
}
diff --git a/src/engraving/libmscore/instrchange.cpp b/src/engraving/libmscore/instrchange.cpp
index b855688ecc..a41bd099e4 100644
--- a/src/engraving/libmscore/instrchange.cpp
+++ b/src/engraving/libmscore/instrchange.cpp
@@ -139,6 +139,7 @@ void InstrumentChange::setupInstrument(const Instrument* instrument)
score()->transpositionChanged(part, oldV, tickStart, tickEnd);
}
+ //: The text of an "instrument change" marking. It is an instruction to the player to switch to another instrument.
const String newInstrChangeText = mtrc("engraving", "To %1").arg(instrument->trackName());
undoChangeProperty(Pid::TEXT, TextBase::plainToXmlText(newInstrChangeText));
}
diff --git a/src/engraving/libmscore/note.cpp b/src/engraving/libmscore/note.cpp
index 533042c952..8652e2e777 100644
--- a/src/engraving/libmscore/note.cpp
+++ b/src/engraving/libmscore/note.cpp
@@ -3356,11 +3356,11 @@ String Note::accessibleExtraInfo() const
}
}
if (tieFor()) {
- rez = mtrc("engraving", "%1 Start of %2").arg(rez, tieFor()->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "Start of %1").arg(tieFor()->screenReaderInfo());
}
if (tieBack()) {
- rez = mtrc("engraving", "%1 End of %2").arg(rez, tieBack()->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "End of %1").arg(tieBack()->screenReaderInfo());
}
if (!spannerFor().empty()) {
@@ -3368,7 +3368,7 @@ String Note::accessibleExtraInfo() const
if (!score()->selectionFilter().canSelect(s)) {
continue;
}
- rez = mtrc("engraving", "%1 Start of %2").arg(rez, s->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "Start of %1").arg(s->screenReaderInfo());
}
}
if (!spannerBack().empty()) {
@@ -3376,7 +3376,7 @@ String Note::accessibleExtraInfo() const
if (!score()->selectionFilter().canSelect(s)) {
continue;
}
- rez = mtrc("engraving", "%1 End of %2").arg(rez, s->screenReaderInfo());
+ rez += u" " + mtrc("engraving", "End of %1").arg(s->screenReaderInfo());
}
}
diff --git a/src/engraving/libmscore/segment.cpp b/src/engraving/libmscore/segment.cpp
index c287ea79c6..2988f88703 100644
--- a/src/engraving/libmscore/segment.cpp
+++ b/src/engraving/libmscore/segment.cpp
@@ -2191,7 +2191,7 @@ String Segment::accessibleExtraInfo() const
}
if (s->tick() == tick()) {
- startSpanners += mtrc("engraving", "Start of %1").arg(s->accessibleInfo());
+ startSpanners += u" " + mtrc("engraving", "Start of %1").arg(s->accessibleInfo());
}
const Segment* seg = 0;
@@ -2206,10 +2206,11 @@ String Segment::accessibleExtraInfo() const
}
if (seg && s->tick2() == seg->tick()) {
- endSpanners += mtrc("engraving", "End of %1").arg(s->accessibleInfo());
+ endSpanners += u" " + mtrc("engraving", "End of %1").arg(s->accessibleInfo());
}
}
- return rez + u' ' + startSpanners + u' ' + endSpanners;
+
+ return rez + startSpanners + endSpanners;
}
//---------------------------------------------------------