summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2012-07-08 12:15:42 +0000
committerRobert Jonsson <spamatica@gmail.com>2012-07-08 12:15:42 +0000
commit164c30b96d94561ba71c770eb0598d0195728615 (patch)
treea5f5db76ac0b84e46488c3f6d9e472673b3cc569
parentedd120313caf03650daf32c7b9c383188061b5bc (diff)
see ChangeLog
-rw-r--r--muse2/ChangeLog3
-rw-r--r--muse2/muse/arranger/arrangerview.cpp22
-rw-r--r--muse2/muse/audiotrack.cpp15
-rw-r--r--muse2/muse/globals.cpp2
-rw-r--r--muse2/muse/globals.h2
-rw-r--r--muse2/muse/track.h1
-rw-r--r--muse2/muse/wave.cpp4
-rw-r--r--muse2/muse/widgets/view.cpp1
-rw-r--r--muse2/share/locale/muse_cs.ts114
-rw-r--r--muse2/share/locale/muse_de.ts14
-rw-r--r--muse2/share/locale/muse_en.ts114
-rw-r--r--muse2/share/locale/muse_es.ts14
-rw-r--r--muse2/share/locale/muse_fr.ts14
-rw-r--r--muse2/share/locale/muse_pl.ts14
-rw-r--r--muse2/share/locale/muse_ru.ts8
-rw-r--r--muse2/share/locale/muse_sv_SE.ts8
16 files changed, 219 insertions, 131 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 12fae57e..bd96a2c0 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,4 +1,7 @@
08.07.2012:
+ - Changed naming convention for recorded wave files to include track name and it's
+ take number. (rj)
+ - added a warning dialog for the delete track key shortcut. (rj)
- Use cmake's own FindPythonLibs module instead of pkgconfig to detect Python (Orcan)
06.07.2012:
- Updated Czech translation from Pavel Fric (rj)
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index 57c12d15..9c24c7ce 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -492,19 +492,29 @@ void ArrangerView::cmd(int cmd)
arranger->cmd(Arranger::CMD_INSERT_EMPTYMEAS);
break;
case CMD_DELETE:
- if (!MusEGlobal::song->msgRemoveParts()) //automatically does undo if neccessary and returns true then
{
- //msgRemoveParts() returned false -> no parts to remove?
- MusEGlobal::song->startUndo();
- MusEGlobal::audio->msgRemoveTracks(); //TODO FINDME this could still be speeded up!
- MusEGlobal::song->endUndo(SC_TRACK_REMOVED);
+ QMessageBox::StandardButton btn = QMessageBox::warning(
+ this,tr("Remove track(s)"),tr("Are you sure you want to remove this track(s)?"),
+ QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Ok);
+
+ if (btn == QMessageBox::Cancel)
+ break;
+ if (!MusEGlobal::song->msgRemoveParts()) //automatically does undo if neccessary and returns true then
+ {
+ //msgRemoveParts() returned false -> no parts to remove?
+ MusEGlobal::song->startUndo();
+ MusEGlobal::audio->msgRemoveTracks(); //TODO FINDME this could still be speeded up!
+ MusEGlobal::song->endUndo(SC_TRACK_REMOVED);
+ }
}
break;
- case CMD_DELETE_TRACK:
+ case CMD_DELETE_TRACK: // from menu
+ {
MusEGlobal::song->startUndo();
MusEGlobal::audio->msgRemoveTracks();
MusEGlobal::song->endUndo(SC_TRACK_REMOVED);
MusEGlobal::audio->msgUpdateSoloStates();
+ }
break;
case CMD_DUPLICATE_TRACK:
diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp
index dac496d7..32922c3b 100644
--- a/muse2/muse/audiotrack.cpp
+++ b/muse2/muse/audiotrack.cpp
@@ -102,6 +102,7 @@ AudioTrack::AudioTrack(TrackType t)
_sendMetronome = false;
_prefader = false;
_efxPipe = new Pipeline();
+ recFileNumber = 1;
//_recFile = 0; //unneeded, _recFile's ctor does this
_channels = 0;
_automationType = AUTO_OFF;
@@ -130,7 +131,8 @@ AudioTrack::AudioTrack(const AudioTrack& t, int flags)
_processed = false;
_haveData = false;
_efxPipe = new Pipeline(); // Start off with a new pipeline.
-
+ recFileNumber = 1;
+
// Don't allocate outBuffers here. Let internal_assign() call setTotalOutChannels to set them up.
outBuffers = 0;
_totalOutChannels = 0;
@@ -1881,10 +1883,11 @@ bool AudioTrack::prepareRecording()
//
char buffer[128];
QFile fil;
- for (;;++MusEGlobal::recFileNumber) {
- sprintf(buffer, "%s/rec%d.wav",
- MusEGlobal::museProject.toLatin1().constData(),
- MusEGlobal::recFileNumber);
+ for (;;++recFileNumber) {
+ sprintf(buffer, "%s/TRACK_%s_TAKE_%d.wav",
+ MusEGlobal::museProject.toLocal8Bit().constData(),
+ name().simplified().replace(" ","_").toLocal8Bit().constData(),
+ recFileNumber);
fil.setFileName(QString(buffer));
if (!fil.exists())
break;
@@ -1896,7 +1899,7 @@ bool AudioTrack::prepareRecording()
}
if (MusEGlobal::debugMsg)
- printf("AudioNode::setRecordFlag1: init internal file %s\n", _recFile->path().toLatin1().constData());
+ printf("AudioNode::setRecordFlag1: init internal file %s\n", _recFile->path().toLatin1().constData());
if(_recFile->openWrite())
{
diff --git a/muse2/muse/globals.cpp b/muse2/muse/globals.cpp
index b3765074..967f0870 100644
--- a/muse2/muse/globals.cpp
+++ b/muse2/muse/globals.cpp
@@ -35,8 +35,6 @@
namespace MusEGlobal {
-int recFileNumber = 1;
-
int sampleRate = 44100;
unsigned segmentSize = 1024U; // segmentSize in frames (set by JACK)
unsigned fifoLength = 128; // 131072/segmentSize
diff --git a/muse2/muse/globals.h b/muse2/muse/globals.h
index bdf383c8..915486e1 100644
--- a/muse2/muse/globals.h
+++ b/muse2/muse/globals.h
@@ -44,8 +44,6 @@ namespace MusEGlobal {
extern const float denormalBias;
-extern int recFileNumber;
-
extern int sampleRate;
extern unsigned segmentSize;
extern unsigned fifoLength; // inversely proportional to segmentSize
diff --git a/muse2/muse/track.h b/muse2/muse/track.h
index 3da34912..3efc6912 100644
--- a/muse2/muse/track.h
+++ b/muse2/muse/track.h
@@ -346,6 +346,7 @@ class AudioTrack : public Track {
bool _prefader; // prefader metering
std::vector<double> _auxSend;
void readAuxSend(Xml& xml);
+ int recFileNumber;
bool _sendMetronome;
AutomationType _automationType;
diff --git a/muse2/muse/wave.cpp b/muse2/muse/wave.cpp
index 8d17a10d..0657bbe0 100644
--- a/muse2/muse/wave.cpp
+++ b/muse2/muse/wave.cpp
@@ -150,7 +150,7 @@ void SndFile::readCache(const QString& path, bool showProgress)
for (unsigned ch = 0; ch < channels(); ++ch)
cache[ch] = new SampleV[csize];
- FILE* cfile = fopen(path.toLatin1().constData(), "r");
+ FILE* cfile = fopen(path.toLocal8Bit().constData(), "r");
if (cfile) {
for (unsigned ch = 0; ch < channels(); ++ch)
fread(cache[ch], csize * sizeof(SampleV), 1, cfile);
@@ -344,7 +344,7 @@ bool SndFile::openWrite()
return false;
}
QString p = path();
- sf = sf_open(p.toLatin1().constData(), SFM_RDWR, &sfinfo);
+ sf = sf_open(p.toLocal8Bit().constData(), SFM_RDWR, &sfinfo);
sfUI = 0;
if (sf) {
openFlag = true;
diff --git a/muse2/muse/widgets/view.cpp b/muse2/muse/widgets/view.cpp
index 60056848..fb53be46 100644
--- a/muse2/muse/widgets/view.cpp
+++ b/muse2/muse/widgets/view.cpp
@@ -513,7 +513,6 @@ void View::pdraw(QPainter& p, const QRect& r)
int y = r.y();
int w = r.width();
int h = r.height();
- printf("xmag=%d\n",xmag);
if (xmag <= 0) {
// TODO These adjustments are required, otherwise gaps. Tried, unable to remove them for now. p4.0.30
x -= 1;
diff --git a/muse2/share/locale/muse_cs.ts b/muse2/share/locale/muse_cs.ts
index 4c9b4a1a..a04d64a8 100644
--- a/muse2/share/locale/muse_cs.ts
+++ b/muse2/share/locale/muse_cs.ts
@@ -7311,18 +7311,28 @@ Klepnutí pravým tlačítkem myši pro ukázání rozhraní.</translation>
<translation>Nastavit v&amp;lastní sloupce</translation>
</message>
<message>
- <location filename="../../muse/arranger/arrangerview.cpp" line="595"/>
- <location filename="../../muse/arranger/arrangerview.cpp" line="601"/>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="497"/>
+ <source>Remove track(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="497"/>
+ <source>Are you sure you want to remove this track(s)?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="605"/>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="611"/>
<source>New</source>
<translation>Nový</translation>
</message>
<message>
- <location filename="../../muse/arranger/arrangerview.cpp" line="752"/>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="762"/>
<source>Changed Settings</source>
<translation>Nastavení změněna</translation>
</message>
<message>
- <location filename="../../muse/arranger/arrangerview.cpp" line="752"/>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="762"/>
<source>Unfortunately, the changed arranger column settings
cannot be applied while MusE is running.
To apply the changes, please restart MusE. Sorry.
@@ -13943,174 +13953,174 @@ Robert Jonsson
<context>
<name>file_patterns</name>
<message>
- <location filename="../../muse/globals.cpp" line="122"/>
+ <location filename="../../muse/globals.cpp" line="120"/>
<source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
<translation>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="123"/>
+ <location filename="../../muse/globals.cpp" line="121"/>
<source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
<translation>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="124"/>
+ <location filename="../../muse/globals.cpp" line="122"/>
<source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
<translation>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="125"/>
- <location filename="../../muse/globals.cpp" line="138"/>
- <location filename="../../muse/globals.cpp" line="149"/>
- <location filename="../../muse/globals.cpp" line="156"/>
- <location filename="../../muse/globals.cpp" line="171"/>
- <location filename="../../muse/globals.cpp" line="177"/>
- <location filename="../../muse/globals.cpp" line="184"/>
- <location filename="../../muse/globals.cpp" line="190"/>
- <location filename="../../muse/globals.cpp" line="198"/>
- <location filename="../../muse/globals.cpp" line="204"/>
- <location filename="../../muse/globals.cpp" line="212"/>
- <location filename="../../muse/globals.cpp" line="220"/>
+ <location filename="../../muse/globals.cpp" line="123"/>
+ <location filename="../../muse/globals.cpp" line="136"/>
+ <location filename="../../muse/globals.cpp" line="147"/>
+ <location filename="../../muse/globals.cpp" line="154"/>
+ <location filename="../../muse/globals.cpp" line="169"/>
+ <location filename="../../muse/globals.cpp" line="175"/>
+ <location filename="../../muse/globals.cpp" line="182"/>
+ <location filename="../../muse/globals.cpp" line="188"/>
+ <location filename="../../muse/globals.cpp" line="196"/>
+ <location filename="../../muse/globals.cpp" line="202"/>
+ <location filename="../../muse/globals.cpp" line="210"/>
+ <location filename="../../muse/globals.cpp" line="218"/>
<source>All Files (*)</source>
<translation>Všechny soubory (*)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="136"/>
+ <location filename="../../muse/globals.cpp" line="134"/>
<source>Midi (*.mid)</source>
<translation>Midi (*.mid)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="137"/>
+ <location filename="../../muse/globals.cpp" line="135"/>
<source>Karaoke (*.kar)</source>
<translation>Karaoke (*.kar)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="143"/>
+ <location filename="../../muse/globals.cpp" line="141"/>
<source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
<translation>Všechny známé soubory (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="144"/>
+ <location filename="../../muse/globals.cpp" line="142"/>
<source>med Files (*.med *.med.gz *.med.bz2)</source>
<translation>Soubory med (*.med *.med.gz *.med.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="145"/>
- <location filename="../../muse/globals.cpp" line="153"/>
- <location filename="../../muse/globals.cpp" line="160"/>
+ <location filename="../../muse/globals.cpp" line="143"/>
+ <location filename="../../muse/globals.cpp" line="151"/>
+ <location filename="../../muse/globals.cpp" line="158"/>
<source>Uncompressed med Files (*.med)</source>
<translation>Nestlačené soubory med (*.med)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="146"/>
- <location filename="../../muse/globals.cpp" line="154"/>
- <location filename="../../muse/globals.cpp" line="161"/>
+ <location filename="../../muse/globals.cpp" line="144"/>
+ <location filename="../../muse/globals.cpp" line="152"/>
+ <location filename="../../muse/globals.cpp" line="159"/>
<source>gzip compressed med Files (*.med.gz)</source>
<translation>Soubory med stlačené gzip (*.med.gz)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="147"/>
- <location filename="../../muse/globals.cpp" line="155"/>
- <location filename="../../muse/globals.cpp" line="162"/>
+ <location filename="../../muse/globals.cpp" line="145"/>
+ <location filename="../../muse/globals.cpp" line="153"/>
+ <location filename="../../muse/globals.cpp" line="160"/>
<source>bzip2 compressed med Files (*.med.bz2)</source>
<translation>Soubory med stlačené bzip2 (*.med.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="148"/>
+ <location filename="../../muse/globals.cpp" line="146"/>
<source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
<translation>Soubory mid (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="167"/>
+ <location filename="../../muse/globals.cpp" line="165"/>
<source>(*.jpg *.gif *.png)</source>
<translation>(*.jpg *.gif *.png)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="168"/>
+ <location filename="../../muse/globals.cpp" line="166"/>
<source>(*.jpg)</source>
<translation>(*.jpg)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="169"/>
+ <location filename="../../muse/globals.cpp" line="167"/>
<source>(*.gif)</source>
<translation>(*.gif)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="170"/>
+ <location filename="../../muse/globals.cpp" line="168"/>
<source>(*.png)</source>
<translation>(*.png)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="176"/>
+ <location filename="../../muse/globals.cpp" line="174"/>
<source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
<translation>Soubory part (*.mpt *.mpt.gz *.mpt.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="181"/>
+ <location filename="../../muse/globals.cpp" line="179"/>
<source>part Files (*.mpt)</source>
<translation>Soubory part (*.mpt)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="182"/>
+ <location filename="../../muse/globals.cpp" line="180"/>
<source>gzip compressed part Files (*.mpt.gz)</source>
<translation>Soubory part stlačené gzip (*.mpt.gz)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="183"/>
+ <location filename="../../muse/globals.cpp" line="181"/>
<source>bzip2 compressed part Files (*.mpt.bz2)</source>
<translation>Soubory part stlačené bzip2 (*.mpt.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="189"/>
+ <location filename="../../muse/globals.cpp" line="187"/>
<source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
<translation>Přednastavení (*.pre *.pre.gz *.pre.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="195"/>
+ <location filename="../../muse/globals.cpp" line="193"/>
<source>Presets (*.pre)</source>
<translation>Přednastavení (*.pre)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="196"/>
+ <location filename="../../muse/globals.cpp" line="194"/>
<source>gzip compressed presets (*.pre.gz)</source>
<translation>Přednastavení stlačená gzip (*.pre.gz)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="197"/>
+ <location filename="../../muse/globals.cpp" line="195"/>
<source>bzip2 compressed presets (*.pre.bz2)</source>
<translation>Přednastavení stlačená bzip2 (*.pre.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="203"/>
+ <location filename="../../muse/globals.cpp" line="201"/>
<source>Presets (*.map *.map.gz *.map.bz2)</source>
<translation>Přednastavení (*.map *.map.gz *.map.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="209"/>
+ <location filename="../../muse/globals.cpp" line="207"/>
<source>Presets (*.map)</source>
<translation>Přednastavení (*.map)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="210"/>
+ <location filename="../../muse/globals.cpp" line="208"/>
<source>gzip compressed presets (*.map.gz)</source>
<translation>Přednastavení stlačená gzip (*.map.gz)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="211"/>
+ <location filename="../../muse/globals.cpp" line="209"/>
<source>bzip2 compressed presets (*.map.bz2)</source>
<translation>Přednastavení stlačená bzip2 (*.map.bz2)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="217"/>
+ <location filename="../../muse/globals.cpp" line="215"/>
<source>Wave/Binary (*.wav *.ogg *.bin)</source>
<translation>Wave/Binární (*.wav *.ogg *.bin)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="218"/>
+ <location filename="../../muse/globals.cpp" line="216"/>
<source>Wave (*.wav *.ogg)</source>
<translation>Wave (*.wav *.ogg)</translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="219"/>
+ <location filename="../../muse/globals.cpp" line="217"/>
<source>Binary (*.bin)</source>
<translation>Binární (*.bin)</translation>
</message>
diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts
index 37f44460..66398de4 100644
--- a/muse2/share/locale/muse_de.ts
+++ b/muse2/share/locale/muse_de.ts
@@ -7332,7 +7332,17 @@ Rechtsklick, um die GUI zu zeigen.</translation>
<translation>Benutzerdefinierte &amp;Spalten konfigurieren</translation>
</message>
<message>
- <location line="+324"/>
+ <location line="+226"/>
+ <source>Remove track(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you want to remove this track(s)?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+108"/>
<location line="+6"/>
<source>New</source>
<translation>Neu</translation>
@@ -13961,7 +13971,7 @@ Robert Jonsson
<context>
<name>file_patterns</name>
<message>
- <location filename="../../muse/globals.cpp" line="+122"/>
+ <location filename="../../muse/globals.cpp" line="+120"/>
<source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
<translation>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</translation>
</message>
diff --git a/muse2/share/locale/muse_en.ts b/muse2/share/locale/muse_en.ts
index 511e6b39..699994a9 100644
--- a/muse2/share/locale/muse_en.ts
+++ b/muse2/share/locale/muse_en.ts
@@ -6953,18 +6953,28 @@ Right-click to show GUI.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/arrangerview.cpp" line="595"/>
- <location filename="../../muse/arranger/arrangerview.cpp" line="601"/>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="497"/>
+ <source>Remove track(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="497"/>
+ <source>Are you sure you want to remove this track(s)?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="605"/>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="611"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/arrangerview.cpp" line="752"/>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="762"/>
<source>Changed Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/arrangerview.cpp" line="752"/>
+ <location filename="../../muse/arranger/arrangerview.cpp" line="762"/>
<source>Unfortunately, the changed arranger column settings
cannot be applied while MusE is running.
To apply the changes, please restart MusE. Sorry.
@@ -13482,174 +13492,174 @@ Robert Jonsson
<context>
<name>file_patterns</name>
<message>
- <location filename="../../muse/globals.cpp" line="122"/>
+ <location filename="../../muse/globals.cpp" line="120"/>
<source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="123"/>
+ <location filename="../../muse/globals.cpp" line="121"/>
<source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="124"/>
+ <location filename="../../muse/globals.cpp" line="122"/>
<source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="125"/>
- <location filename="../../muse/globals.cpp" line="138"/>
- <location filename="../../muse/globals.cpp" line="149"/>
- <location filename="../../muse/globals.cpp" line="156"/>
- <location filename="../../muse/globals.cpp" line="171"/>
- <location filename="../../muse/globals.cpp" line="177"/>
- <location filename="../../muse/globals.cpp" line="184"/>
- <location filename="../../muse/globals.cpp" line="190"/>
- <location filename="../../muse/globals.cpp" line="198"/>
- <location filename="../../muse/globals.cpp" line="204"/>
- <location filename="../../muse/globals.cpp" line="212"/>
- <location filename="../../muse/globals.cpp" line="220"/>
+ <location filename="../../muse/globals.cpp" line="123"/>
+ <location filename="../../muse/globals.cpp" line="136"/>
+ <location filename="../../muse/globals.cpp" line="147"/>
+ <location filename="../../muse/globals.cpp" line="154"/>
+ <location filename="../../muse/globals.cpp" line="169"/>
+ <location filename="../../muse/globals.cpp" line="175"/>
+ <location filename="../../muse/globals.cpp" line="182"/>
+ <location filename="../../muse/globals.cpp" line="188"/>
+ <location filename="../../muse/globals.cpp" line="196"/>
+ <location filename="../../muse/globals.cpp" line="202"/>
+ <location filename="../../muse/globals.cpp" line="210"/>
+ <location filename="../../muse/globals.cpp" line="218"/>
<source>All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="136"/>
+ <location filename="../../muse/globals.cpp" line="134"/>
<source>Midi (*.mid)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="137"/>
+ <location filename="../../muse/globals.cpp" line="135"/>
<source>Karaoke (*.kar)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="143"/>
+ <location filename="../../muse/globals.cpp" line="141"/>
<source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="144"/>
+ <location filename="../../muse/globals.cpp" line="142"/>
<source>med Files (*.med *.med.gz *.med.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="145"/>
- <location filename="../../muse/globals.cpp" line="153"/>
- <location filename="../../muse/globals.cpp" line="160"/>
+ <location filename="../../muse/globals.cpp" line="143"/>
+ <location filename="../../muse/globals.cpp" line="151"/>
+ <location filename="../../muse/globals.cpp" line="158"/>
<source>Uncompressed med Files (*.med)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="146"/>
- <location filename="../../muse/globals.cpp" line="154"/>
- <location filename="../../muse/globals.cpp" line="161"/>
+ <location filename="../../muse/globals.cpp" line="144"/>
+ <location filename="../../muse/globals.cpp" line="152"/>
+ <location filename="../../muse/globals.cpp" line="159"/>
<source>gzip compressed med Files (*.med.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="147"/>
- <location filename="../../muse/globals.cpp" line="155"/>
- <location filename="../../muse/globals.cpp" line="162"/>
+ <location filename="../../muse/globals.cpp" line="145"/>
+ <location filename="../../muse/globals.cpp" line="153"/>
+ <location filename="../../muse/globals.cpp" line="160"/>
<source>bzip2 compressed med Files (*.med.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="148"/>
+ <location filename="../../muse/globals.cpp" line="146"/>
<source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="167"/>
+ <location filename="../../muse/globals.cpp" line="165"/>
<source>(*.jpg *.gif *.png)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="168"/>
+ <location filename="../../muse/globals.cpp" line="166"/>
<source>(*.jpg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="169"/>
+ <location filename="../../muse/globals.cpp" line="167"/>
<source>(*.gif)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="170"/>
+ <location filename="../../muse/globals.cpp" line="168"/>
<source>(*.png)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="176"/>
+ <location filename="../../muse/globals.cpp" line="174"/>
<source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="181"/>
+ <location filename="../../muse/globals.cpp" line="179"/>
<source>part Files (*.mpt)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="182"/>
+ <location filename="../../muse/globals.cpp" line="180"/>
<source>gzip compressed part Files (*.mpt.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="183"/>
+ <location filename="../../muse/globals.cpp" line="181"/>
<source>bzip2 compressed part Files (*.mpt.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="189"/>
+ <location filename="../../muse/globals.cpp" line="187"/>
<source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="195"/>
+ <location filename="../../muse/globals.cpp" line="193"/>
<source>Presets (*.pre)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="196"/>
+ <location filename="../../muse/globals.cpp" line="194"/>
<source>gzip compressed presets (*.pre.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="197"/>
+ <location filename="../../muse/globals.cpp" line="195"/>
<source>bzip2 compressed presets (*.pre.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="203"/>
+ <location filename="../../muse/globals.cpp" line="201"/>
<source>Presets (*.map *.map.gz *.map.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="209"/>
+ <location filename="../../muse/globals.cpp" line="207"/>
<source>Presets (*.map)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="210"/>
+ <location filename="../../muse/globals.cpp" line="208"/>
<source>gzip compressed presets (*.map.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="211"/>
+ <location filename="../../muse/globals.cpp" line="209"/>
<source>bzip2 compressed presets (*.map.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="217"/>
+ <location filename="../../muse/globals.cpp" line="215"/>
<source>Wave/Binary (*.wav *.ogg *.bin)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="218"/>
+ <location filename="../../muse/globals.cpp" line="216"/>
<source>Wave (*.wav *.ogg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="219"/>
+ <location filename="../../muse/globals.cpp" line="217"/>
<source>Binary (*.bin)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/locale/muse_es.ts b/muse2/share/locale/muse_es.ts
index aca6ab37..d3d3c41b 100644
--- a/muse2/share/locale/muse_es.ts
+++ b/muse2/share/locale/muse_es.ts
@@ -7278,7 +7278,17 @@ Clic derecho para ver la interfaz</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+324"/>
+ <location line="+226"/>
+ <source>Remove track(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you want to remove this track(s)?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+108"/>
<location line="+6"/>
<source>New</source>
<translation>Nuevo</translation>
@@ -13886,7 +13896,7 @@ Robert Jonsson
<context>
<name>file_patterns</name>
<message>
- <location filename="../../muse/globals.cpp" line="+122"/>
+ <location filename="../../muse/globals.cpp" line="+120"/>
<source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/locale/muse_fr.ts b/muse2/share/locale/muse_fr.ts
index 52226e8e..9b92e20e 100644
--- a/muse2/share/locale/muse_fr.ts
+++ b/muse2/share/locale/muse_fr.ts
@@ -7100,7 +7100,17 @@ Right-click to show GUI.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+324"/>
+ <location line="+226"/>
+ <source>Remove track(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you want to remove this track(s)?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+108"/>
<location line="+6"/>
<source>New</source>
<translation type="unfinished">Nouveau</translation>
@@ -13634,7 +13644,7 @@ Robert Jonsson
<context>
<name>file_patterns</name>
<message>
- <location filename="../../muse/globals.cpp" line="+122"/>
+ <location filename="../../muse/globals.cpp" line="+120"/>
<source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/locale/muse_pl.ts b/muse2/share/locale/muse_pl.ts
index 8ee1f08c..fb882c35 100644
--- a/muse2/share/locale/muse_pl.ts
+++ b/muse2/share/locale/muse_pl.ts
@@ -7030,7 +7030,17 @@ Right-click to show GUI.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+324"/>
+ <location line="+226"/>
+ <source>Remove track(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Are you sure you want to remove this track(s)?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+108"/>
<location line="+6"/>
<source>New</source>
<translation type="unfinished">Nowy</translation>
@@ -13552,7 +13562,7 @@ Robert Jonsson
<context>
<name>file_patterns</name>
<message>
- <location filename="../../muse/globals.cpp" line="+122"/>
+ <location filename="../../muse/globals.cpp" line="+120"/>
<source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/locale/muse_ru.ts b/muse2/share/locale/muse_ru.ts
index f447a6ba..ddbda758 100644
--- a/muse2/share/locale/muse_ru.ts
+++ b/muse2/share/locale/muse_ru.ts
@@ -5619,6 +5619,14 @@ To apply the changes, please restart MusE. Sorry.
<source>Purge hidden events from selected parts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Remove track(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Are you sure you want to remove this track(s)?</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MusEGui::AudioMixerApp</name>
diff --git a/muse2/share/locale/muse_sv_SE.ts b/muse2/share/locale/muse_sv_SE.ts
index ed008788..b0d15d31 100644
--- a/muse2/share/locale/muse_sv_SE.ts
+++ b/muse2/share/locale/muse_sv_SE.ts
@@ -5740,6 +5740,14 @@ försöka fixa det senare)</translation>
<source>Purge hidden events from selected parts</source>
<translation>Ta bort gömda even från valda parter</translation>
</message>
+ <message>
+ <source>Remove track(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Are you sure you want to remove this track(s)?</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MusEGui::AudioMixerApp</name>