diff --git a/data/locale/en.ts b/data/locale/en.ts index edb4b7ed6..f22bedb9c 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -4087,6 +4087,19 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS. + + MidiJack + + JACK server down + When JACK(JACK Audio Connection Kit) disconnects, it will show the following message (title) + + + + The JACK server seems to be shuted down. + When JACK(JACK Audio Connection Kit) disconnects, it will show the following message (dialog message) + + + MidiPort diff --git a/include/MidiJack.h b/include/MidiJack.h index 0ed26019a..4924865db 100644 --- a/include/MidiJack.h +++ b/include/MidiJack.h @@ -42,8 +42,9 @@ class QLineEdit; -class MidiJack : public MidiClientRaw, public QThread +class MidiJack : public QThread, public MidiClientRaw { + Q_OBJECT public: MidiJack(); virtual ~MidiJack(); diff --git a/src/core/midi/MidiJack.cpp b/src/core/midi/MidiJack.cpp index c3bb5a28f..58d669a73 100644 --- a/src/core/midi/MidiJack.cpp +++ b/src/core/midi/MidiJack.cpp @@ -58,10 +58,11 @@ static int JackMidiProcessCallback(jack_nframes_t nframes, void *arg) static void JackMidiShutdown(void *arg) { - // TODO: support translations here - const QString mess_short = "JACK server down"; - const QString mess_long = "The JACK server seems to have been shutdown."; - QMessageBox::information( gui->mainWindow(), mess_short, mess_long ); + //: When JACK(JACK Audio Connection Kit) disconnects, it will show the following message (title) + QString msg_short = MidiJack::tr("JACK server down"); + //: When JACK(JACK Audio Connection Kit) disconnects, it will show the following message (dialog message) + QString msg_long = MidiJack::tr("The JACK server seems to be shuted down."); + QMessageBox::information( gui->mainWindow(), msg_short, msg_long ); } MidiJack::MidiJack() : diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index b7394bfed..151cd29be 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -1214,6 +1214,7 @@ QMenu * InstrumentTrackView::createFxMenu(QString title, QString newFxLabel) class fxLineLcdSpinBox : public LcdSpinBox { + Q_OBJECT public: fxLineLcdSpinBox( int _num_digits, QWidget * _parent, const QString & _name ) : @@ -1820,3 +1821,5 @@ void InstrumentTrackWindow::viewPrevInstrument() { viewInstrumentInDirection(-1); } + +#include "InstrumentTrack.moc"