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.

Sign up for GitHub

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

Jump to bottom

[Mu3] Fixes for translatable texts #7187

Merged
merged 3 commits into from
Dec 30, 2020
Merged

[Mu3] Fixes for translatable texts #7187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e234067
Fix menu Edit > Find / Go To
Jojo-Schmitz Dec 30, 2020
3d2dc10
Fix translation issues in Lines palette
Jojo-Schmitz Dec 30, 2020
944072e
Attempt to fix translation for 2 score order strings
Jojo-Schmitz Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions libmscore/scoreOrder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ QString ScoreOrder::getName() const
QString ScoreOrder::getFullName() const
{
if (_customised)
return QString(QT_TRANSLATE_NOOP("OrderXML", "%1 (Customized)")).arg(_name);
return QObject::tr("%1 (Customized)").arg(_name);
else
return getName();
}
Expand Down Expand Up @@ -724,7 +724,7 @@ void ScoreOrder::dump() const
ScoreOrderList::ScoreOrderList()
{
_orders.clear();
ScoreOrder* custom = new ScoreOrder(QString("<custom>"), QString(QT_TRANSLATE_NOOP("OrderXML", "Custom")));
ScoreOrder* custom = new ScoreOrder(QString("<custom>"), QObject::tr("Custom"));
custom->createUnsortedGroup();
addScoreOrder(custom);
}
Expand Down
2 changes: 1 addition & 1 deletion mscore/musescore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6906,7 +6906,7 @@ void MuseScore::showSearchDialog()
searchDialogLayout->addWidget(searchExit);
searchDialogLayout->addSpacing(10);

searchDialogLayout->addWidget(new QLabel(tr("Find / Go To: ")));
searchDialogLayout->addWidget(new QLabel(tr("Find / Go to:")));

searchCombo = new SearchComboBox;
searchDialogLayout->addWidget(searchCombo);
Expand Down
2 changes: 1 addition & 1 deletion mscore/shortcut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2741,7 +2741,7 @@ Shortcut Shortcut::_sc[] = {
MsWidget::MAIN_WINDOW,
STATE_NORMAL | STATE_NOTE_ENTRY,
"find",
QT_TRANSLATE_NOOP("action","Find / Go To")
QT_TRANSLATE_NOOP("action","Find / Go To"),
QT_TRANSLATE_NOOP("action","Find / Go to")
},
{
Expand Down
33 changes: 21 additions & 12 deletions share/workspaces/Advanced.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,70 +1205,79 @@
<length>200</length>
</Trill>
</Cell>
<Cell name="Text line">
<Cell name="Staff Text line">
<TextLine id="28">
<endHookType>1</endHookType>
<beginText>VII</beginText>
<beginText>Staff</beginText>
<ticks>0</ticks>
<track>0</track>
<length>200</length>
</TextLine>
</Cell>
<Cell name="System Text line" trElement="1">
<TextLine system="1" id="29">
<endHookType>1</endHookType>
<beginText>System</beginText>
<ticks>0</ticks>
<track>0</track>
<length>200</length>
</TextLine>
</Cell>
<Cell name="Line">
<TextLine id="29">
<TextLine id="30">
<ticks>0</ticks>
<track>0</track>
<diagonal>1</diagonal>
<length>200</length>
</TextLine>
</Cell>
<Cell name="Ambitus">
<Ambitus>
<Ambitus id="31">
<topPitch>-1</topPitch>
<topTpc>-2</topTpc>
<topTpc>-9</topTpc>
<bottomPitch>-1</bottomPitch>
<bottomTpc>-2</bottomTpc>
<bottomTpc>-9</bottomTpc>
</Ambitus>
</Cell>
<Cell name="Let Ring">
<LetRing id="30">
<LetRing id="32">
<track>0</track>
</LetRing>
</Cell>
<Cell name="Guitar vibrato">
<Vibrato id="31">
<Vibrato id="33">
<subtype>guitarVibrato</subtype>
<ticks>0</ticks>
<track>0</track>
<length>200</length>
</Vibrato>
</Cell>
<Cell name="Guitar vibrato wide">
<Vibrato id="32">
<Vibrato id="34">
<subtype>guitarVibratoWide</subtype>
<ticks>0</ticks>
<track>0</track>
<length>200</length>
</Vibrato>
</Cell>
<Cell name="Vibrato sawtooth">
<Vibrato id="33">
<Vibrato id="35">
<subtype>vibratoSawtooth</subtype>
<ticks>0</ticks>
<track>0</track>
<length>200</length>
</Vibrato>
</Cell>
<Cell name="Tremolo sawtooth wide">
<Vibrato id="34">
<Vibrato id="36">
<subtype>vibratoSawtoothWide</subtype>
<ticks>0</ticks>
<track>0</track>
<length>200</length>
</Vibrato>
</Cell>
<Cell name="Palm Mute">
<PalmMute id="35">
<PalmMute id="37">
<track>0</track>
</PalmMute>
</Cell>
Expand Down