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

Merge pull request #4273 from Jojo-Schmitz/i18n

Browse source 
fixing yet another couple strings...
This commit is contained in:
anatoly-os 2018-12-05 18:02:59 +02:00 committed by GitHub
commit e055321390
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 428 additions and 427 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmscore/stafftype.cpp
View file

@ -1346,8 +1346,8 @@ struct NoteHeadSchemeName {
static NoteHeadSchemeName noteHeadSchemeNames[] = {
{"normal", QT_TRANSLATE_NOOP("noteheadschemes", "Normal") },
{"name-pitch", QT_TRANSLATE_NOOP("noteheadschemes", "Pitch Name") },
{"name-pitch-german", QT_TRANSLATE_NOOP("noteheadschemes", "German Pitch Name") },
{"name-pitch", QT_TRANSLATE_NOOP("noteheadschemes", "Pitch Names") },
{"name-pitch-german", QT_TRANSLATE_NOOP("noteheadschemes", "German Pitch Names") },
{"solfege-movable", QT_TRANSLATE_NOOP("noteheadschemes", "Solf\u00e8ge Movable Do") }, // è
{"solfege-fixed", QT_TRANSLATE_NOOP("noteheadschemes", "Solf\u00e8ge Fixed Do") }, // è
{"shape-4", QT_TRANSLATE_NOOP("noteheadschemes", "4-shape (Walker)") },

17
libmscore/sym.cpp
View file

@ -2920,7 +2920,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
QT_TRANSLATE_NOOP("symUserNames", "Push"),
QT_TRANSLATE_NOOP("symUserNames", "Right hand, 3 ranks, 8' stop + upper tremolo 8' stop + 16' stop (accordion)"),
QT_TRANSLATE_NOOP("symUserNames", "Right hand, 3 ranks, lower tremolo 8' stop + 8' stop + upper tremolo 8' stop (authentic musette)"),
QT_TRANSLATE_NOOP("symUserNames", "Right hand, 3 ranks, 8' stop + 16' stop (bandone\\u00f3n)"),
QT_TRANSLATE_NOOP("symUserNames", "Right hand, 3 ranks, 8' stop + 16' stop (bandone\u00f3n)"),
QT_TRANSLATE_NOOP("symUserNames", "Right hand, 3 ranks, 16' stop (bassoon)"),
QT_TRANSLATE_NOOP("symUserNames", "Right hand, 3 ranks, 8' stop (clarinet)"),
QT_TRANSLATE_NOOP("symUserNames", "Right hand, 3 ranks, lower tremolo 8' stop + 8' stop + upper tremolo 8' stop + 16' stop"),
@ -2969,8 +2969,10 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Bakiye (sharp)",
"Accidental bracket, left",
"Accidental bracket, right",
QT_TRANSLATE_NOOP("symUserNames", "B\u00fcy\u00fck m\u00fccenneb (flat)"),
QT_TRANSLATE_NOOP("symUserNames", "B\u00fcy\u00fck m\u00fccenneb (sharp)"),
//(QT_TRANSLATE_NOOP("symUserNames", "B\u00fcy\u00fck m\u00fccenneb (flat)"),
QT_TRANSLATE_NOOP("symUserNames", "B\u00fcy\u00fck mücenneb (flat)"),
//QT_TRANSLATE_NOOP("symUserNames", "B\u00fcy\u00fck m\u00fccenneb (sharp)"),
QT_TRANSLATE_NOOP("symUserNames", "B\u00fcy\u00fck mücenneb (sharp)"),
"Combining close curly brace",
"Combining lower by one 17-limit schisma",
"Combining lower by one 19-limit schisma",
@ -3043,7 +3045,8 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
"Koma (sharp)",
QT_TRANSLATE_NOOP("symUserNames", "Koron (quarter tone flat)"),
"K\u00fc\u00e7\u00fck m\u00fccenneb (flat)",
QT_TRANSLATE_NOOP("symUserNames", "K\u00fc\u00e7\u00fck m\u00fccenneb (sharp)"),
//QT_TRANSLATE_NOOP("symUserNames", "K\u00fc\u00e7\u00fck m\u00fccenneb (sharp)"),
QT_TRANSLATE_NOOP("symUserNames", "K\u00fc\u00e7\u00fck mücenneb (sharp)"),
"Large double sharp",
"Lower by one septimal comma",
"Lower by one tridecimal quartertone",
@ -3266,10 +3269,8 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
QT_TRANSLATE_NOOP("symUserNames", "Tenuto-accent above"),
QT_TRANSLATE_NOOP("symUserNames", "Tenuto-accent below"),
QT_TRANSLATE_NOOP("symUserNames", "Tenuto below"),
//QT_TRANSLATE_NOOP("symUserNames", "Lour\\u00e9 (tenuto-staccato) above"),
QT_TRANSLATE_NOOP("symUserNames", "Louré (tenuto-staccato) above"),
//QT_TRANSLATE_NOOP("symUserNames", "Lour\\u00e9 (tenuto-staccato) below"),
QT_TRANSLATE_NOOP("symUserNames", "Louré (tenuto-staccato) below"),
QT_TRANSLATE_NOOP("symUserNames", "Lour\u00e9 (tenuto-staccato) above"),
QT_TRANSLATE_NOOP("symUserNames", "Lour\u00e9 (tenuto-staccato) below"),
QT_TRANSLATE_NOOP("symUserNames", "Unstress above"),
QT_TRANSLATE_NOOP("symUserNames", "Unstress below"),
"Augmentation dot",

2
mscore/editstyle.ui
View file

@ -8710,7 +8710,7 @@
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Font style' value</string>
<string>Reset 'Font style' values</string>
</property>
<property name="text">
<string notr="true"/>

828
mscore/importgtp.cpp
View file

File diff suppressed because it is too large Load diff

4
mscore/pianoroll.cpp
View file

@ -117,7 +117,7 @@ PianorollEditor::PianorollEditor(QWidget* parent)
tb->addSeparator();
tb->addWidget(new QLabel(tr("Subdiv:")));
tb->addWidget(new QLabel(tr("Subdiv.:")));
subdiv = new QSpinBox;
subdiv->setToolTip(tr("Subdivide the beat this many times"));
subdiv->setMinimum(0);
@ -133,7 +133,7 @@ PianorollEditor::PianorollEditor(QWidget* parent)
tb->addWidget(new QLabel(tr("Stripe Pattern:")));
barPattern = new QComboBox;
barPattern->setToolTip(tr("White key lines show the tones of this chord."));
barPattern->setToolTip(tr("White stripes show the tones of this chord."));
for (int i = 0; !PianoView::barPatterns[i].name.isEmpty(); ++i) {
barPattern->addItem(PianoView::barPatterns[i].name, i);
}