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

Improve some translatable strings in "engraving"

Browse source
This commit is contained in:
Casper Jeukendrup 2022-07-19 00:52:56 +02:00
parent ad4344079d
commit 322d12a99e
No known key found for this signature in database
GPG key ID: 6C571BEF59E722DD
8 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/engraving/engravingerrors.h
View file

@ -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"<a href=\"https://musescore.org/download#older-versions\">", u"</a>");
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"<a href=\"https://musescore.org\">", u"</a>");
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());

9
src/engraving/libmscore/ambitus.cpp
View file

@ -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()));
}
}

4
src/engraving/libmscore/barline.cpp
View file

@ -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());
}
}
}

10
src/engraving/libmscore/chordrest.cpp
View file

@ -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());
}
}
}

2
src/engraving/libmscore/engravingitem.cpp
View file

@ -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);
}
}

1
src/engraving/libmscore/instrchange.cpp
View file

@ -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));
}

8
src/engraving/libmscore/note.cpp
View file

@ -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());
}
}

7
src/engraving/libmscore/segment.cpp
View file

@ -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;
}
//---------------------------------------------------------