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

fix some translations issues mentioned on Transifex

Browse source
This commit is contained in:
Joachim Schmitz 2016-08-08 11:12:32 +02:00
parent 5a4743a815
commit e086bd6868
10 changed files with 16 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mscore/data/shortcuts.xml
View file

@ -5,7 +5,7 @@
<seq>Ctrl+Shift+P</seq>
</SC>
<SC>
<key>local-help</key>
<key>help</key>
<seq>F1</seq>
</SC>
<SC>

2
mscore/editstaff.cpp
View file

@ -115,7 +115,7 @@ EditStaff::EditStaff(Staff* s, int /*tick*/, QWidget* parent)
connect(showClef, SIGNAL(clicked()), SLOT(showClefChanged()));
connect(showTimesig, SIGNAL(clicked()), SLOT(showTimeSigChanged()));
connect(showBarlines, SIGNAL(clicked()), SLOT(showBarlinesChanged()));
addAction(getAction("local-help")); // why is this needed?
addAction(getAction("help")); // why is this needed?
}
//---------------------------------------------------------

2
mscore/help.cpp
View file

@ -153,7 +153,7 @@ void MuseScore::showHelp(const QUrl& url)
if (!_helpEngine)
return;
QAction* a = getAction("local-help");
QAction* a = getAction("help");
a->blockSignals(true);
a->setChecked(true);
a->blockSignals(false);

2
mscore/menus.cpp
View file

@ -657,7 +657,7 @@ Palette* MuseScore::newBreathPalette()
Palette* MuseScore::newArpeggioPalette()
{
Palette* sp = new Palette();
sp->setName(QT_TRANSLATE_NOOP("Palette", "Arpeggios && Glissandi"));
sp->setName(QT_TRANSLATE_NOOP("Palette", "Arpeggios && Glissandos"));
sp->setGrid(27, 60);
sp->setDrawGrid(true);

4
mscore/musescore.cpp
View file

@ -1185,7 +1185,7 @@ MuseScore::MuseScore()
connect(menuHelp, SIGNAL(aboutToShow()), hw, SLOT(setFocus()));
}
#endif
//menuHelp->addAction(getAction("local-help"));
//menuHelp->addAction(getAction("help"));
onlineHandbookAction = menuHelp->addAction("", this, SLOT(helpBrowser1()));
menuHelp->addSeparator();
@ -4665,7 +4665,7 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
// transportTools->setVisible(!transportTools->isVisible());
// else if (cmd == "toggle-noteinput")
// entryTools->setVisible(!entryTools->isVisible());
else if (cmd == "local-help")
else if (cmd == "help")
showContextHelp();
else if (cmd == "follow")
preferences.followSong = a->isChecked();

2
mscore/selectionwindow.cpp
View file

@ -45,7 +45,7 @@ static const char* labels[] = {
QT_TRANSLATE_NOOP("selectionfilter", "Pedal Lines"),
QT_TRANSLATE_NOOP("selectionfilter", "Other Lines"),
QT_TRANSLATE_NOOP("selectionfilter", "Arpeggios"),
QT_TRANSLATE_NOOP("selectionfilter", "Glissandi"),
QT_TRANSLATE_NOOP("selectionfilter", "Glissandos"),
QT_TRANSLATE_NOOP("selectionfilter", "Fretboard Diagrams"),
QT_TRANSLATE_NOOP("selectionfilter", "Breath Marks"),
QT_TRANSLATE_NOOP("selectionfilter", "Tremolo"),

10
mscore/shortcut.cpp
View file

@ -31,10 +31,10 @@ Shortcut Shortcut::_sc[] = {
{
MsWidget::MAIN_WINDOW,
STATE_ALL,
"local-help",
QT_TRANSLATE_NOOP("action","Local Handbook..."), // Appears in menu
QT_TRANSLATE_NOOP("action","Local handbook"), // Appears in Edit > Preferences > Shortcuts
QT_TRANSLATE_NOOP("action","Show local handbook"), // Appears if you use Help > What's This?
"help",
QT_TRANSLATE_NOOP("action","Online Handbook..."), // Appears in menu
QT_TRANSLATE_NOOP("action","Online handbook"), // Appears in Edit > Preferences > Shortcuts
QT_TRANSLATE_NOOP("action","Show online handbook"), // Appears if you use Help > What's This?
Icons::Invalid_ICON,
Qt::ApplicationShortcut,
ShortcutFlags::NONE | ShortcutFlags::A_CHECKABLE
@ -2722,7 +2722,7 @@ Shortcut Shortcut::_sc[] = {
"loop",
QT_TRANSLATE_NOOP("action","Loop"),
QT_TRANSLATE_NOOP("action","Toggle loop playback"),
QT_TRANSLATE_NOOP("action","Loop playback"),
QT_TRANSLATE_NOOP("action","Toggle loop playback"),
Icons::loop_ICON,
Qt::WindowShortcut,
ShortcutFlags::A_CHECKABLE

102
mscore/stafftext.ui
View file

@ -1964,101 +1964,6 @@ altera</string>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<widget class="QWidget" name="layoutWidget_2">
<property name="geometry">
<rect>
<x>20</x>
<y>30</y>
<width>804</width>
<height>51</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<family>DejaVu Serif</family>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>III</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_20">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>DejaVu Serif</family>
</font>
</property>
<property name="text">
<string>Principal
8</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_21">
<property name="text">
<string>Gemshorn
8</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_22">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_23">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_24">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_25">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_26">
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
@ -4272,13 +4177,6 @@ VI</string>
<tabstop>stop_1_5</tabstop>
<tabstop>stop_1_6</tabstop>
<tabstop>stop_1_7</tabstop>
<tabstop>pushButton_20</tabstop>
<tabstop>pushButton_21</tabstop>
<tabstop>pushButton_22</tabstop>
<tabstop>pushButton_23</tabstop>
<tabstop>pushButton_24</tabstop>
<tabstop>pushButton_25</tabstop>
<tabstop>pushButton_26</tabstop>
<tabstop>stop_1_8</tabstop>
<tabstop>stop_1_9</tabstop>
<tabstop>stop_1_10</tabstop>

4
share/instruments/instruments.xml
View file

@ -3271,7 +3271,7 @@
</Instrument>
<Instrument id="tenor-trumpet">
<longName>Tenor Trumpet</longName>
<shortName>Tnr. Tpt.</shortName>
<shortName>T. Tpt.</shortName>
<description>Tenor Trumpet (included for MusicXML 3 compatibility no
range information available)</description>
<musicXMLid>brass.trumpet.tenor</musicXMLid>
@ -9736,7 +9736,7 @@
</Instrument>
<Instrument id="treble-viol">
<longName>Treble Viol</longName>
<shortName>Tr. vl.</shortName>
<shortName>Tr. Vl.</shortName>
<description>Treble Viol</description>
<musicXMLid>strings.viol.treble</musicXMLid>
<StringData>

4
share/instruments/instrumentsxml.h
View file

@ -459,7 +459,7 @@ QT_TRANSLATE_NOOP("InstrumentsXML", "Slide Trumpet"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Sl.Tpt.", "Slide Trumpet"),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Tenor Trumpet"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Tnr. Tpt.", "Tenor Trumpet"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "T. Tpt.", "Tenor Trumpet"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Bass Trumpet"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "B. Tpt.", "Bass Trumpet"),
QT_TRANSLATE_NOOP("InstrumentsXML", "mute"),
@ -1138,7 +1138,7 @@ QT_TRANSLATE_NOOP3("InstrumentsXML", "Pds. v.", "Pardessus de viole"),
QT_TRANSLATE_NOOP("InstrumentsXML", "pizzicato"),
QT_TRANSLATE_NOOP("InstrumentsXML", "tremolo"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Treble Viol"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Tr. vl.", "Treble Viol"),
QT_TRANSLATE_NOOP3("InstrumentsXML", "Tr. Vl.", "Treble Viol"),
QT_TRANSLATE_NOOP("InstrumentsXML", "pizzicato"),
QT_TRANSLATE_NOOP("InstrumentsXML", "tremolo"),
QT_TRANSLATE_NOOP("InstrumentsXML", "Alto Viol"),